From 63d168cbb8ebe80bfcf91a4d5070f1d9f3ec7aca Mon Sep 17 00:00:00 2001
From: Sean Owen <sowen@cloudera.com>
Date: Fri, 28 Jul 2017 11:31:40 +0100
Subject: [PATCH] [MINOR][BUILD] Fix current lint-java failures
## What changes were proposed in this pull request?
Fixes current failures in dev/lint-java
## How was this patch tested?
Existing linter, tests.
Author: Sean Owen <sowen@cloudera.com>
Closes #18757 from srowen/LintJava.
---
.../apache/spark/network/TransportRequestHandlerSuite.java | 6 ++++--
.../apache/spark/shuffle/sort/ShuffleExternalSorter.java | 6 ++++--
.../spark/sql/execution/vectorized/ArrowColumnVector.java | 2 +-
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/common/network-common/src/test/java/org/apache/spark/network/TransportRequestHandlerSuite.java b/common/network-common/src/test/java/org/apache/spark/network/TransportRequestHandlerSuite.java
index 1fb987a8a7..1ed57116bc 100644
--- a/common/network-common/src/test/java/org/apache/spark/network/TransportRequestHandlerSuite.java
+++ b/common/network-common/src/test/java/org/apache/spark/network/TransportRequestHandlerSuite.java
@@ -105,7 +105,7 @@ public class TransportRequestHandlerSuite {
private List<GenericFutureListener> listeners = new ArrayList<>();
private boolean success;
- public ExtendedChannelPromise(Channel channel) {
+ ExtendedChannelPromise(Channel channel) {
super(channel);
success = false;
}
@@ -127,7 +127,9 @@ public class TransportRequestHandlerSuite {
listeners.forEach(listener -> {
try {
listener.operationComplete(this);
- } catch (Exception e) { }
+ } catch (Exception e) {
+ // do nothing
+ }
});
}
}
diff --git a/core/src/main/java/org/apache/spark/shuffle/sort/ShuffleExternalSorter.java b/core/src/main/java/org/apache/spark/shuffle/sort/ShuffleExternalSorter.java
index 338faaadb3..da6c55d9b8 100644
--- a/core/src/main/java/org/apache/spark/shuffle/sort/ShuffleExternalSorter.java
+++ b/core/src/main/java/org/apache/spark/shuffle/sort/ShuffleExternalSorter.java
@@ -120,14 +120,16 @@ final class ShuffleExternalSorter extends MemoryConsumer {
this.taskContext = taskContext;
this.numPartitions = numPartitions;
// Use getSizeAsKb (not bytes) to maintain backwards compatibility if no units are provided
- this.fileBufferSizeBytes = (int) (long) conf.get(package$.MODULE$.SHUFFLE_FILE_BUFFER_SIZE()) * 1024;
+ this.fileBufferSizeBytes =
+ (int) (long) conf.get(package$.MODULE$.SHUFFLE_FILE_BUFFER_SIZE()) * 1024;
this.numElementsForSpillThreshold =
conf.getLong("spark.shuffle.spill.numElementsForceSpillThreshold", 1024 * 1024 * 1024);
this.writeMetrics = writeMetrics;
this.inMemSorter = new ShuffleInMemorySorter(
this, initialSize, conf.getBoolean("spark.shuffle.sort.useRadixSort", true));
this.peakMemoryUsedBytes = getMemoryUsage();
- this.diskWriteBufferSize = (int) (long) conf.get(package$.MODULE$.SHUFFLE_DISK_WRITE_BUFFER_SIZE());
+ this.diskWriteBufferSize =
+ (int) (long) conf.get(package$.MODULE$.SHUFFLE_DISK_WRITE_BUFFER_SIZE());
}
/**
diff --git a/sql/core/src/main/java/org/apache/spark/sql/execution/vectorized/ArrowColumnVector.java b/sql/core/src/main/java/org/apache/spark/sql/execution/vectorized/ArrowColumnVector.java
index 31dea6ad31..59d66c599c 100644
--- a/sql/core/src/main/java/org/apache/spark/sql/execution/vectorized/ArrowColumnVector.java
+++ b/sql/core/src/main/java/org/apache/spark/sql/execution/vectorized/ArrowColumnVector.java
@@ -322,7 +322,7 @@ public final class ArrowColumnVector extends ReadOnlyColumnVector {
anyNullsSet = numNulls > 0;
}
- private static abstract class ArrowVectorAccessor {
+ private abstract static class ArrowVectorAccessor {
private final ValueVector vector;
private final ValueVector.Accessor nulls;
--
GitLab