Repository: spark Updated Branches: refs/heads/branch-2.0 df87f161c -> ce7dce175
[MINOR][BUILD] Fix Java CheckStyle Error As Spark 2.0.1 will be released soon (mentioned in the spark dev mailing list), besides the critical bugs, it's better to fix the code style errors before the release. Before: ``` ./dev/lint-java Checkstyle checks failed at following occurrences: [ERROR] src/main/java/org/apache/spark/util/collection/unsafe/sort/UnsafeExternalSorter.java:[525] (sizes) LineLength: Line is longer than 100 characters (found 119). [ERROR] src/main/java/org/apache/spark/examples/sql/streaming/JavaStructuredNetworkWordCount.java:[64] (sizes) LineLength: Line is longer than 100 characters (found 103). ``` After: ``` ./dev/lint-java Using `mvn` from path: /usr/local/bin/mvn Checkstyle checks passed. ``` Manual. Author: Weiqing Yang <[email protected]> Closes #14768 from Sherry302/fixjavastyle. (cherry picked from commit 673a80d2230602c9e6573a23e35fb0f6b832bfca) 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/ce7dce17 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/ce7dce17 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/ce7dce17 Branch: refs/heads/branch-2.0 Commit: ce7dce1755a8d36ec7346adc3de26d8fdc4f05e9 Parents: df87f16 Author: Weiqing Yang <[email protected]> Authored: Wed Aug 24 10:12:44 2016 +0100 Committer: Sean Owen <[email protected]> Committed: Wed Aug 24 10:15:53 2016 +0100 ---------------------------------------------------------------------- .../spark/util/collection/unsafe/sort/UnsafeExternalSorter.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/ce7dce17/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 0d67167..999ded4 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 @@ -521,7 +521,8 @@ public final class UnsafeExternalSorter extends MemoryConsumer { // is accessing the current record. We free this page in that caller's next loadNext() // call. for (MemoryBlock page : allocatedPages) { - if (!loaded || page.pageNumber != ((UnsafeInMemorySorter.SortedIterator)upstream).getCurrentPageNumber()) { + if (!loaded || page.pageNumber != + ((UnsafeInMemorySorter.SortedIterator)upstream).getCurrentPageNumber()) { released += page.size(); freePage(page); } else { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
