From ec84112888a401b4f70f089ffb3caf1a78b382f5 Mon Sep 17 00:00:00 2001
From: Zhichao Zhang <zhangzc@apache.org>
Date: Wed, 8 Apr 2026 14:37:18 +0800
Subject: [PATCH 1/4] [CH] Fix package script issue

Fix package script issue
---
 cpp-ch/CMakeLists.txt              | 2 +-
 ep/build-clickhouse/src/package.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cpp-ch/CMakeLists.txt b/cpp-ch/CMakeLists.txt
index a119e7ddc34..3a0c74a2c3e 100644
--- a/cpp-ch/CMakeLists.txt
+++ b/cpp-ch/CMakeLists.txt
@@ -113,7 +113,7 @@ else()
       -DENABLE_SQLITE=OFF -DENABLE_S2_GEOMETRY=OFF -DENABLE_ULID=OFF
       -DENABLE_MYSQL=OFF -DENABLE_BCRYPT=OFF -DENABLE_LDAP=OFF
       -DENABLE_MSGPACK=OFF -DUSE_REPLXX=OFF -DENABLE_CLICKHOUSE_ALL=OFF
-      -DENABLE_NUMACTL=OFF -DENABLE_GOOGLE_CLOUD_CPP=OFF
+      -DENABLE_GWP_ASAN=OFF -DENABLE_NUMACTL=OFF -DENABLE_GOOGLE_CLOUD_CPP=OFF
       -DENABLE_ARROW_FLIGHT=OFF -DCOMPILER_FLAGS='-fvisibility=hidden
       -fvisibility-inlines-hidden' -S ${CH_SOURCE_DIR} -G Ninja -B
       ${CH_BINARY_DIR} && cmake --build ${CH_BINARY_DIR} --target libch\"
diff --git a/ep/build-clickhouse/src/package.sh b/ep/build-clickhouse/src/package.sh
index 7af573f0b3c..e7930d10731 100755
--- a/ep/build-clickhouse/src/package.sh
+++ b/ep/build-clickhouse/src/package.sh
@@ -48,7 +48,7 @@ OS_ARCH=$(uname -m)
 PACKAGE_NAME=gluten-${BUILD_VERSION}-${OS_VERSION}-${OS_ARCH}
 PACKAGE_DIR_PATH="${GLUTEN_SOURCE}"/dist/"${PACKAGE_NAME}"
 
-spark_scala_versions=("3.2_2.12" "3.3_2.12" "3.5_2.13")
+spark_scala_versions=("3.3_2.12" "3.5_2.13")
 
 # cleanup working directory
 [[ -d "${GLUTEN_SOURCE}"/dist/"${PACKAGE_NAME}" ]] && rm -rf "${GLUTEN_SOURCE}"/dist/"${PACKAGE_NAME}"

From b40bb872e265d371bf86b3f4591310c0419dd1c5 Mon Sep 17 00:00:00 2001
From: Zhichao Zhang <zhangzc@apache.org>
Date: Wed, 8 Apr 2026 15:14:59 +0800
Subject: [PATCH 2/4] fix

---
 ep/build-clickhouse/src/package.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ep/build-clickhouse/src/package.sh b/ep/build-clickhouse/src/package.sh
index e7930d10731..91d03e3920d 100755
--- a/ep/build-clickhouse/src/package.sh
+++ b/ep/build-clickhouse/src/package.sh
@@ -48,7 +48,9 @@ OS_ARCH=$(uname -m)
 PACKAGE_NAME=gluten-${BUILD_VERSION}-${OS_VERSION}-${OS_ARCH}
 PACKAGE_DIR_PATH="${GLUTEN_SOURCE}"/dist/"${PACKAGE_NAME}"
 
-spark_scala_versions=("3.3_2.12" "3.5_2.13")
+# spark_scala_versions=("3.3_2.12" "3.5_2.13")
+# TODO: support spark 3.5 later
+spark_scala_versions=("3.3_2.12")
 
 # cleanup working directory
 [[ -d "${GLUTEN_SOURCE}"/dist/"${PACKAGE_NAME}" ]] && rm -rf "${GLUTEN_SOURCE}"/dist/"${PACKAGE_NAME}"

From 6d83703e11266288b432d8d8f829e18fba87d935 Mon Sep 17 00:00:00 2001
From: Zhichao Zhang <zhangzc@apache.org>
Date: Sun, 12 Apr 2026 13:50:47 +0800
Subject: [PATCH 3/4] fix

---
 .../org/apache/gluten/backendsapi/clickhouse/CHRuleApi.scala     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHRuleApi.scala b/backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHRuleApi.scala
index c960d26c7d3..0e8718db70e 100644
--- a/backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHRuleApi.scala
+++ b/backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHRuleApi.scala
@@ -150,6 +150,7 @@ object CHRuleApi {
       .getExtendedColumnarPostRules()
       .foreach(each => injector.injectPost(c => intercept(each(c.session))))
     injector.injectPost(c => ColumnarCollapseTransformStages(new GlutenConfig(c.sqlConf)))
+    injector.injectPost(_ => GenerateTransformStageId())
     injector.injectPost(
       c =>
         intercept(

From e0371cd86ca679d5a4096a45d300ed18d75ec958 Mon Sep 17 00:00:00 2001
From: Zhichao Zhang <zhangzc@apache.org>
Date: Thu, 23 Apr 2026 13:59:12 +0800
Subject: [PATCH 4/4] fix tmp path issue

---
 cpp-ch/local-engine/Common/CHUtil.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cpp-ch/local-engine/Common/CHUtil.cpp b/cpp-ch/local-engine/Common/CHUtil.cpp
index a7c0df4777f..d0733f560fa 100644
--- a/cpp-ch/local-engine/Common/CHUtil.cpp
+++ b/cpp-ch/local-engine/Common/CHUtil.cpp
@@ -790,6 +790,8 @@ void BackendInitializerUtil::initContexts(DB::Context::ConfigurationPtr config)
                 tmp_path = std::string(buffer) + tmp_path;
         };
 
+        if (!fs::exists(tmp_path))
+            fs::create_directories(tmp_path);
         global_context->setTemporaryStoragePath(tmp_path, 0);
         global_context->setPath(config->getString("path", "/"));