From 1c6910e0eca3d911699686c117d68769c8216776 Mon Sep 17 00:00:00 2001 From: Kerwin Zhang Date: Thu, 11 Jul 2024 10:00:37 +0800 Subject: [PATCH] [CELEBORN] Rename CelebornHashBasedColumnarShuffleWriter to CelebornColumnarShuffleWriter (#6391) --- ...spark.shuffle.gluten.celeborn.CelebornShuffleWriterFactory | 2 +- ...ffleWriter.scala => CHCelebornColumnarShuffleWriter.scala} | 4 ++-- ...ory.scala => CHCelebornColumnarShuffleWriterFactory.scala} | 4 ++-- ...huffleWriter.scala => CelebornColumnarShuffleWriter.scala} | 2 +- ...spark.shuffle.gluten.celeborn.CelebornShuffleWriterFactory | 2 +- ...eWriter.scala => VeloxCelebornColumnarShuffleWriter.scala} | 4 ++-- ....scala => VeloxCelebornColumnarShuffleWriterFactory.scala} | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) rename gluten-celeborn/clickhouse/src/main/scala/org/apache/spark/shuffle/{CHCelebornHashBasedColumnarShuffleWriter.scala => CHCelebornColumnarShuffleWriter.scala} (98%) rename gluten-celeborn/clickhouse/src/main/scala/org/apache/spark/shuffle/{CHCelebornHashBasedColumnarShuffleWriterFactory.scala => CHCelebornColumnarShuffleWriterFactory.scala} (91%) rename gluten-celeborn/common/src/main/scala/org/apache/spark/shuffle/{CelebornHashBasedColumnarShuffleWriter.scala => CelebornColumnarShuffleWriter.scala} (98%) rename gluten-celeborn/velox/src/main/scala/org/apache/spark/shuffle/{VeloxCelebornHashBasedColumnarShuffleWriter.scala => VeloxCelebornColumnarShuffleWriter.scala} (98%) rename gluten-celeborn/velox/src/main/scala/org/apache/spark/shuffle/{VeloxCelebornHashBasedColumnarShuffleWriterFactory.scala => VeloxCelebornColumnarShuffleWriterFactory.scala} (91%) diff --git a/gluten-celeborn/clickhouse/src/main/resources/META-INF/services/org.apache.spark.shuffle.gluten.celeborn.CelebornShuffleWriterFactory b/gluten-celeborn/clickhouse/src/main/resources/META-INF/services/org.apache.spark.shuffle.gluten.celeborn.CelebornShuffleWriterFactory index 1ed69d814909..a6101db1159b 100644 --- a/gluten-celeborn/clickhouse/src/main/resources/META-INF/services/org.apache.spark.shuffle.gluten.celeborn.CelebornShuffleWriterFactory +++ b/gluten-celeborn/clickhouse/src/main/resources/META-INF/services/org.apache.spark.shuffle.gluten.celeborn.CelebornShuffleWriterFactory @@ -1 +1 @@ -org.apache.spark.shuffle.CHCelebornHashBasedColumnarShuffleWriterFactory +org.apache.spark.shuffle.CHCelebornColumnarShuffleWriterFactory diff --git a/gluten-celeborn/clickhouse/src/main/scala/org/apache/spark/shuffle/CHCelebornHashBasedColumnarShuffleWriter.scala b/gluten-celeborn/clickhouse/src/main/scala/org/apache/spark/shuffle/CHCelebornColumnarShuffleWriter.scala similarity index 98% rename from gluten-celeborn/clickhouse/src/main/scala/org/apache/spark/shuffle/CHCelebornHashBasedColumnarShuffleWriter.scala rename to gluten-celeborn/clickhouse/src/main/scala/org/apache/spark/shuffle/CHCelebornColumnarShuffleWriter.scala index a7836e4a13d1..7276e0f2ca7b 100644 --- a/gluten-celeborn/clickhouse/src/main/scala/org/apache/spark/shuffle/CHCelebornHashBasedColumnarShuffleWriter.scala +++ b/gluten-celeborn/clickhouse/src/main/scala/org/apache/spark/shuffle/CHCelebornColumnarShuffleWriter.scala @@ -33,14 +33,14 @@ import org.apache.celeborn.common.CelebornConf import java.io.IOException import java.util.Locale -class CHCelebornHashBasedColumnarShuffleWriter[K, V]( +class CHCelebornColumnarShuffleWriter[K, V]( shuffleId: Int, handle: CelebornShuffleHandle[K, V, V], context: TaskContext, celebornConf: CelebornConf, client: ShuffleClient, writeMetrics: ShuffleWriteMetricsReporter) - extends CelebornHashBasedColumnarShuffleWriter[K, V]( + extends CelebornColumnarShuffleWriter[K, V]( shuffleId: Int, handle, context, diff --git a/gluten-celeborn/clickhouse/src/main/scala/org/apache/spark/shuffle/CHCelebornHashBasedColumnarShuffleWriterFactory.scala b/gluten-celeborn/clickhouse/src/main/scala/org/apache/spark/shuffle/CHCelebornColumnarShuffleWriterFactory.scala similarity index 91% rename from gluten-celeborn/clickhouse/src/main/scala/org/apache/spark/shuffle/CHCelebornHashBasedColumnarShuffleWriterFactory.scala rename to gluten-celeborn/clickhouse/src/main/scala/org/apache/spark/shuffle/CHCelebornColumnarShuffleWriterFactory.scala index a64b394ee57f..7c105933e2f9 100644 --- a/gluten-celeborn/clickhouse/src/main/scala/org/apache/spark/shuffle/CHCelebornHashBasedColumnarShuffleWriterFactory.scala +++ b/gluten-celeborn/clickhouse/src/main/scala/org/apache/spark/shuffle/CHCelebornColumnarShuffleWriterFactory.scala @@ -25,7 +25,7 @@ import org.apache.spark.shuffle.gluten.celeborn.CelebornShuffleWriterFactory import org.apache.celeborn.client.ShuffleClient import org.apache.celeborn.common.CelebornConf -class CHCelebornHashBasedColumnarShuffleWriterFactory extends CelebornShuffleWriterFactory { +class CHCelebornColumnarShuffleWriterFactory extends CelebornShuffleWriterFactory { override def backendName(): String = CHBackend.BACKEND_NAME override def createShuffleWriterInstance[K, V]( @@ -35,7 +35,7 @@ class CHCelebornHashBasedColumnarShuffleWriterFactory extends CelebornShuffleWri celebornConf: CelebornConf, client: ShuffleClient, writeMetrics: ShuffleWriteMetricsReporter): ShuffleWriter[K, V] = { - new CHCelebornHashBasedColumnarShuffleWriter[K, V]( + new CHCelebornColumnarShuffleWriter[K, V]( shuffleId, handle, context, diff --git a/gluten-celeborn/common/src/main/scala/org/apache/spark/shuffle/CelebornHashBasedColumnarShuffleWriter.scala b/gluten-celeborn/common/src/main/scala/org/apache/spark/shuffle/CelebornColumnarShuffleWriter.scala similarity index 98% rename from gluten-celeborn/common/src/main/scala/org/apache/spark/shuffle/CelebornHashBasedColumnarShuffleWriter.scala rename to gluten-celeborn/common/src/main/scala/org/apache/spark/shuffle/CelebornColumnarShuffleWriter.scala index efd891498131..d58eeb1952c8 100644 --- a/gluten-celeborn/common/src/main/scala/org/apache/spark/shuffle/CelebornHashBasedColumnarShuffleWriter.scala +++ b/gluten-celeborn/common/src/main/scala/org/apache/spark/shuffle/CelebornColumnarShuffleWriter.scala @@ -31,7 +31,7 @@ import org.apache.celeborn.common.CelebornConf import java.io.IOException import java.util.Locale -abstract class CelebornHashBasedColumnarShuffleWriter[K, V]( +abstract class CelebornColumnarShuffleWriter[K, V]( shuffleId: Int, handle: CelebornShuffleHandle[K, V, V], context: TaskContext, diff --git a/gluten-celeborn/velox/src/main/resources/META-INF/services/org.apache.spark.shuffle.gluten.celeborn.CelebornShuffleWriterFactory b/gluten-celeborn/velox/src/main/resources/META-INF/services/org.apache.spark.shuffle.gluten.celeborn.CelebornShuffleWriterFactory index 9c3532ee2c84..3f75f112831e 100644 --- a/gluten-celeborn/velox/src/main/resources/META-INF/services/org.apache.spark.shuffle.gluten.celeborn.CelebornShuffleWriterFactory +++ b/gluten-celeborn/velox/src/main/resources/META-INF/services/org.apache.spark.shuffle.gluten.celeborn.CelebornShuffleWriterFactory @@ -1 +1 @@ -org.apache.spark.shuffle.VeloxCelebornHashBasedColumnarShuffleWriterFactory +org.apache.spark.shuffle.VeloxCelebornColumnarShuffleWriterFactory diff --git a/gluten-celeborn/velox/src/main/scala/org/apache/spark/shuffle/VeloxCelebornHashBasedColumnarShuffleWriter.scala b/gluten-celeborn/velox/src/main/scala/org/apache/spark/shuffle/VeloxCelebornColumnarShuffleWriter.scala similarity index 98% rename from gluten-celeborn/velox/src/main/scala/org/apache/spark/shuffle/VeloxCelebornHashBasedColumnarShuffleWriter.scala rename to gluten-celeborn/velox/src/main/scala/org/apache/spark/shuffle/VeloxCelebornColumnarShuffleWriter.scala index 87b16c65bd09..c93255eaa61b 100644 --- a/gluten-celeborn/velox/src/main/scala/org/apache/spark/shuffle/VeloxCelebornHashBasedColumnarShuffleWriter.scala +++ b/gluten-celeborn/velox/src/main/scala/org/apache/spark/shuffle/VeloxCelebornColumnarShuffleWriter.scala @@ -34,14 +34,14 @@ import org.apache.celeborn.common.CelebornConf import java.io.IOException -class VeloxCelebornHashBasedColumnarShuffleWriter[K, V]( +class VeloxCelebornColumnarShuffleWriter[K, V]( shuffleId: Int, handle: CelebornShuffleHandle[K, V, V], context: TaskContext, celebornConf: CelebornConf, client: ShuffleClient, writeMetrics: ShuffleWriteMetricsReporter) - extends CelebornHashBasedColumnarShuffleWriter[K, V]( + extends CelebornColumnarShuffleWriter[K, V]( shuffleId, handle, context, diff --git a/gluten-celeborn/velox/src/main/scala/org/apache/spark/shuffle/VeloxCelebornHashBasedColumnarShuffleWriterFactory.scala b/gluten-celeborn/velox/src/main/scala/org/apache/spark/shuffle/VeloxCelebornColumnarShuffleWriterFactory.scala similarity index 91% rename from gluten-celeborn/velox/src/main/scala/org/apache/spark/shuffle/VeloxCelebornHashBasedColumnarShuffleWriterFactory.scala rename to gluten-celeborn/velox/src/main/scala/org/apache/spark/shuffle/VeloxCelebornColumnarShuffleWriterFactory.scala index c318f57a2309..c3164338a485 100644 --- a/gluten-celeborn/velox/src/main/scala/org/apache/spark/shuffle/VeloxCelebornHashBasedColumnarShuffleWriterFactory.scala +++ b/gluten-celeborn/velox/src/main/scala/org/apache/spark/shuffle/VeloxCelebornColumnarShuffleWriterFactory.scala @@ -25,7 +25,7 @@ import org.apache.spark.shuffle.gluten.celeborn.CelebornShuffleWriterFactory import org.apache.celeborn.client.ShuffleClient import org.apache.celeborn.common.CelebornConf -class VeloxCelebornHashBasedColumnarShuffleWriterFactory extends CelebornShuffleWriterFactory { +class VeloxCelebornColumnarShuffleWriterFactory extends CelebornShuffleWriterFactory { override def backendName(): String = VeloxBackend.BACKEND_NAME override def createShuffleWriterInstance[K, V]( @@ -35,7 +35,7 @@ class VeloxCelebornHashBasedColumnarShuffleWriterFactory extends CelebornShuffle celebornConf: CelebornConf, client: ShuffleClient, writeMetrics: ShuffleWriteMetricsReporter): ShuffleWriter[K, V] = { - new VeloxCelebornHashBasedColumnarShuffleWriter[K, V]( + new VeloxCelebornColumnarShuffleWriter[K, V]( shuffleId, handle, context,