This is an automated email from the ASF dual-hosted git repository.
yuanzhou pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-gluten.git
The following commit(s) were added to refs/heads/main by this push:
new b2b0aa855b [VL] Add SupportsColumnarShuffle trait (#9984)
b2b0aa855b is described below
commit b2b0aa855b08989f52c0b038438d6bd575fe451c
Author: Rong Ma <[email protected]>
AuthorDate: Tue Jun 17 10:23:46 2025 +0100
[VL] Add SupportsColumnarShuffle trait (#9984)
supportColumnarShuffleExec() in Velox backend hard codes the supported
ShuffleManager type. Add trait SupportsColumnarShuffle to allow plugin custom
shuffle manager implementation.
---
.../shuffle/gluten/uniffle/UniffleShuffleManager.java | 4 +++-
.../gluten/backendsapi/velox/VeloxBackend.scala | 6 ++----
.../gluten/celeborn/CelebornShuffleManager.java | 3 ++-
.../gluten/shuffle/SupportsColumnarShuffle.scala | 19 +++++++++++++++++++
.../scala/org/apache/gluten/config/GlutenConfig.scala | 9 +++++++++
.../spark/shuffle/sort/ColumnarShuffleManager.scala | 7 ++++++-
6 files changed, 41 insertions(+), 7 deletions(-)
diff --git
a/backends-velox/src-uniffle/main/java/org/apache/spark/shuffle/gluten/uniffle/UniffleShuffleManager.java
b/backends-velox/src-uniffle/main/java/org/apache/spark/shuffle/gluten/uniffle/UniffleShuffleManager.java
index 2f1d53ce0a..70c9621157 100644
---
a/backends-velox/src-uniffle/main/java/org/apache/spark/shuffle/gluten/uniffle/UniffleShuffleManager.java
+++
b/backends-velox/src-uniffle/main/java/org/apache/spark/shuffle/gluten/uniffle/UniffleShuffleManager.java
@@ -16,6 +16,8 @@
*/
package org.apache.spark.shuffle.gluten.uniffle;
+import org.apache.gluten.shuffle.SupportsColumnarShuffle;
+
import org.apache.spark.SparkConf;
import org.apache.spark.TaskContext;
import org.apache.spark.executor.ShuffleWriteMetrics;
@@ -31,7 +33,7 @@ import org.apache.uniffle.common.exception.RssException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class UniffleShuffleManager extends RssShuffleManager {
+public class UniffleShuffleManager extends RssShuffleManager implements
SupportsColumnarShuffle {
private static final Logger LOG =
LoggerFactory.getLogger(UniffleShuffleManager.class);
public UniffleShuffleManager(SparkConf conf, boolean isDriver) {
diff --git
a/backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/VeloxBackend.scala
b/backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/VeloxBackend.scala
index f6ed91055e..08a7f2db85 100644
---
a/backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/VeloxBackend.scala
+++
b/backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/VeloxBackend.scala
@@ -468,10 +468,8 @@ object VeloxBackendSettings extends BackendSettingsApi {
override def supportColumnarShuffleExec(): Boolean = {
val conf = GlutenConfig.get
- conf.enableColumnarShuffle && (conf.isUseGlutenShuffleManager
- || conf.isUseColumnarShuffleManager
- || conf.isUseCelebornShuffleManager
- || conf.isUseUniffleShuffleManager)
+ conf.enableColumnarShuffle &&
+ (conf.isUseGlutenShuffleManager ||
conf.shuffleManagerSupportsColumnarShuffle)
}
override def enableJoinKeysRewrite(): Boolean = false
diff --git
a/gluten-celeborn/src/main/java/org/apache/spark/shuffle/gluten/celeborn/CelebornShuffleManager.java
b/gluten-celeborn/src/main/java/org/apache/spark/shuffle/gluten/celeborn/CelebornShuffleManager.java
index 09f12062e8..2ee810d63b 100644
---
a/gluten-celeborn/src/main/java/org/apache/spark/shuffle/gluten/celeborn/CelebornShuffleManager.java
+++
b/gluten-celeborn/src/main/java/org/apache/spark/shuffle/gluten/celeborn/CelebornShuffleManager.java
@@ -19,6 +19,7 @@ package org.apache.spark.shuffle.gluten.celeborn;
import org.apache.gluten.backendsapi.BackendsApiManager;
import org.apache.gluten.config.GlutenConfig;
import org.apache.gluten.exception.GlutenException;
+import org.apache.gluten.shuffle.SupportsColumnarShuffle;
import com.google.common.base.Preconditions;
import com.google.common.collect.Iterators;
@@ -41,7 +42,7 @@ import java.util.ServiceLoader;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
-public class CelebornShuffleManager implements ShuffleManager {
+public class CelebornShuffleManager implements ShuffleManager,
SupportsColumnarShuffle {
private static final Logger logger =
LoggerFactory.getLogger(CelebornShuffleManager.class);
diff --git
a/gluten-core/src/main/scala/org/apache/gluten/shuffle/SupportsColumnarShuffle.scala
b/gluten-core/src/main/scala/org/apache/gluten/shuffle/SupportsColumnarShuffle.scala
new file mode 100644
index 0000000000..a5b2719a6d
--- /dev/null
+++
b/gluten-core/src/main/scala/org/apache/gluten/shuffle/SupportsColumnarShuffle.scala
@@ -0,0 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.gluten.shuffle
+
+trait SupportsColumnarShuffle
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 15f6ecda94..b7549d4de3 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
@@ -16,6 +16,8 @@
*/
package org.apache.gluten.config
+import org.apache.gluten.shuffle.SupportsColumnarShuffle
+
import org.apache.spark.network.util.{ByteUnit, JavaUtils}
import org.apache.spark.sql.internal.{GlutenConfigUtil, SQLConf}
@@ -137,6 +139,13 @@ class GlutenConfig(conf: SQLConf) extends
GlutenCoreConfig(conf) {
.getConfString("spark.shuffle.manager", "sort")
.contains("UniffleShuffleManager")
+ // scalastyle:off classforname
+ def shuffleManagerSupportsColumnarShuffle: Boolean = {
+ classOf[SupportsColumnarShuffle].isAssignableFrom(Class.forName(SQLConf.get
+ .getConfString("spark.shuffle.manager",
"org.apache.spark.shuffle.sort.SortShuffleManager")))
+ }
+ // scalastyle:on classforname
+
def celebornShuffleWriterType: String =
conf
.getConfString(
diff --git
a/gluten-substrait/src/main/scala/org/apache/spark/shuffle/sort/ColumnarShuffleManager.scala
b/gluten-substrait/src/main/scala/org/apache/spark/shuffle/sort/ColumnarShuffleManager.scala
index 2d0c6d3a75..83dea82ccb 100644
---
a/gluten-substrait/src/main/scala/org/apache/spark/shuffle/sort/ColumnarShuffleManager.scala
+++
b/gluten-substrait/src/main/scala/org/apache/spark/shuffle/sort/ColumnarShuffleManager.scala
@@ -16,6 +16,8 @@
*/
package org.apache.spark.shuffle.sort
+import org.apache.gluten.shuffle.SupportsColumnarShuffle
+
import org.apache.spark.{ShuffleDependency, SparkConf, SparkEnv, TaskContext}
import org.apache.spark.internal.Logging
import org.apache.spark.serializer.SerializerManager
@@ -30,7 +32,10 @@ import java.util.concurrent.ConcurrentHashMap
import scala.collection.JavaConverters._
-class ColumnarShuffleManager(conf: SparkConf) extends ShuffleManager with
Logging {
+class ColumnarShuffleManager(conf: SparkConf)
+ extends ShuffleManager
+ with SupportsColumnarShuffle
+ with Logging {
import ColumnarShuffleManager._
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]