Skip to content

Commit e11e71b

Browse files
yew1ebyew1eb
committed
rebase
1 parent f722439 commit e11e71b

10 files changed

Lines changed: 85 additions & 11 deletions

File tree

‎dev/auron-it/pom.xml‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,70 @@
8181

8282
<build>
8383
<plugins>
84+
85+
<plugin>
86+
<groupId>org.apache.maven.plugins</groupId>
87+
<artifactId>maven-checkstyle-plugin</artifactId>
88+
<version>${checkstyle-plugin.version}</version>
89+
<configuration>
90+
<failOnViolation>true</failOnViolation>
91+
<includeTestSourceDirectory>true</includeTestSourceDirectory>
92+
<sourceDirectories>
93+
<directory>${project.basedir}/src/main/java</directory>
94+
<directory>${project.basedir}/src/main/scala</directory>
95+
</sourceDirectories>
96+
<testSourceDirectories>
97+
<directory>${project.basedir}/src/test/java</directory>
98+
</testSourceDirectories>
99+
<suppressionsLocation>${maven.multiModuleProjectDirectory}/../../dev/checkstyle-suppressions.xml</suppressionsLocation>
100+
<configLocation>${maven.multiModuleProjectDirectory}/../../dev/checkstyle.xml</configLocation>
101+
<outputFile>${project.basedir}/target/checkstyle-output.xml</outputFile>
102+
<inputEncoding>UTF-8</inputEncoding>
103+
<outputEncoding>UTF-8</outputEncoding>
104+
</configuration>
105+
<dependencies>
106+
<dependency>
107+
<groupId>com.puppycrawl.tools</groupId>
108+
<artifactId>checkstyle</artifactId>
109+
<version>8.29</version>
110+
</dependency>
111+
</dependencies>
112+
<executions>
113+
<execution>
114+
<goals>
115+
<goal>check</goal>
116+
</goals>
117+
<phase>validate</phase>
118+
</execution>
119+
</executions>
120+
</plugin>
121+
122+
<plugin>
123+
<groupId>org.scalastyle</groupId>
124+
<artifactId>scalastyle-maven-plugin</artifactId>
125+
<version>${maven.plugin.scalastyle.version}</version>
126+
<configuration>
127+
<verbose>false</verbose>
128+
<failOnViolation>true</failOnViolation>
129+
<includeTestSourceDirectory>false</includeTestSourceDirectory>
130+
<failOnWarning>false</failOnWarning>
131+
<sourceDirectory>${basedir}/src/main/scala</sourceDirectory>
132+
<testSourceDirectory>${basedir}/src/test/scala</testSourceDirectory>
133+
<configLocation>${maven.multiModuleProjectDirectory}/../../dev/scalastyle-config.xml</configLocation>
134+
<outputFile>${basedir}/target/scalastyle-output.xml</outputFile>
135+
<inputEncoding>${project.build.sourceEncoding}</inputEncoding>
136+
<outputEncoding>${project.reporting.outputEncoding}</outputEncoding>
137+
</configuration>
138+
<executions>
139+
<execution>
140+
<goals>
141+
<goal>check</goal>
142+
</goals>
143+
<phase>validate</phase>
144+
</execution>
145+
</executions>
146+
</plugin>
147+
84148
<!-- spotless -->
85149
<plugin>
86150
<groupId>com.diffplug.spotless</groupId>

‎dev/auron-it/src/main/scala/org/apache/auron/integration/Main.scala‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ object Main {
7171
OParser.parse(parser, args, SuiteArgs())
7272
}
7373

