From 8b97d648c2c4b1e3ea5557d947f654f3701fcc28 Mon Sep 17 00:00:00 2001
From: Terry Wang <zjuwangg@foxmail.com>
Date: Wed, 27 Aug 2025 19:55:57 +0800
Subject: [PATCH] deprecate isUseUniffleShuffleManager from glutenConfig

---
 .../clickhouse/CHSparkPlanExecApi.scala            | 14 +++++---------
 .../org/apache/gluten/config/GlutenConfig.scala    |  2 +-
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHSparkPlanExecApi.scala b/backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHSparkPlanExecApi.scala
index 053e3c6c5b86..2f443c2b2cb7 100644
--- a/backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHSparkPlanExecApi.scala
+++ b/backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHSparkPlanExecApi.scala
@@ -462,15 +462,11 @@ class CHSparkPlanExecApi extends SparkPlanExecApi with Logging {
           clazz.getConstructor(classOf[SQLMetric], classOf[SQLMetric], classOf[SQLMetric])
         constructor.newInstance(readBatchNumRows, numOutputRows, dataSize).asInstanceOf[Serializer]
       case _ =>
-        if (GlutenConfig.get.isUseUniffleShuffleManager) {
-          throw new UnsupportedOperationException("temporarily uniffle not support ch ")
-        } else {
-          new CHColumnarBatchSerializer(
-            readBatchNumRows,
-            numOutputRows,
-            dataSize,
-            deserializationTime)
-        }
+        new CHColumnarBatchSerializer(
+          readBatchNumRows,
+          numOutputRows,
+          dataSize,
+          deserializationTime)
     }
   }
 
diff --git a/gluten-substrait/src/main/scala/org/apache/gluten/config/GlutenConfig.scala b/gluten-substrait/src/main/scala/org/apache/gluten/config/GlutenConfig.scala
index 7d85b0111529..20a143f60a61 100644
--- a/gluten-substrait/src/main/scala/org/apache/gluten/config/GlutenConfig.scala
+++ b/gluten-substrait/src/main/scala/org/apache/gluten/config/GlutenConfig.scala
@@ -160,7 +160,7 @@ class GlutenConfig(conf: SQLConf) extends GlutenCoreConfig(conf) {
       .contains("celeborn")
 
   // Whether to use UniffleShuffleManager.
-  // TODO: Deprecate the API: https://github.com/apache/incubator-gluten/issues/10107.
+  @deprecated
   def isUseUniffleShuffleManager: Boolean =
     conf
       .getConfString("spark.shuffle.manager", "sort")