Repository: spark Updated Branches: refs/heads/branch-2.0 a790ac579 -> 5e9a8e715
[MINOR] Fix Java Lint errors introduced by #13286 and #13280 ## What changes were proposed in this pull request? revived #13464 Fix Java Lint errors introduced by #13286 and #13280 Before: ``` Using `mvn` from path: /Users/pichu/Project/spark/build/apache-maven-3.3.9/bin/mvn Java HotSpot(TM) 64-Bit Server VM warning: ignoring option MaxPermSize=512M; support was removed in 8.0 Checkstyle checks failed at following occurrences: [ERROR] src/main/java/org/apache/spark/launcher/LauncherServer.java:[340,5] (whitespace) FileTabCharacter: Line contains a tab character. [ERROR] src/main/java/org/apache/spark/launcher/LauncherServer.java:[341,5] (whitespace) FileTabCharacter: Line contains a tab character. [ERROR] src/main/java/org/apache/spark/launcher/LauncherServer.java:[342,5] (whitespace) FileTabCharacter: Line contains a tab character. [ERROR] src/main/java/org/apache/spark/launcher/LauncherServer.java:[343,5] (whitespace) FileTabCharacter: Line contains a tab character. [ERROR] src/main/java/org/apache/spark/sql/streaming/OutputMode.java:[41,28] (naming) MethodName: Method name 'Append' must match pattern '^[a-z][a-z0-9][a-zA-Z0-9_]*$'. [ERROR] src/main/java/org/apache/spark/sql/streaming/OutputMode.java:[52,28] (naming) MethodName: Method name 'Complete' must match pattern '^[a-z][a-z0-9][a-zA-Z0-9_]*$'. [ERROR] src/main/java/org/apache/spark/sql/execution/datasources/parquet/SpecificParquetRecordReaderBase.java:[61,8] (imports) UnusedImports: Unused import - org.apache.parquet.schema.PrimitiveType. [ERROR] src/main/java/org/apache/spark/sql/execution/datasources/parquet/SpecificParquetRecordReaderBase.java:[62,8] (imports) UnusedImports: Unused import - org.apache.parquet.schema.Type. ``` ## How was this patch tested? ran `dev/lint-java` locally Author: Sandeep Singh <[email protected]> Closes #13559 from techaddict/minor-3. (cherry picked from commit f958c1c3e292aba98d283637606890f353a9836c) 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/5e9a8e71 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/5e9a8e71 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/5e9a8e71 Branch: refs/heads/branch-2.0 Commit: 5e9a8e715953feadaa16ecd0f8e1818272b9c952 Parents: a790ac5 Author: Sandeep Singh <[email protected]> Authored: Wed Jun 8 14:51:00 2016 +0100 Committer: Sean Owen <[email protected]> Committed: Wed Jun 8 14:51:10 2016 +0100 ---------------------------------------------------------------------- dev/checkstyle-suppressions.xml | 2 ++ .../main/java/org/apache/spark/launcher/LauncherServer.java | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/5e9a8e71/dev/checkstyle-suppressions.xml ---------------------------------------------------------------------- diff --git a/dev/checkstyle-suppressions.xml b/dev/checkstyle-suppressions.xml index bfc2e73..31656ca 100644 --- a/dev/checkstyle-suppressions.xml +++ b/dev/checkstyle-suppressions.xml @@ -42,4 +42,6 @@ files="src/main/java/org/apache/hive/service/auth/PasswdAuthenticationProvider.java"/> <suppress checks="NoFinalizer" files="src/main/java/org/apache/hive/service/server/ThreadWithGarbageCleanup.java"/> + <suppress checks="MethodName" + files="sql/catalyst/src/main/java/org/apache/spark/sql/streaming/OutputMode.java"/> </suppressions> http://git-wip-us.apache.org/repos/asf/spark/blob/5e9a8e71/launcher/src/main/java/org/apache/spark/launcher/LauncherServer.java ---------------------------------------------------------------------- diff --git a/launcher/src/main/java/org/apache/spark/launcher/LauncherServer.java b/launcher/src/main/java/org/apache/spark/launcher/LauncherServer.java index 28e9420..ae43f56 100644 --- a/launcher/src/main/java/org/apache/spark/launcher/LauncherServer.java +++ b/launcher/src/main/java/org/apache/spark/launcher/LauncherServer.java @@ -337,10 +337,10 @@ class LauncherServer implements Closeable { } super.close(); if (handle != null) { - if (!handle.getState().isFinal()) { - LOG.log(Level.WARNING, "Lost connection to spark application."); - handle.setState(SparkAppHandle.State.LOST); - } + if (!handle.getState().isFinal()) { + LOG.log(Level.WARNING, "Lost connection to spark application."); + handle.setState(SparkAppHandle.State.LOST); + } handle.disconnect(); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
