style: fix scalastyle and spotless formatting

Author: andygrove

spark/src/main/scala/org/apache/spark/sql/comet/CometNativeScanExec.scala

@@ -67,7 +67,7 @@ case class CometNativeScanExec(
     disableBucketedScan: Boolean = false,
     originalPlan: FileSourceScanExec,
     override val serializedPlanOpt: SerializedPlan,
-    @transient planner: FilePartitionPlanner, // Lazy access to file partitions without serializing with plan
+    @transient planner: FilePartitionPlanner,
     sourceKey: String) // Key for PlanDataInjector to match common+partition data at runtime
     extends CometLeafExec
     with DataSourceScanExec

spark/src/main/scala/org/apache/spark/sql/comet/FilePartitionPlanner.scala

@@ -60,9 +60,7 @@ class FilePartitionPlanner(
     val optimizerMetadataTimeNs = relation.location.metadataOpsTimeNs.getOrElse(0L)
     val startTime = System.nanoTime()
     val ret =
-      relation.location.listFiles(
-        partitionFilters.filterNot(isDynamicPruningFilter),
-        dataFilters)
+      relation.location.listFiles(partitionFilters.filterNot(isDynamicPruningFilter), dataFilters)
     setFilesNumAndSizeMetric(ret, true)
     val timeTakenMs =
       NANOSECONDS.toMillis((System.nanoTime() - startTime) + optimizerMetadataTimeNs)
@@ -115,12 +113,10 @@ class FilePartitionPlanner(
    * Send the driver-side metrics. Before calling this function, selectedPartitions has been
    * initialized. See SPARK-26327 for more details.
    */
-  def sendDriverMetrics(
-      metricsMap: Map[String, SQLMetric],
-      sparkContext: SparkContext): Unit = {
+  def sendDriverMetrics(metricsMap: Map[String, SQLMetric], sparkContext: SparkContext): Unit = {
     accumulatedMetrics.foreach(e => metricsMap(e._1).add(e._2))
-    val executionId = sparkContext.getLocalProperty(
-      org.apache.spark.sql.execution.SQLExecution.EXECUTION_ID_KEY)
+    val executionId =
+      sparkContext.getLocalProperty(org.apache.spark.sql.execution.SQLExecution.EXECUTION_ID_KEY)
     org.apache.spark.sql.execution.metric.SQLMetrics.postDriverMetricUpdates(
       sparkContext,
       executionId,
@@ -166,8 +162,7 @@ class FilePartitionPlanner(
         .groupBy { f =>
           BucketingUtils
             .getBucketId(new Path(f.filePath.toString()).getName)
-            .getOrElse(
-              throw QueryExecutionErrors.invalidBucketFile(f.filePath.toString()))
+            .getOrElse(throw QueryExecutionErrors.invalidBucketFile(f.filePath.toString()))
         }
 
     val prunedFilesGroupedToBuckets = if (optionalBucketSet.isDefined) {
@@ -196,9 +191,7 @@ class FilePartitionPlanner(
       }
       .getOrElse {
         Seq.tabulate(bucketSpec.numBuckets) { bucketId =>
-          FilePartition(
-            bucketId,
-            prunedFilesGroupedToBuckets.getOrElse(bucketId, Array.empty))
+          FilePartition(bucketId, prunedFilesGroupedToBuckets.getOrElse(bucketId, Array.empty))
         }
       }
   }
@@ -256,9 +249,6 @@ class FilePartitionPlanner(
       }
       .sortBy(_.length)(implicitly[Ordering[Long]].reverse)
 
-    FilePartition.getFilePartitions(
-      relation.sparkSession,
-      splitFiles,
-      maxSplitBytes)
+    FilePartition.getFilePartitions(relation.sparkSession, splitFiles, maxSplitBytes)
   }
 }

spark/src/main/spark-3.5/org/apache/spark/sql/comet/shims/ShimFilePartitionPlanner.scala

@@ -36,8 +36,7 @@ trait ShimFilePartitionPlanner {
     VersionUtils.majorMinorPatchVersion(SPARK_VERSION_SHORT) match {
       case Some((major, minor, patch)) => (major, minor, patch) >= (3, 5, 5)
       case None =>
-        throw new IllegalArgumentException(
-          s"Malformed Spark version: $SPARK_VERSION_SHORT")
+        throw new IllegalArgumentException(s"Malformed Spark version: $SPARK_VERSION_SHORT")
     }
   }
 
@@ -60,10 +59,7 @@ trait ShimFilePartitionPlanner {
         .asInstanceOf[PartitionedFile]
     } else {
       PartitionedFileUtil.getClass
-        .getMethod(
-          "getPartitionedFile",
-          classOf[FileStatusWithMetadata],
-          classOf[InternalRow])
+        .getMethod("getPartitionedFile", classOf[FileStatusWithMetadata], classOf[InternalRow])
         .invoke(PartitionedFileUtil, f, p.values)
         .asInstanceOf[PartitionedFile]
     }

spark/src/main/spark-4.0/org/apache/spark/sql/comet/shims/ShimFilePartitionPlanner.scala

@@ -43,10 +43,5 @@ trait ShimFilePartitionPlanner {
       isSplitable: Boolean,
       maxSplitBytes: Long,
       partitionValues: InternalRow): Seq[PartitionedFile] =
-    PartitionedFileUtil.splitFiles(
-      file,
-      filePath,
-      isSplitable,
-      maxSplitBytes,
-      partitionValues)
+    PartitionedFileUtil.splitFiles(file, filePath, isSplitable, maxSplitBytes, partitionValues)
 }