rebase

yew1eb · yew1eb · commit e11e71b38e89 · 2026-01-19T21:58:38.000+08:00
diff --git a/dev/auron-it/pom.xml b/dev/auron-it/pom.xml
@@ -81,6 +81,70 @@
 
   <build>
     <plugins>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+        <version>${checkstyle-plugin.version}</version>
+        <configuration>
+          <failOnViolation>true</failOnViolation>
+          <includeTestSourceDirectory>true</includeTestSourceDirectory>
+          <sourceDirectories>
+            <directory>${project.basedir}/src/main/java</directory>
+            <directory>${project.basedir}/src/main/scala</directory>
+          </sourceDirectories>
+          <testSourceDirectories>
+            <directory>${project.basedir}/src/test/java</directory>
+          </testSourceDirectories>
+          <suppressionsLocation>${maven.multiModuleProjectDirectory}/../../dev/checkstyle-suppressions.xml</suppressionsLocation>
+          <configLocation>${maven.multiModuleProjectDirectory}/../../dev/checkstyle.xml</configLocation>
+          <outputFile>${project.basedir}/target/checkstyle-output.xml</outputFile>
+          <inputEncoding>UTF-8</inputEncoding>
+          <outputEncoding>UTF-8</outputEncoding>
+        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>com.puppycrawl.tools</groupId>
+            <artifactId>checkstyle</artifactId>
+            <version>8.29</version>
+          </dependency>
+        </dependencies>
+        <executions>
+          <execution>
+            <goals>
+              <goal>check</goal>
+            </goals>
+            <phase>validate</phase>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <groupId>org.scalastyle</groupId>
+        <artifactId>scalastyle-maven-plugin</artifactId>
+        <version>${maven.plugin.scalastyle.version}</version>
+        <configuration>
+          <verbose>false</verbose>
+          <failOnViolation>true</failOnViolation>
+          <includeTestSourceDirectory>false</includeTestSourceDirectory>
+          <failOnWarning>false</failOnWarning>
+          <sourceDirectory>${basedir}/src/main/scala</sourceDirectory>
+          <testSourceDirectory>${basedir}/src/test/scala</testSourceDirectory>
+          <configLocation>${maven.multiModuleProjectDirectory}/../../dev/scalastyle-config.xml</configLocation>
+          <outputFile>${basedir}/target/scalastyle-output.xml</outputFile>
+          <inputEncoding>${project.build.sourceEncoding}</inputEncoding>
+          <outputEncoding>${project.reporting.outputEncoding}</outputEncoding>
+        </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>check</goal>
+            </goals>
+            <phase>validate</phase>
+          </execution>
+        </executions>
+      </plugin>
+
       <!-- spotless -->
       <plugin>
         <groupId>com.diffplug.spotless</groupId>
diff --git a/dev/auron-it/src/main/scala/org/apache/auron/integration/Main.scala b/dev/auron-it/src/main/scala/org/apache/auron/integration/Main.scala
@@ -71,6 +71,7 @@ object Main {
     OParser.parse(parser, args, SuiteArgs())
   }
 
+  // scalastyle:off
   def main(mainArgs: Array[String]): Unit = {
     parseArgs(mainArgs) match {
       case Some(args) =>
@@ -124,3 +125,4 @@ object Main {
     println("")
   }
 }
+// scalastyle:on
diff --git a/dev/auron-it/src/main/scala/org/apache/auron/integration/QueryRunner.scala b/dev/auron-it/src/main/scala/org/apache/auron/integration/QueryRunner.scala
@@ -52,7 +52,7 @@ class QueryRunner(readQuery: String => String) {
     }
 
     val durationSec = (System.currentTimeMillis() - startTime) / 1000.0
-
+    // scalastyle:off println
     result match {
       case Success((rows, rowCount, planStr)) =>
         println(s"Query $queryId executed successfully in $durationSec seconds.")
@@ -75,5 +75,6 @@ class QueryRunner(readQuery: String => String) {
           plan = "",
           errorMsg = Some(e.getMessage))
     }
+    // scalastyle:on
   }
 }
