Skip to content

Commit 77bb3b3

Browse files
authored
Add spotless check and apply in reformat (#1083)
1 parent 2dbb6c4 commit 77bb3b3

3 files changed

Lines changed: 7 additions & 4 deletions

File tree

dev/reformat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ for ver in ${sparkver[@]}
3636
do
3737
SHIM=$ver
3838
if [[ "$CHECK" == "true" ]]; then
39-
mvn compile test-compile scalafix:scalafix -Dscalafix.mode=CHECK -Dscalafix.skipTest=true -P"${SHIM}" -P"${MODE}"
39+
mvn spotless:check compile test-compile scalafix:scalafix -Dscalafix.mode=CHECK -Dscalafix.skipTest=true -P"${SHIM}" -P"${MODE}"
4040
else
41-
mvn compile test-compile scalafix:scalafix -P"${SHIM}" -P"${MODE}"
41+
mvn spotless:apply compile test-compile scalafix:scalafix -P"${SHIM}" -P"${MODE}"
4242
fi
4343
done
4444

spark-extension-shims-spark3/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@
6262
<scope>provided</scope>
6363
<exclusions>
6464
<exclusion>
65-
<artifactId>log4j-slf4j-impl</artifactId>
6665
<groupId>org.apache.logging.log4j</groupId>
66+
<artifactId>log4j-slf4j-impl</artifactId>
6767
</exclusion>
6868
</exclusions>
6969
</dependency>

spark-extension/src/main/scala/org/apache/spark/sql/blaze/SparkUDAFWrapperContext.scala

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,10 @@ case class DeclarativeAggRowsColumn(
325325
rowsMemUsed += newRow.getSizeInBytes
326326
newRow
327327
}))
328-
rowsMemUsed -= rows.slice(len, rows.length).filter(_ != null).foldLeft(0)(_ + _.getSizeInBytes)
328+
rowsMemUsed -= rows
329+
.slice(len, rows.length)
330+
.filter(_ != null)
331+
.foldLeft(0)(_ + _.getSizeInBytes)
329332
rows.trimEnd(rows.length - len)
330333
}
331334

0 commit comments

Comments
 (0)