[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 ad6bc08d8 [CELEBORN-946][GLUTEN] Record read metric should be 
compatible with Gluten shuffle dependency
ad6bc08d8 is described below

commit ad6bc08d815ec75838734146c58ecbe811b1ec4c
Author: xiyu.zk <xiyu...@alibaba-inc.com>
AuthorDate: Tue Sep 5 11:58:42 2023 +0800

    [CELEBORN-946][GLUTEN] Record read metric should be compatible with Gluten 
shuffle dependency
---
 .../org/apache/spark/shuffle/celeborn/CelebornShuffleReader.scala   | 4 ++--
 ...rBatchSerdeHelper.scala => GlutenColumnarDependencyHelper.scala} | 6 +++---
 2 files changed, 5 insertions(+), 5 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 ff07535f6..574d3b491 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 (GlutenColumnarBatchSerdeHelper.isGlutenDep(dep.getClass.getName)) {
-        GlutenColumnarBatchSerdeHelper.withUpdatedRecordsRead(recordIter, 
metrics)
+      if (GlutenColumnarDependencyHelper.isGlutenDep(dep.getClass.getName)) {
+        GlutenColumnarDependencyHelper.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/GlutenColumnarBatchSerdeHelper.scala
 
b/client-spark/spark-3/src/main/scala/org/apache/spark/shuffle/celeborn/GlutenColumnarDependencyHelper.scala
similarity index 93%
rename from 
client-spark/spark-3/src/main/scala/org/apache/spark/shuffle/celeborn/GlutenColumnarBatchSerdeHelper.scala
rename to 
client-spark/spark-3/src/main/scala/org/apache/spark/shuffle/celeborn/GlutenColumnarDependencyHelper.scala
index 942f5a2ed..ed34c1e80 100644
--- 
a/client-spark/spark-3/src/main/scala/org/apache/spark/shuffle/celeborn/GlutenColumnarBatchSerdeHelper.scala
+++ 
b/client-spark/spark-3/src/main/scala/org/apache/spark/shuffle/celeborn/GlutenColumnarDependencyHelper.scala
@@ -23,14 +23,14 @@ import org.apache.spark.sql.vectorized.ColumnarBatch
 /**
  * A helper class to be compatible with Gluten Celeborn.
  */
-object GlutenColumnarBatchSerdeHelper {
+object GlutenColumnarDependencyHelper {
 
-  def isGlutenDep(serdeName: String): Boolean = {
+  def isGlutenDep(depName: String): Boolean = {
     // scalastyle:off
     // see Gluten
     // 
https://github.com/oap-project/gluten/blob/main/gluten-core/src/main/scala/org/apache/spark/shuffle/ColumnarShuffleDependency.scala
     // scalastyle:on
-    "org.apache.spark.shuffle.ColumnarShuffleDependency".equals(serdeName)
+    "org.apache.spark.shuffle.ColumnarShuffleDependency".equals(depName)
   }
 
   def withUpdatedRecordsRead(