74+
// scalastyle:off
7475
def main(mainArgs: Array[String]): Unit = {
7576
parseArgs(mainArgs) match {
7677
case Some(args) =>
@@ -124,3 +125,4 @@ object Main {
124125
println("")
125126
}
126127
}
128+
// scalastyle:on

‎dev/auron-it/src/main/scala/org/apache/auron/integration/QueryRunner.scala‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class QueryRunner(readQuery: String => String) {
5252
}
5353

5454
val durationSec = (System.currentTimeMillis() - startTime) / 1000.0
55-
55+
// scalastyle:off println
5656
result match {
5757
case Success((rows, rowCount, planStr)) =>
5858
println(s"Query $queryId executed successfully in $durationSec seconds.")
@@ -75,5 +75,6 @@ class QueryRunner(readQuery: String => String) {
7575
plan = "",
7676
errorMsg = Some(e.getMessage))
7777
}
78+
// scalastyle:on
7879
}
7980
}

‎dev/auron-it/src/main/scala/org/apache/auron/integration/SessionManager.scala‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ class SessionManager(val extraSparkConf: Map[String, String]) {
5353

5454
def auronSession: SparkSession = getOrSwitch("auron", "auron-app")
5555

56+
// scalastyle:off println
5657
private def getOrSwitch(mode: String, appName: String): SparkSession = synchronized {
5758
if (currentMode.contains(mode) && currentSession.isDefined) {
5859
currentSession.get
@@ -98,4 +99,5 @@ class SessionManager(val extraSparkConf: Map[String, String]) {
9899
stopCurrentSession()
99100
println("SparkSession closed.")
100101
}
102+
// scalastyle:on
101103
}

‎dev/auron-it/src/main/scala/org/apache/auron/integration/comparison/PlanStabilityChecker.scala‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ class PlanStabilityChecker(
3333
regenGoldenFiles: Boolean = false,
3434
planCheck: Boolean = false) {
3535

36+
// scalastyle:off println
3637
private lazy val isSupported: Boolean = Shims.get.shimVersion match {
3738
case "spark-3.5" => true
3839
case other =>
@@ -122,4 +123,5 @@ class PlanStabilityChecker(
122123

123124
normalizeLocation(argumentsNormalized)
124125
}
126+
// scalastyle:on
125127
}

‎dev/auron-it/src/main/scala/org/apache/auron/integration/comparison/QueryResultComparator.scala‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ trait QueryComparator {
3838

3939
class QueryResultComparator extends QueryComparator {
4040
private val colSep = "<|COL|>"
41+
42+
// scalastyle:off println
4143
override def compare(
4244
baseline: QueryExecutionResult,
4345
test: QueryExecutionResult): ComparisonResult = {
@@ -136,4 +138,5 @@ class QueryResultComparator extends QueryComparator {
136138
}
137139
true
138140
}
141+
// scalastyle:on
139142
}

‎dev/auron-it/src/main/scala/org/apache/auron/integration/tpcds/TPCDSFeatures.scala‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ trait TPCDSFeatures {
156156
"time_dim",
157157
"web_page")
158158

159+
// scalastyle:off
159160
def setupTables(dataLocation: String, spark: SparkSession): Map[String, Long] = {
160161
println(s"Setting up TPC-DS tables from: $dataLocation")
161162
tpcdsTables.map { tableName =>
@@ -211,3 +212,4 @@ trait TPCDSFeatures {
211212
path.toFile
212213
}
213214
}
215+
// scalastyle:on

‎dev/auron-it/src/main/scala/org/apache/auron/integration/tpcds/TPCDSSuite.scala‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ class TPCDSSuite(args: SuiteArgs) extends Suite(args) with TPCDSFeatures {
3434
regenGoldenFiles = args.regenGoldenFiles,
3535
planCheck = args.enablePlanCheck)
3636

37+
// scalastyle:off println
3738
override def run(): Int = {
3839
val queries = filterQueries(args.queryFilter)
3940
if (queries.isEmpty) {
@@ -135,7 +136,7 @@ class TPCDSSuite(args: SuiteArgs) extends Suite(args) with TPCDSFeatures {
135136
private def printPlanStability(results: Seq[ComparisonResult]): Unit = {
136137
println("\n" + "=" * 60)
137138
println(s"Auron Plan Stability (${Shims.get.shimVersion})")
138-
println("−" * 60)
139+
println("-" * 60)
139140
println(f"${"Query"}%-6s ${"Stable"}%-7s")
140141
println("-" * 60)
141142
results.foreach { r =>
@@ -153,11 +154,12 @@ class TPCDSSuite(args: SuiteArgs) extends Suite(args) with TPCDSFeatures {
153154
val totalUpdated = ids.size
154155
println("\n" + "=" * 60)
155156
println(s"Auron Golden Files (${Shims.get.shimVersion})")
156-
println("−" * 60)
157+
println("-" * 60)
157158
println(s"Updated queries: $totalUpdated")
158159
println(ids.mkString("- ", ", ", ""))
159160
println(s"Output directory: ${goldenOutputDir}")
160161
}
162+
// scalastyle:on
161163
}
162164

163165
object TPCDSSuite {

‎dev/checkstyle.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,6 @@
4848

4949
<property name="fileExtensions" value="java, properties, xml"/>
5050

51-
<module name="SuppressionFilter">
52-
<property name="file" value="dev/checkstyle-suppressions.xml"/>
53-
</module>
54-
5551
<!-- Checks for whitespace -->
5652
<!-- See http://checkstyle.sf.net/config_whitespace.html -->
5753
<module name="FileTabCharacter">

‎dev/scalastyle-config.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ This file is divided into 3 sections:
294294
<customMessage>Use contentEquals of SparkFileUtils or Utils instead.</customMessage>
295295
</check>
296296

297-
<check customId="toByteArray" level="error" class="org.scalastyle.file.RegexChecker" enabled="true">
297+
<check customId="toByteArray" level="error" class="org.scalastyle.file.RegexChecker" enabled="disable">
298298
<parameters><parameter name="regex">\bFiles\.toByteArray\b</parameter></parameters>
299299
<customMessage>Use java.nio.file.Files.readAllBytes instead.</customMessage>
300300
</check>
@@ -304,7 +304,7 @@ This file is divided into 3 sections:
304304
<customMessage>Use java.nio.file.Files.newInputStream instead.</customMessage>
305305
</check>
306306

307-
<check customId="getTempDirectory" level="error" class="org.scalastyle.file.RegexChecker" enabled="true">
307+
<check customId="getTempDirectory" level="error" class="org.scalastyle.file.RegexChecker" enabled="disable">
308308
<parameters><parameter name="regex">\bFileUtils\.getTempDirectory\b</parameter></parameters>
309309
<customMessage>Use System.getProperty instead.</customMessage>
310310
</check>
@@ -435,7 +435,7 @@ This file is divided into 3 sections:
435435
<customMessage>Use touch of SparkFileUtil or Utils instead.</customMessage>
436436
</check>
437437

438-
<check customId="writeStringToFile" level="error" class="org.scalastyle.file.RegexChecker" enabled="true">
438+
<check customId="writeStringToFile" level="error" class="org.scalastyle.file.RegexChecker" enabled="disable">
439439
<parameters><parameter name="regex">\bFileUtils\.writeStringToFile\b</parameter></parameters>
440440
<customMessage>Use java.nio.file.Files.writeString instead.</customMessage>
441441
</check>
@@ -506,7 +506,7 @@ This file is divided into 3 sections:
506506
<customMessage>Use java.util.HexFormat instead</customMessage>
507507
</check>
508508

509-
<check customId="commonsiofileutils" level="error" class="org.scalastyle.file.RegexChecker" enabled="true">
509+
<check customId="commonsiofileutils" level="error" class="org.scalastyle.file.RegexChecker" enabled="disable">
510510
<parameters><parameter name="regex">org\.apache\.commons\.io\.FileUtils\b</parameter></parameters>
511511
<customMessage>Use Java API or Spark's JavaUtils/SparkSystemUtils/Utils instead</customMessage>
512512
</check>

0 commit comments

Comments
 (0)