diff --git a/dev/auron-it/src/main/scala/org/apache/auron/integration/SessionManager.scala b/dev/auron-it/src/main/scala/org/apache/auron/integration/SessionManager.scala
@@ -53,6 +53,7 @@ class SessionManager(val extraSparkConf: Map[String, String]) {
 
   def auronSession: SparkSession = getOrSwitch("auron", "auron-app")
 
+  // scalastyle:off println
   private def getOrSwitch(mode: String, appName: String): SparkSession = synchronized {
     if (currentMode.contains(mode) && currentSession.isDefined) {
       currentSession.get
@@ -98,4 +99,5 @@ class SessionManager(val extraSparkConf: Map[String, String]) {
     stopCurrentSession()
     println("SparkSession closed.")
   }
+  // scalastyle:on
 }
diff --git a/dev/auron-it/src/main/scala/org/apache/auron/integration/comparison/PlanStabilityChecker.scala b/dev/auron-it/src/main/scala/org/apache/auron/integration/comparison/PlanStabilityChecker.scala
@@ -33,6 +33,7 @@ class PlanStabilityChecker(
     regenGoldenFiles: Boolean = false,
     planCheck: Boolean = false) {
 
+  // scalastyle:off println
   private lazy val isSupported: Boolean = Shims.get.shimVersion match {
     case "spark-3.5" => true
     case other =>
@@ -122,4 +123,5 @@ class PlanStabilityChecker(
 
     normalizeLocation(argumentsNormalized)
   }
+  // scalastyle:on
 }
diff --git a/dev/auron-it/src/main/scala/org/apache/auron/integration/comparison/QueryResultComparator.scala b/dev/auron-it/src/main/scala/org/apache/auron/integration/comparison/QueryResultComparator.scala
@@ -38,6 +38,8 @@ trait QueryComparator {
 
 class QueryResultComparator extends QueryComparator {
   private val colSep = "<|COL|>"
+
+  // scalastyle:off println
   override def compare(
       baseline: QueryExecutionResult,
       test: QueryExecutionResult): ComparisonResult = {
@@ -136,4 +138,5 @@ class QueryResultComparator extends QueryComparator {
     }
     true
   }
+  // scalastyle:on
 }
diff --git a/dev/auron-it/src/main/scala/org/apache/auron/integration/tpcds/TPCDSFeatures.scala b/dev/auron-it/src/main/scala/org/apache/auron/integration/tpcds/TPCDSFeatures.scala
@@ -156,6 +156,7 @@ trait TPCDSFeatures {
     "time_dim",
     "web_page")
 
+  // scalastyle:off
   def setupTables(dataLocation: String, spark: SparkSession): Map[String, Long] = {
     println(s"Setting up TPC-DS tables from: $dataLocation")
     tpcdsTables.map { tableName =>
@@ -211,3 +212,4 @@ trait TPCDSFeatures {
     path.toFile
   }
 }
+// scalastyle:on
diff --git a/dev/auron-it/src/main/scala/org/apache/auron/integration/tpcds/TPCDSSuite.scala b/dev/auron-it/src/main/scala/org/apache/auron/integration/tpcds/TPCDSSuite.scala
@@ -34,6 +34,7 @@ class TPCDSSuite(args: SuiteArgs) extends Suite(args) with TPCDSFeatures {
     regenGoldenFiles = args.regenGoldenFiles,
     planCheck = args.enablePlanCheck)
 
+  // scalastyle:off println
   override def run(): Int = {
     val queries = filterQueries(args.queryFilter)
     if (queries.isEmpty) {
@@ -135,7 +136,7 @@ class TPCDSSuite(args: SuiteArgs) extends Suite(args) with TPCDSFeatures {
   private def printPlanStability(results: Seq[ComparisonResult]): Unit = {
     println("\n" + "=" * 60)
     println(s"Auron Plan Stability (${Shims.get.shimVersion})")
-    println("−" * 60)
+    println("-" * 60)
     println(f"${"Query"}%-6s ${"Stable"}%-7s")
     println("-" * 60)
     results.foreach { r =>
@@ -153,11 +154,12 @@ class TPCDSSuite(args: SuiteArgs) extends Suite(args) with TPCDSFeatures {
     val totalUpdated = ids.size
     println("\n" + "=" * 60)
     println(s"Auron Golden Files (${Shims.get.shimVersion})")
-    println("−" * 60)
+    println("-" * 60)
     println(s"Updated queries: $totalUpdated")
     println(ids.mkString("- ", ", ", ""))
     println(s"Output directory: ${goldenOutputDir}")
   }
+  // scalastyle:on
 }
 
 object TPCDSSuite {
diff --git a/dev/checkstyle.xml b/dev/checkstyle.xml
@@ -48,10 +48,6 @@
 
     <property name="fileExtensions" value="java, properties, xml"/>
 
-    <module name="SuppressionFilter">
-      <property name="file" value="dev/checkstyle-suppressions.xml"/>
-    </module>
-
     <!-- Checks for whitespace                               -->
     <!-- See http://checkstyle.sf.net/config_whitespace.html -->
     <module name="FileTabCharacter">
diff --git a/dev/scalastyle-config.xml b/dev/scalastyle-config.xml
@@ -294,7 +294,7 @@ This file is divided into 3 sections:
     <customMessage>Use contentEquals of SparkFileUtils or Utils instead.</customMessage>
   </check>
 
-  <check customId="toByteArray" level="error" class="org.scalastyle.file.RegexChecker" enabled="true">
+  <check customId="toByteArray" level="error" class="org.scalastyle.file.RegexChecker" enabled="disable">
     <parameters><parameter name="regex">\bFiles\.toByteArray\b</parameter></parameters>
     <customMessage>Use java.nio.file.Files.readAllBytes instead.</customMessage>
   </check>
@@ -304,7 +304,7 @@ This file is divided into 3 sections:
     <customMessage>Use java.nio.file.Files.newInputStream instead.</customMessage>
   </check>
 
-  <check customId="getTempDirectory" level="error" class="org.scalastyle.file.RegexChecker" enabled="true">
+  <check customId="getTempDirectory" level="error" class="org.scalastyle.file.RegexChecker" enabled="disable">
     <parameters><parameter name="regex">\bFileUtils\.getTempDirectory\b</parameter></parameters>
     <customMessage>Use System.getProperty instead.</customMessage>
   </check>
@@ -435,7 +435,7 @@ This file is divided into 3 sections:
     <customMessage>Use touch of SparkFileUtil or Utils instead.</customMessage>
   </check>
 
-  <check customId="writeStringToFile" level="error" class="org.scalastyle.file.RegexChecker" enabled="true">
+  <check customId="writeStringToFile" level="error" class="org.scalastyle.file.RegexChecker" enabled="disable">
     <parameters><parameter name="regex">\bFileUtils\.writeStringToFile\b</parameter></parameters>
     <customMessage>Use java.nio.file.Files.writeString instead.</customMessage>
   </check>
@@ -506,7 +506,7 @@ This file is divided into 3 sections:
     <customMessage>Use java.util.HexFormat instead</customMessage>
   </check>
 
-  <check customId="commonsiofileutils" level="error" class="org.scalastyle.file.RegexChecker" enabled="true">
+  <check customId="commonsiofileutils" level="error" class="org.scalastyle.file.RegexChecker" enabled="disable">
     <parameters><parameter name="regex">org\.apache\.commons\.io\.FileUtils\b</parameter></parameters>
     <customMessage>Use Java API or Spark's JavaUtils/SparkSystemUtils/Utils instead</customMessage>
   </check>

Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,7 @@ object Main {`
`71`	`71`	`OParser.parse(parser, args, SuiteArgs())`
`72`	`72`	`}`
`73`	`73`
	`74`	`+ // scalastyle:off`
`74`	`75`	`def main(mainArgs: Array[String]): Unit = {`
`75`	`76`	`parseArgs(mainArgs) match {`
`76`	`77`	`case Some(args) =>`
`@@ -124,3 +125,4 @@ object Main {`
`124`	`125`	`println("")`
`125`	`126`	`}`
`126`	`127`	`}`
	`128`	`+// scalastyle:on`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ class QueryRunner(readQuery: String => String) {`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`val durationSec = (System.currentTimeMillis() - startTime) / 1000.0`
`55`		`-`
	`55`	`+ // scalastyle:off println`
`56`	`56`	`result match {`
`57`	`57`	`case Success((rows, rowCount, planStr)) =>`
`58`	`58`	`println(s"Query $queryId executed successfully in $durationSec seconds.")`
`@@ -75,5 +75,6 @@ class QueryRunner(readQuery: String => String) {`
`75`	`75`	`plan = "",`
`76`	`76`	`errorMsg = Some(e.getMessage))`
`77`	`77`	`}`
	`78`	`+ // scalastyle:on`
`78`	`79`	`}`
`79`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,7 @@ class SessionManager(val extraSparkConf: Map[String, String]) {`
`53`	`53`
`54`	`54`	`def auronSession: SparkSession = getOrSwitch("auron", "auron-app")`
`55`	`55`
	`56`	`+ // scalastyle:off println`
`56`	`57`	`private def getOrSwitch(mode: String, appName: String): SparkSession = synchronized {`
`57`	`58`	`if (currentMode.contains(mode) && currentSession.isDefined) {`
`58`	`59`	`currentSession.get`
`@@ -98,4 +99,5 @@ class SessionManager(val extraSparkConf: Map[String, String]) {`
`98`	`99`	`stopCurrentSession()`
`99`	`100`	`println("SparkSession closed.")`
`100`	`101`	`}`
	`102`	`+ // scalastyle:on`
`101`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ class PlanStabilityChecker(`
`33`	`33`	`regenGoldenFiles: Boolean = false,`
`34`	`34`	`planCheck: Boolean = false) {`
`35`	`35`
	`36`	`+ // scalastyle:off println`
`36`	`37`	`private lazy val isSupported: Boolean = Shims.get.shimVersion match {`
`37`	`38`	`case "spark-3.5" => true`
`38`	`39`	`case other =>`
`@@ -122,4 +123,5 @@ class PlanStabilityChecker(`
`122`	`123`
`123`	`124`	`normalizeLocation(argumentsNormalized)`
`124`	`125`	`}`
	`126`	`+ // scalastyle:on`
`125`	`127`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,8 @@ trait QueryComparator {`
`38`	`38`
`39`	`39`	`class QueryResultComparator extends QueryComparator {`
`40`	`40`	`private val colSep = "<\|COL\|>"`
	`41`	`+`
	`42`	`+ // scalastyle:off println`
`41`	`43`	`override def compare(`
`42`	`44`	`baseline: QueryExecutionResult,`
`43`	`45`	`test: QueryExecutionResult): ComparisonResult = {`
`@@ -136,4 +138,5 @@ class QueryResultComparator extends QueryComparator {`
`136`	`138`	`}`
`137`	`139`	`true`
`138`	`140`	`}`
	`141`	`+ // scalastyle:on`
`139`	`142`	`}`
Original file line number	Diff line number	Diff line change
`@@ -156,6 +156,7 @@ trait TPCDSFeatures {`
`156`	`156`	`"time_dim",`
`157`	`157`	`"web_page")`
`158`	`158`
	`159`	`+ // scalastyle:off`
`159`	`160`	`def setupTables(dataLocation: String, spark: SparkSession): Map[String, Long] = {`
`160`	`161`	`println(s"Setting up TPC-DS tables from: $dataLocation")`
`161`	`162`	`tpcdsTables.map { tableName =>`
`@@ -211,3 +212,4 @@ trait TPCDSFeatures {`
`211`	`212`	`path.toFile`
`212`	`213`	`}`
`213`	`214`	`}`
	`215`	`+// scalastyle:on`