Skip to content

Commit 2e3614d

Browse files
authored
build: Re-enable Scala style checker and spotless (#21)
This PR re-enables Scala style checker and spotless Maven plugin. Now the CI should fail when the code style is incorrect.
1 parent 1630e49 commit 2e3614d

File tree

6 files changed

+12
-13
lines changed

6 files changed

+12
-13
lines changed

dev/scalastyle-config.xml

+5-4
Original file line numberDiff line numberDiff line change
@@ -242,9 +242,9 @@ This file is divided into 3 sections:
242242
<parameter name="groups">java,scala,org,apache,3rdParty,comet</parameter>
243243
<parameter name="group.java">javax?\..*</parameter>
244244
<parameter name="group.scala">scala\..*</parameter>
245-
<parameter name="group.org">org\..*</parameter>
246-
<parameter name="group.apache">org\.apache\..*</parameter>
247-
<parameter name="group.3rdParty">(?!org\.apache\.comet\.).*</parameter>
245+
<parameter name="group.org">org\.(?!apache\.comet).*</parameter>
246+
<parameter name="group.apache">org\.apache\.(?!comet).*</parameter>
247+
<parameter name="group.3rdParty">(?!(javax?\.|scala\.|org\.apache\.comet\.)).*</parameter>
248248
<parameter name="group.comet">org\.apache\.comet\..*</parameter>
249249
</parameters>
250250
</check>
@@ -301,7 +301,8 @@ This file is divided into 3 sections:
301301
</check>
302302

303303
<check level="error" class="org.scalastyle.scalariform.NoWhitespaceBeforeLeftBracketChecker" enabled="true"></check>
304-
<check level="error" class="org.scalastyle.scalariform.NoWhitespaceAfterLeftBracketChecker" enabled="true"></check>
304+
<!-- This rule conflicts with spotless, so disabling it for now -->
305+
<check level="error" class="org.scalastyle.scalariform.NoWhitespaceAfterLeftBracketChecker" enabled="false"></check>
305306

306307
<!-- This breaks symbolic method names so we don't turn it on. -->
307308
<!-- Maybe we should update it to allow basic symbolic names, and then we are good to go. -->

pom.xml

-2
Original file line numberDiff line numberDiff line change
@@ -740,7 +740,6 @@ under the License.
740740
</plugins>
741741
</pluginManagement>
742742
<plugins>
743-
<!--
744743
<plugin>
745744
<groupId>org.scalastyle</groupId>
746745
<artifactId>scalastyle-maven-plugin</artifactId>
@@ -778,7 +777,6 @@ under the License.
778777
</execution>
779778
</executions>
780779
</plugin>
781-
-->
782780
<plugin>
783781
<groupId>org.apache.maven.plugins</groupId>
784782
<artifactId>maven-source-plugin</artifactId>

scalafmt.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@ rewrite.imports.groups = [
3636
["scala\\..*"],
3737
["org\\..*"],
3838
["org\\.apache\\..*"],
39-
["org\\.apache\\.comet\\..*"],
4039
["com\\..*"],
40+
["org\\.apache\\.comet\\..*"],
4141
]

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ import org.apache.spark.sql.execution.datasources.v2._
3232
import org.apache.spark.sql.execution.metric._
3333
import org.apache.spark.sql.vectorized._
3434

35+
import com.google.common.base.Objects
36+
3537
import org.apache.comet.MetricsSupport
3638
import org.apache.comet.shims.ShimCometBatchScanExec
3739

38-
import com.google.common.base.Objects
39-
4040
case class CometBatchScanExec(wrapped: BatchScanExec, runtimeFilters: Seq[Expression])
4141
extends DataSourceV2ScanExecBase
4242
with ShimCometBatchScanExec

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ import org.apache.spark.sql.execution.{ColumnarToRowExec, ExecSubqueryExpression
3333
import org.apache.spark.sql.execution.metric.{SQLMetric, SQLMetrics}
3434
import org.apache.spark.sql.vectorized.ColumnarBatch
3535

36+
import com.google.common.base.Objects
37+
3638
import org.apache.comet.{CometConf, CometExecIterator, CometRuntimeException, CometSparkSessionExtensions}
3739
import org.apache.comet.CometConf.{COMET_BATCH_SIZE, COMET_DEBUG_ENABLED, COMET_EXEC_MEMORY_FRACTION}
3840
import org.apache.comet.serde.OperatorOuterClass.Operator
3941

40-
import com.google.common.base.Objects
41-
4242
/**
4343
* A Comet physical operator
4444
*/

spark/src/test/scala/org/apache/comet/parquet/ParquetReadSuite.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ import org.apache.spark.sql.internal.SQLConf
4747
import org.apache.spark.sql.types._
4848
import org.apache.spark.unsafe.types.UTF8String
4949

50+
import com.google.common.primitives.UnsignedLong
51+
5052
import org.apache.comet.CometConf
5153
import org.apache.comet.CometSparkSessionExtensions.isSpark34Plus
5254

53-
import com.google.common.primitives.UnsignedLong
54-
5555
abstract class ParquetReadSuite extends CometTestBase {
5656
import testImplicits._
5757

0 commit comments

Comments
 (0)