Repository: spark
Updated Branches:
refs/heads/branch-2.0 0d0b41609 -> 0c6fd03fa
[MINOR][BUILD] Fix Java linter errors
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 {
```
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 <[email protected]>
Closes #14017 from dongjoon-hyun/minor_build_java_linter_error.
(cherry picked from commit 3000b4b29f9165f436f186a8c1ba818e24f90615)
Signed-off-by: Sean Owen <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/0c6fd03f
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/0c6fd03f
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/0c6fd03f
Branch: refs/heads/branch-2.0
Commit: 0c6fd03fa763df4afb77ac4738c76f0b73e46ad0
Parents: 0d0b416
Author: Dongjoon Hyun <[email protected]>
Authored: Sat Jul 2 16:31:06 2016 +0100
Committer: Sean Owen <[email protected]>
Committed: Sat Jul 2 16:33:22 2016 +0100
----------------------------------------------------------------------
.../spark/shuffle/sort/ShuffleExternalSorter.java | 3 ++-
.../collection/unsafe/sort/UnsafeExternalSorter.java | 12 ++++++------
.../spark/sql/execution/UnsafeExternalRowSorter.java | 4 ++--
.../sql/execution/UnsafeFixedWidthAggregationMap.java | 4 ++--
.../spark/sql/execution/UnsafeKVExternalSorter.java | 3 ++-
5 files changed, 14 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/0c6fd03f/core/src/main/java/org/apache/spark/shuffle/sort/ShuffleExternalSorter.java
----------------------------------------------------------------------
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 696ee73..cf38a04 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();
}
http://git-wip-us.apache.org/repos/asf/spark/blob/0c6fd03f/core/src/main/java/org/apache/spark/util/collection/unsafe/sort/UnsafeExternalSorter.java
----------------------------------------------------------------------
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 8a980d4..50f5b06 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(
@@ -386,7 +385,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();
}
http://git-wip-us.apache.org/repos/asf/spark/blob/0c6fd03f/sql/catalyst/src/main/java/org/apache/spark/sql/execution/UnsafeExternalRowSorter.java
----------------------------------------------------------------------
diff --git
a/sql/catalyst/src/main/java/org/apache/spark/sql/execution/UnsafeExternalRowSorter.java
b/sql/catalyst/src/main/java/org/apache/spark/sql/execution/UnsafeExternalRowSorter.java
index 45e5be5..c9a1f22 100644
---
a/sql/catalyst/src/main/java/org/apache/spark/sql/execution/UnsafeExternalRowSorter.java
+++
b/sql/catalyst/src/main/java/org/apache/spark/sql/execution/UnsafeExternalRowSorter.java
@@ -74,8 +74,8 @@ public final class UnsafeExternalRowSorter {
prefixComparator,
/* initialSize */ 4096,
pageSizeBytes,
-
SparkEnv.get().conf().getLong("spark.shuffle.spill.numElementsForceSpillThreshold",
UnsafeExternalSorter
- .DEFAULT_NUM_ELEMENTS_FOR_SPILL_THRESHOLD),
+
SparkEnv.get().conf().getLong("spark.shuffle.spill.numElementsForceSpillThreshold",
+ UnsafeExternalSorter.DEFAULT_NUM_ELEMENTS_FOR_SPILL_THRESHOLD),
canUseRadixSort
);
}
http://git-wip-us.apache.org/repos/asf/spark/blob/0c6fd03f/sql/core/src/main/java/org/apache/spark/sql/execution/UnsafeFixedWidthAggregationMap.java
----------------------------------------------------------------------
diff --git
a/sql/core/src/main/java/org/apache/spark/sql/execution/UnsafeFixedWidthAggregationMap.java
b/sql/core/src/main/java/org/apache/spark/sql/execution/UnsafeFixedWidthAggregationMap.java
index 3705291..cd521c5 100644
---
a/sql/core/src/main/java/org/apache/spark/sql/execution/UnsafeFixedWidthAggregationMap.java
+++
b/sql/core/src/main/java/org/apache/spark/sql/execution/UnsafeFixedWidthAggregationMap.java
@@ -247,8 +247,8 @@ public final class UnsafeFixedWidthAggregationMap {
SparkEnv.get().blockManager(),
SparkEnv.get().serializerManager(),
map.getPageSizeBytes(),
-
SparkEnv.get().conf().getLong("spark.shuffle.spill.numElementsForceSpillThreshold",
UnsafeExternalSorter
- .DEFAULT_NUM_ELEMENTS_FOR_SPILL_THRESHOLD),
+
SparkEnv.get().conf().getLong("spark.shuffle.spill.numElementsForceSpillThreshold",
+ UnsafeExternalSorter.DEFAULT_NUM_ELEMENTS_FOR_SPILL_THRESHOLD),
map);
}
}
http://git-wip-us.apache.org/repos/asf/spark/blob/0c6fd03f/sql/core/src/main/java/org/apache/spark/sql/execution/UnsafeKVExternalSorter.java
----------------------------------------------------------------------
diff --git
a/sql/core/src/main/java/org/apache/spark/sql/execution/UnsafeKVExternalSorter.java
b/sql/core/src/main/java/org/apache/spark/sql/execution/UnsafeKVExternalSorter.java
index 8432ce9..82ee5b0 100644
---
a/sql/core/src/main/java/org/apache/spark/sql/execution/UnsafeKVExternalSorter.java
+++
b/sql/core/src/main/java/org/apache/spark/sql/execution/UnsafeKVExternalSorter.java
@@ -56,7 +56,8 @@ public final class UnsafeKVExternalSorter {
SerializerManager serializerManager,
long pageSizeBytes,
long numElementsForSpillThreshold) throws IOException {
- this(keySchema, valueSchema, blockManager, serializerManager,
pageSizeBytes, numElementsForSpillThreshold, null);
+ this(keySchema, valueSchema, blockManager, serializerManager,
pageSizeBytes,
+ numElementsForSpillThreshold, null);
}
public UnsafeKVExternalSorter(
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
