diff --git a/.github/actions/java-test/action.yaml b/.github/actions/java-test/action.yaml index 9c7de9a82..ae6d80dee 100644 --- a/.github/actions/java-test/action.yaml +++ b/.github/actions/java-test/action.yaml @@ -38,9 +38,17 @@ runs: shell: bash run: | echo "JAVA_VERSION=${JAVA_VERSION}" - ./mvnw -B compile test-compile scalafix:scalafix -Psemanticdb -Djava.version=${JAVA_VERSION} + if [ $JAVA_VERSION == "1.8" ]; then + ./mvnw -B compile test-compile scalafix:scalafix -Psemanticdb -Djava.version=${JAVA_VERSION} -Dspotless.version=2.29.0 + else + ./mvnw -B compile test-compile scalafix:scalafix -Psemanticdb -Djava.version=${JAVA_VERSION} + fi - name: Run tests shell: bash run: | - SPARK_HOME=`pwd` ./mvnw -B clean install -Djava.version=${JAVA_VERSION} + if [ $JAVA_VERSION == "1.8" ]; then + SPARK_HOME=`pwd` ./mvnw -B clean install -Djava.version=${JAVA_VERSION} -Dspotless.version=2.29.0 + else + SPARK_HOME=`pwd` ./mvnw -B clean install -Djava.version=${JAVA_VERSION} + fi diff --git a/.github/actions/rust-test/action.yaml b/.github/actions/rust-test/action.yaml index a013a7bae..cb6c29c82 100644 --- a/.github/actions/rust-test/action.yaml +++ b/.github/actions/rust-test/action.yaml @@ -51,7 +51,11 @@ runs: shell: bash run: | cd common - ../mvnw -B clean compile -DskipTests -Djava.version=${JAVA_VERSION} + if [ $JAVA_VERSION == "1.8" ]; then + ../mvnw -B clean compile -DskipTests -Djava.version=${JAVA_VERSION} -Dspotless.version=2.29.0 + else + ../mvnw -B clean compile -DskipTests -Djava.version=${JAVA_VERSION} + fi - name: Run Cargo test shell: bash diff --git a/pom.xml b/pom.xml index b3c354568..507ec78be 100644 --- a/pom.xml +++ b/pom.xml @@ -54,7 +54,7 @@ under the License. provided 14.0.2 1.9.13 - 2.29.0 + 2.43.0 ${project.basedir}/../core/target/debug darwin x86_64 diff --git a/spark/src/main/java/org/apache/spark/shuffle/comet/CometShuffleMemoryAllocator.java b/spark/src/main/java/org/apache/spark/shuffle/comet/CometShuffleMemoryAllocator.java index e8fe170e6..2837fa369 100644 --- a/spark/src/main/java/org/apache/spark/shuffle/comet/CometShuffleMemoryAllocator.java +++ b/spark/src/main/java/org/apache/spark/shuffle/comet/CometShuffleMemoryAllocator.java @@ -52,6 +52,7 @@ public final class CometShuffleMemoryAllocator extends MemoryConsumer { /** The number of bits used to address the page table. */ private static final int PAGE_NUMBER_BITS = 13; + /** The number of entries in the page table. */ private static final int PAGE_TABLE_SIZE = 1 << PAGE_NUMBER_BITS; diff --git a/spark/src/main/java/org/apache/spark/sql/comet/execution/shuffle/CometUnsafeShuffleWriter.java b/spark/src/main/java/org/apache/spark/sql/comet/execution/shuffle/CometUnsafeShuffleWriter.java index ae38e4ffc..7690e1d8b 100644 --- a/spark/src/main/java/org/apache/spark/sql/comet/execution/shuffle/CometUnsafeShuffleWriter.java +++ b/spark/src/main/java/org/apache/spark/sql/comet/execution/shuffle/CometUnsafeShuffleWriter.java @@ -121,6 +121,7 @@ public class CometUnsafeShuffleWriter extends ShuffleWriter { private long peakMemoryUsedBytes = 0; private ExposedByteArrayOutputStream serBuffer; private SerializationStream serOutputStream; + /** * Are we in the process of stopping? Because map tasks can call stop() with success = true and * then call stop() with success = false if they get an exception, we want to make sure we don't