[incubator-celeborn] branch gluten updated: [CELEBORN-946][GLUTEN] Record read metric should be compatible with Gluten shuffle dependency

[kerwinzhang]

This is an automated email from the ASF dual-hosted git repository.

kerwinzhang pushed a commit to branch gluten
in repository https://gitbox.apache.org/repos/asf/incubator-celeborn.git


The following commit(s) were added to refs/heads/gluten by this push:
     new c50f1f6e0 [CELEBORN-946][GLUTEN] Record read metric should be 
compatible with Gluten shuffle dependency
c50f1f6e0 is described below

commit c50f1f6e092795adb595f3ff4630125416e8b00c
Author: xiyu.zk <xiyu...@alibaba-inc.com>
AuthorDate: Tue Sep 5 12:00:20 2023 +0800

    [CELEBORN-946][GLUTEN] Record read metric should be compatible with Gluten 
shuffle dependency
---
 .../org/apache/spark/shuffle/celeborn/CelebornShuffleReader.scala     | 4 ++--
 ...mnarDependencyHelper.scala => GlutenShuffleDependencyHelper.scala} | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/client-spark/spark-3/src/main/scala/org/apache/spark/shuffle/celeborn/CelebornShuffleReader.scala
 
b/client-spark/spark-3/src/main/scala/org/apache/spark/shuffle/celeborn/CelebornShuffleReader.scala
index 574d3b491..43cb22efd 100644
--- 
a/client-spark/spark-3/src/main/scala/org/apache/spark/shuffle/celeborn/CelebornShuffleReader.scala
+++ 
b/client-spark/spark-3/src/main/scala/org/apache/spark/shuffle/celeborn/CelebornShuffleReader.scala
@@ -131,8 +131,8 @@ class CelebornShuffleReader[K, C](
       serializerInstance.deserializeStream(_).asKeyValueIterator)
 
     val iterWithUpdatedRecordsRead =
-      if (GlutenColumnarDependencyHelper.isGlutenDep(dep.getClass.getName)) {
-        GlutenColumnarDependencyHelper.withUpdatedRecordsRead(recordIter, 
metrics)
+      if (GlutenShuffleDependencyHelper.isGlutenDep(dep.getClass.getName)) {
+        GlutenShuffleDependencyHelper.withUpdatedRecordsRead(recordIter, 
metrics)
       } else {
         recordIter.map { record =>
           metrics.incRecordsRead(1)
diff --git 
a/client-spark/spark-3/src/main/scala/org/apache/spark/shuffle/celeborn/GlutenColumnarDependencyHelper.scala
 
b/client-spark/spark-3/src/main/scala/org/apache/spark/shuffle/celeborn/GlutenShuffleDependencyHelper.scala
similarity index 97%
rename from 
client-spark/spark-3/src/main/scala/org/apache/spark/shuffle/celeborn/GlutenColumnarDependencyHelper.scala
rename to 
client-spark/spark-3/src/main/scala/org/apache/spark/shuffle/celeborn/GlutenShuffleDependencyHelper.scala
index ed34c1e80..4d743cda8 100644
--- 
a/client-spark/spark-3/src/main/scala/org/apache/spark/shuffle/celeborn/GlutenColumnarDependencyHelper.scala
+++ 
b/client-spark/spark-3/src/main/scala/org/apache/spark/shuffle/celeborn/GlutenShuffleDependencyHelper.scala
@@ -23,7 +23,7 @@ import org.apache.spark.sql.vectorized.ColumnarBatch
 /**
  * A helper class to be compatible with Gluten Celeborn.
  */
-object GlutenColumnarDependencyHelper {
+object GlutenShuffleDependencyHelper {
 
   def isGlutenDep(depName: String): Boolean = {
     // scalastyle:off