fixup

apache · Aug 26, 2024 · ef26b85 · ef26b85
1 parent 540da45
commit ef26b85
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 11 deletions.
diff --git a/gluten-data/src/main/scala/org/apache/gluten/metrics/HashAggregateMetricsUpdater.scala b/gluten-data/src/main/scala/org/apache/gluten/metrics/HashAggregateMetricsUpdater.scala
@@ -17,6 +17,7 @@
 package org.apache.gluten.metrics
 
 import org.apache.gluten.substrait.AggregationParams
+
 import org.apache.spark.sql.execution.metric.SQLMetric
 import org.apache.spark.sql.utils.SparkMetricsUtil
 import org.apache.spark.util.TaskResources
@@ -83,9 +84,11 @@ class HashAggregateMetricsUpdaterImpl(val metrics: Map[String, SQLMetric])
       idx += 1
     }
     if (TaskResources.inSparkTask()) {
-      SparkMetricsUtil.incMemoryBytesSpilled(TaskResources.getLocalTaskContext().taskMetrics(),
+      SparkMetricsUtil.incMemoryBytesSpilled(
+        TaskResources.getLocalTaskContext().taskMetrics(),
         aggMetrics.spilledInputBytes)
-      SparkMetricsUtil.incDiskBytesSpilled(TaskResources.getLocalTaskContext().taskMetrics(),
+      SparkMetricsUtil.incDiskBytesSpilled(
+        TaskResources.getLocalTaskContext().taskMetrics(),
         aggMetrics.spilledBytes)
     }
   }

diff --git a/gluten-data/src/main/scala/org/apache/gluten/metrics/JoinMetricsUpdater.scala b/gluten-data/src/main/scala/org/apache/gluten/metrics/JoinMetricsUpdater.scala
@@ -18,6 +18,7 @@ package org.apache.gluten.metrics
 
 import org.apache.gluten.metrics.Metrics.SingleMetric
 import org.apache.gluten.substrait.JoinParams
+
 import org.apache.spark.sql.execution.metric.SQLMetric
 import org.apache.spark.sql.utils.SparkMetricsUtil
 import org.apache.spark.util.TaskResources
@@ -152,13 +153,17 @@ class HashJoinMetricsUpdater(override val metrics: Map[String, SQLMetric])
       idx += 1
     }
     if (TaskResources.inSparkTask()) {
-      SparkMetricsUtil.incMemoryBytesSpilled(TaskResources.getLocalTaskContext().taskMetrics(),
+      SparkMetricsUtil.incMemoryBytesSpilled(
+        TaskResources.getLocalTaskContext().taskMetrics(),
         hashProbeMetrics.spilledInputBytes)
-      SparkMetricsUtil.incDiskBytesSpilled(TaskResources.getLocalTaskContext().taskMetrics(),
+      SparkMetricsUtil.incDiskBytesSpilled(
+        TaskResources.getLocalTaskContext().taskMetrics(),
         hashProbeMetrics.spilledBytes)
-      SparkMetricsUtil.incMemoryBytesSpilled(TaskResources.getLocalTaskContext().taskMetrics(),
+      SparkMetricsUtil.incMemoryBytesSpilled(
+        TaskResources.getLocalTaskContext().taskMetrics(),
         hashBuildMetrics.spilledInputBytes)
-      SparkMetricsUtil.incDiskBytesSpilled(TaskResources.getLocalTaskContext().taskMetrics(),
+      SparkMetricsUtil.incDiskBytesSpilled(
+        TaskResources.getLocalTaskContext().taskMetrics(),
         hashBuildMetrics.spilledBytes)
     }
   }

diff --git a/gluten-data/src/main/scala/org/apache/gluten/metrics/SortMetricsUpdater.scala b/gluten-data/src/main/scala/org/apache/gluten/metrics/SortMetricsUpdater.scala
@@ -37,9 +37,11 @@ class SortMetricsUpdater(val metrics: Map[String, SQLMetric]) extends MetricsUpd
       metrics("spilledPartitions") += operatorMetrics.spilledPartitions
       metrics("spilledFiles") += operatorMetrics.spilledFiles
       if (TaskResources.inSparkTask()) {
-        SparkMetricsUtil.incMemoryBytesSpilled(TaskResources.getLocalTaskContext().taskMetrics(),
+        SparkMetricsUtil.incMemoryBytesSpilled(
+          TaskResources.getLocalTaskContext().taskMetrics(),
           operatorMetrics.spilledInputBytes)
-        SparkMetricsUtil.incDiskBytesSpilled(TaskResources.getLocalTaskContext().taskMetrics(),
+        SparkMetricsUtil.incDiskBytesSpilled(
+          TaskResources.getLocalTaskContext().taskMetrics(),
           operatorMetrics.spilledBytes)
       }
     }

diff --git a/gluten-data/src/main/scala/org/apache/spark/sql/utils/SparkMetricsUtil.scala b/gluten-data/src/main/scala/org/apache/spark/sql/utils/SparkMetricsUtil.scala
@@ -14,12 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.spark.sql.utils
 
 import org.apache.spark.executor.TaskMetrics
 
 object SparkMetricsUtil {
-   def incMemoryBytesSpilled(task: TaskMetrics, v: Long): Unit = task.incMemoryBytesSpilled(v)
-   def incDiskBytesSpilled(task: TaskMetrics, v: Long): Unit = task.incDiskBytesSpilled(v)
+  def incMemoryBytesSpilled(task: TaskMetrics, v: Long): Unit = task.incMemoryBytesSpilled(v)
+  def incDiskBytesSpilled(task: TaskMetrics, v: Long): Unit = task.incDiskBytesSpilled(v)
 }