This is an automated email from the ASF dual-hosted git repository.
liujiayi771 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-gluten.git
The following commit(s) were added to refs/heads/main by this push:
new 281120cf64 [CORE] Add newline before top-level import statements in
scalafmt (#11502)
281120cf64 is described below
commit 281120cf649d60d3da0470212036001a88867e59
Author: Joey <[email protected]>
AuthorDate: Wed Jan 28 15:29:48 2026 +0800
[CORE] Add newline before top-level import statements in scalafmt (#11502)
---
.scalafmt.conf | 6 ++++++
.../org/apache/gluten/backendsapi/clickhouse/RuntimeConfig.scala | 1 +
.../org/apache/gluten/metrics/InputIteratorMetricsUpdater.scala | 1 +
.../main/scala/org/apache/gluten/spi/SharedLibraryLoaderMacOS.scala | 1 +
.../main/scala/org/apache/spark/shuffle/ShuffleManagerRouter.scala | 1 +
.../gluten/extension/columnar/offload/OffloadSingleNodeRules.scala | 1 +
.../gluten/extension/columnar/transition/TransitionSuite.scala | 1 +
.../datasources/parquet/GlutenParquetSchemaPruningSuite.scala | 1 +
.../org/apache/spark/sql/sources/GlutenBucketedWriteSuite.scala | 1 +
.../datasources/parquet/GlutenParquetSchemaPruningSuite.scala | 1 +
.../org/apache/spark/sql/sources/GlutenBucketedWriteSuite.scala | 1 +
.../datasources/parquet/GlutenParquetSchemaPruningSuite.scala | 1 +
.../org/apache/spark/sql/sources/GlutenBucketedWriteSuite.scala | 1 +
.../datasources/parquet/GlutenParquetSchemaPruningSuite.scala | 1 +
.../org/apache/spark/sql/sources/GlutenBucketedWriteSuite.scala | 1 +
.../datasources/parquet/GlutenParquetSchemaPruningSuite.scala | 1 +
.../org/apache/spark/sql/sources/GlutenBucketedWriteSuite.scala | 1 +
.../org/apache/spark/sql/execution/AbstractFileSourceScanExec.scala | 1 +
18 files changed, 23 insertions(+)
diff --git a/.scalafmt.conf b/.scalafmt.conf
index 937ab11383..09430f29dc 100644
--- a/.scalafmt.conf
+++ b/.scalafmt.conf
@@ -31,6 +31,12 @@ newlines.afterCurlyLambdaParams = squash # No newline after
lambda params
newlines.inInterpolation = "avoid"
newlines.avoidInResultType = true
optIn.annotationNewlines = true
+newlines.topLevelStatementBlankLines = [
+ {
+ regex = "Import"
+ blanks { before = 1 }
+ }
+]
# Scaladoc
docstrings.style = Asterisk # Javadoc style
diff --git
a/backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/RuntimeConfig.scala
b/backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/RuntimeConfig.scala
index e684620499..5e8ecdf410 100644
---
a/backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/RuntimeConfig.scala
+++
b/backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/RuntimeConfig.scala
@@ -19,6 +19,7 @@ package org.apache.gluten.backendsapi.clickhouse
import org.apache.spark.sql.internal.SQLConf
object RuntimeConfig {
+
import CHConfig.runtimeConfig
import SQLConf._
diff --git
a/backends-velox/src/main/scala/org/apache/gluten/metrics/InputIteratorMetricsUpdater.scala
b/backends-velox/src/main/scala/org/apache/gluten/metrics/InputIteratorMetricsUpdater.scala
index 8002a44ae9..79f6432645 100644
---
a/backends-velox/src/main/scala/org/apache/gluten/metrics/InputIteratorMetricsUpdater.scala
+++
b/backends-velox/src/main/scala/org/apache/gluten/metrics/InputIteratorMetricsUpdater.scala
@@ -15,6 +15,7 @@
* limitations under the License.
*/
package org.apache.gluten.metrics
+
import org.apache.spark.sql.execution.metric.SQLMetric
case class InputIteratorMetricsUpdater(metrics: Map[String, SQLMetric],
forBroadcast: Boolean)
diff --git
a/backends-velox/src/main/scala/org/apache/gluten/spi/SharedLibraryLoaderMacOS.scala
b/backends-velox/src/main/scala/org/apache/gluten/spi/SharedLibraryLoaderMacOS.scala
index 0305957905..bdf0b62408 100644
---
a/backends-velox/src/main/scala/org/apache/gluten/spi/SharedLibraryLoaderMacOS.scala
+++
b/backends-velox/src/main/scala/org/apache/gluten/spi/SharedLibraryLoaderMacOS.scala
@@ -15,6 +15,7 @@
* limitations under the License.
*/
package org.apache.gluten.spi
+
import org.apache.gluten.jni.JniLibLoader
class SharedLibraryLoaderMacOS extends SharedLibraryLoader {
diff --git
a/gluten-core/src/main/scala/org/apache/spark/shuffle/ShuffleManagerRouter.scala
b/gluten-core/src/main/scala/org/apache/spark/shuffle/ShuffleManagerRouter.scala
index 522cf01eee..1e76972fb2 100644
---
a/gluten-core/src/main/scala/org/apache/spark/shuffle/ShuffleManagerRouter.scala
+++
b/gluten-core/src/main/scala/org/apache/spark/shuffle/ShuffleManagerRouter.scala
@@ -15,6 +15,7 @@
* limitations under the License.
*/
package org.apache.spark.shuffle
+
import org.apache.spark.{ShuffleDependency, TaskContext}
import org.apache.spark.internal.Logging
import org.apache.spark.network.buffer.ManagedBuffer
diff --git
a/gluten-substrait/src/main/scala/org/apache/gluten/extension/columnar/offload/OffloadSingleNodeRules.scala
b/gluten-substrait/src/main/scala/org/apache/gluten/extension/columnar/offload/OffloadSingleNodeRules.scala
index e149ea8f5b..684fbd36f1 100644
---
a/gluten-substrait/src/main/scala/org/apache/gluten/extension/columnar/offload/OffloadSingleNodeRules.scala
+++
b/gluten-substrait/src/main/scala/org/apache/gluten/extension/columnar/offload/OffloadSingleNodeRules.scala
@@ -15,6 +15,7 @@
* limitations under the License.
*/
package org.apache.gluten.extension.columnar.offload
+
import org.apache.gluten.backendsapi.BackendsApiManager
import org.apache.gluten.config.GlutenConfig
import org.apache.gluten.execution._
diff --git
a/gluten-substrait/src/test/scala/org/apache/gluten/extension/columnar/transition/TransitionSuite.scala
b/gluten-substrait/src/test/scala/org/apache/gluten/extension/columnar/transition/TransitionSuite.scala
index 716451e2f2..3c350003ac 100644
---
a/gluten-substrait/src/test/scala/org/apache/gluten/extension/columnar/transition/TransitionSuite.scala
+++
b/gluten-substrait/src/test/scala/org/apache/gluten/extension/columnar/transition/TransitionSuite.scala
@@ -24,6 +24,7 @@ import org.apache.spark.sql.execution._
import org.apache.spark.sql.test.SharedSparkSession
class TransitionSuite extends SharedSparkSession with TransitionSuiteBase with
WithDummyBackend {
+
import TransitionSuite._
import TransitionSuiteBase._
diff --git
a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetSchemaPruningSuite.scala
b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetSchemaPruningSuite.scala
index 854961e48f..495b4c3dfe 100644
---
a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetSchemaPruningSuite.scala
+++
b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetSchemaPruningSuite.scala
@@ -15,6 +15,7 @@
* limitations under the License.
*/
package org.apache.spark.sql.execution.datasources.parquet
+
import org.apache.gluten.execution.{BatchScanExecTransformer,
FileSourceScanExecTransformer}
import org.apache.spark.SparkConf
diff --git
a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/sources/GlutenBucketedWriteSuite.scala
b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/sources/GlutenBucketedWriteSuite.scala
index e5dd2de8b8..2083a99367 100644
---
a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/sources/GlutenBucketedWriteSuite.scala
+++
b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/sources/GlutenBucketedWriteSuite.scala
@@ -15,6 +15,7 @@
* limitations under the License.
*/
package org.apache.spark.sql.sources
+
import org.apache.spark.sql.GlutenSQLTestsBaseTrait
class GlutenBucketedWriteWithoutHiveSupportSuite
diff --git
a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetSchemaPruningSuite.scala
b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetSchemaPruningSuite.scala
index 854961e48f..495b4c3dfe 100644
---
a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetSchemaPruningSuite.scala
+++
b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetSchemaPruningSuite.scala
@@ -15,6 +15,7 @@
* limitations under the License.
*/
package org.apache.spark.sql.execution.datasources.parquet
+
import org.apache.gluten.execution.{BatchScanExecTransformer,
FileSourceScanExecTransformer}
import org.apache.spark.SparkConf
diff --git
a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/sources/GlutenBucketedWriteSuite.scala
b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/sources/GlutenBucketedWriteSuite.scala
index e5dd2de8b8..2083a99367 100644
---
a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/sources/GlutenBucketedWriteSuite.scala
+++
b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/sources/GlutenBucketedWriteSuite.scala
@@ -15,6 +15,7 @@
* limitations under the License.
*/
package org.apache.spark.sql.sources
+
import org.apache.spark.sql.GlutenSQLTestsBaseTrait
class GlutenBucketedWriteWithoutHiveSupportSuite
diff --git
a/gluten-ut/spark35/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetSchemaPruningSuite.scala
b/gluten-ut/spark35/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetSchemaPruningSuite.scala
index 854961e48f..495b4c3dfe 100644
---
a/gluten-ut/spark35/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetSchemaPruningSuite.scala
+++
b/gluten-ut/spark35/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetSchemaPruningSuite.scala
@@ -15,6 +15,7 @@
* limitations under the License.
*/
package org.apache.spark.sql.execution.datasources.parquet
+
import org.apache.gluten.execution.{BatchScanExecTransformer,
FileSourceScanExecTransformer}
import org.apache.spark.SparkConf
diff --git
a/gluten-ut/spark35/src/test/scala/org/apache/spark/sql/sources/GlutenBucketedWriteSuite.scala
b/gluten-ut/spark35/src/test/scala/org/apache/spark/sql/sources/GlutenBucketedWriteSuite.scala
index e5dd2de8b8..2083a99367 100644
---
a/gluten-ut/spark35/src/test/scala/org/apache/spark/sql/sources/GlutenBucketedWriteSuite.scala
+++
b/gluten-ut/spark35/src/test/scala/org/apache/spark/sql/sources/GlutenBucketedWriteSuite.scala
@@ -15,6 +15,7 @@
* limitations under the License.
*/
package org.apache.spark.sql.sources
+
import org.apache.spark.sql.GlutenSQLTestsBaseTrait
class GlutenBucketedWriteWithoutHiveSupportSuite
diff --git
a/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetSchemaPruningSuite.scala
b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetSchemaPruningSuite.scala
index 854961e48f..495b4c3dfe 100644
---
a/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetSchemaPruningSuite.scala
+++
b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetSchemaPruningSuite.scala
@@ -15,6 +15,7 @@
* limitations under the License.
*/
package org.apache.spark.sql.execution.datasources.parquet
+
import org.apache.gluten.execution.{BatchScanExecTransformer,
FileSourceScanExecTransformer}
import org.apache.spark.SparkConf
diff --git
a/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/sources/GlutenBucketedWriteSuite.scala
b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/sources/GlutenBucketedWriteSuite.scala
index e5dd2de8b8..2083a99367 100644
---
a/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/sources/GlutenBucketedWriteSuite.scala
+++
b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/sources/GlutenBucketedWriteSuite.scala
@@ -15,6 +15,7 @@
* limitations under the License.
*/
package org.apache.spark.sql.sources
+
import org.apache.spark.sql.GlutenSQLTestsBaseTrait
class GlutenBucketedWriteWithoutHiveSupportSuite
diff --git
a/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetSchemaPruningSuite.scala
b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetSchemaPruningSuite.scala
index 854961e48f..495b4c3dfe 100644
---
a/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetSchemaPruningSuite.scala
+++
b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetSchemaPruningSuite.scala
@@ -15,6 +15,7 @@
* limitations under the License.
*/
package org.apache.spark.sql.execution.datasources.parquet
+
import org.apache.gluten.execution.{BatchScanExecTransformer,
FileSourceScanExecTransformer}
import org.apache.spark.SparkConf
diff --git
a/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/sources/GlutenBucketedWriteSuite.scala
b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/sources/GlutenBucketedWriteSuite.scala
index e5dd2de8b8..2083a99367 100644
---
a/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/sources/GlutenBucketedWriteSuite.scala
+++
b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/sources/GlutenBucketedWriteSuite.scala
@@ -15,6 +15,7 @@
* limitations under the License.
*/
package org.apache.spark.sql.sources
+
import org.apache.spark.sql.GlutenSQLTestsBaseTrait
class GlutenBucketedWriteWithoutHiveSupportSuite
diff --git
a/shims/spark33/src/main/scala/org/apache/spark/sql/execution/AbstractFileSourceScanExec.scala
b/shims/spark33/src/main/scala/org/apache/spark/sql/execution/AbstractFileSourceScanExec.scala
index 01df5ba621..0c43289ab8 100644
---
a/shims/spark33/src/main/scala/org/apache/spark/sql/execution/AbstractFileSourceScanExec.scala
+++
b/shims/spark33/src/main/scala/org/apache/spark/sql/execution/AbstractFileSourceScanExec.scala
@@ -15,6 +15,7 @@
* limitations under the License.
*/
package org.apache.spark.sql.execution
+
import org.apache.spark.rdd.RDD
import org.apache.spark.sql.catalyst.{InternalRow, TableIdentifier}
import org.apache.spark.sql.catalyst.catalog.BucketSpec
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
