aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorDongjoon Hyun <dongjoon@apache.org>2016-07-02 16:31:06 +0100
committerSean Owen <sowen@cloudera.com>2016-07-02 16:31:06 +0100
commit3000b4b29f9165f436f186a8c1ba818e24f90615 (patch)
tree3570a20b07c72c6fa43e1a13312f8e057c20e24f /core
parent0bd7cd18bc4d535b0c4499913f6747b3f6315ac2 (diff)
downloadspark-3000b4b29f9165f436f186a8c1ba818e24f90615.tar.gz
spark-3000b4b29f9165f436f186a8c1ba818e24f90615.tar.bz2
spark-3000b4b29f9165f436f186a8c1ba818e24f90615.zip
[MINOR][BUILD] Fix Java linter errors
## What changes were proposed in this pull request? This PR fixes the minor Java linter errors like the following. ``` - public int read(char cbuf[], int off, int len) throws IOException { + public int read(char[] cbuf, int off, int len) throws IOException { ``` ## How was this patch tested? Manual. ``` $ build/mvn -T 4 -q -DskipTests -Pyarn -Phadoop-2.3 -Pkinesis-asl -Phive -Phive-thriftserver install $ dev/lint-java Using `mvn` from path: /usr/local/bin/mvn Checkstyle checks passed. ``` Author: Dongjoon Hyun <dongjoon@apache.org> Closes #14017 from dongjoon-hyun/minor_build_java_linter_error.
Diffstat (limited to 'core')
-rw-r--r--core/src/main/java/org/apache/spark/shuffle/sort/ShuffleExternalSorter.java3
-rw-r--r--core/src/main/java/org/apache/spark/util/collection/unsafe/sort/UnsafeExternalSorter.java12
2 files changed, 8 insertions, 7 deletions
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 696ee73a76..cf38a04ed7 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
@@ -376,7 +376,8 @@ final class ShuffleExternalSorter extends MemoryConsumer {
// for tests
assert(inMemSorter != null);
if (inMemSorter.numRecords() >= numElementsForSpillThreshold) {
- logger.info("Spilling data because number of spilledRecords crossed the threshold " + numElementsForSpillThreshold);
+ logger.info("Spilling data because number of spilledRecords crossed the threshold " +
+ numElementsForSpillThreshold);
spill();
}
diff --git a/core/src/main/java/org/apache/spark/util/collection/unsafe/sort/UnsafeExternalSorter.java b/core/src/main/java/org/apache/spark/util/collection/unsafe/sort/UnsafeExternalSorter.java
index d6a255ed9d..8d596f87d2 100644
--- a/core/src/main/java/org/apache/spark/util/collection/unsafe/sort/UnsafeExternalSorter.java
+++ b/core/src/main/java/org/apache/spark/util/collection/unsafe/sort/UnsafeExternalSorter.java
@@ -27,7 +27,6 @@ import com.google.common.annotations.VisibleForTesting;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.spark.SparkEnv;
import org.apache.spark.TaskContext;
import org.apache.spark.executor.ShuffleWriteMetrics;
import org.apache.spark.memory.MemoryConsumer;
@@ -99,8 +98,8 @@ public final class UnsafeExternalSorter extends MemoryConsumer {
long numElementsForSpillThreshold,
UnsafeInMemorySorter inMemorySorter) throws IOException {
UnsafeExternalSorter sorter = new UnsafeExternalSorter(taskMemoryManager, blockManager,
- serializerManager, taskContext, recordComparator, prefixComparator, initialSize, numElementsForSpillThreshold,
- pageSizeBytes, inMemorySorter, false /* ignored */);
+ serializerManager, taskContext, recordComparator, prefixComparator, initialSize,
+ numElementsForSpillThreshold, pageSizeBytes, inMemorySorter, false /* ignored */);
sorter.spill(Long.MAX_VALUE, sorter);
// The external sorter will be used to insert records, in-memory sorter is not needed.
sorter.inMemSorter = null;
@@ -119,8 +118,8 @@ public final class UnsafeExternalSorter extends MemoryConsumer {
long numElementsForSpillThreshold,
boolean canUseRadixSort) {
return new UnsafeExternalSorter(taskMemoryManager, blockManager, serializerManager,
- taskContext, recordComparator, prefixComparator, initialSize, pageSizeBytes, numElementsForSpillThreshold, null,
- canUseRadixSort);
+ taskContext, recordComparator, prefixComparator, initialSize, pageSizeBytes,
+ numElementsForSpillThreshold, null, canUseRadixSort);
}
private UnsafeExternalSorter(
@@ -387,7 +386,8 @@ public final class UnsafeExternalSorter extends MemoryConsumer {
assert(inMemSorter != null);
if (inMemSorter.numRecords() >= numElementsForSpillThreshold) {
- logger.info("Spilling data because number of spilledRecords crossed the threshold " + numElementsForSpillThreshold);
+ logger.info("Spilling data because number of spilledRecords crossed the threshold " +
+ numElementsForSpillThreshold);
spill();
}