From 32b12a031b56b07b47d5ffb728038f82eb0cd597 Mon Sep 17 00:00:00 2001 From: ouyangxiaochen Date: Thu, 13 Apr 2017 13:03:50 +0800 Subject: [PATCH 1/3] val and var should strictly follow the Scala syntax --- .../spark/sql/hive/thriftserver/SparkSQLCLIDriver.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/SparkSQLCLIDriver.scala b/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/SparkSQLCLIDriver.scala index d5cc3b385504..33e18a8da60f 100644 --- a/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/SparkSQLCLIDriver.scala +++ b/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/SparkSQLCLIDriver.scala @@ -47,8 +47,8 @@ import org.apache.spark.util.ShutdownHookManager * has dropped its support. */ private[hive] object SparkSQLCLIDriver extends Logging { - private var prompt = "spark-sql" - private var continuedPrompt = "".padTo(prompt.length, ' ') + private val prompt = "spark-sql" + private val continuedPrompt = "".padTo(prompt.length, ' ') private var transport: TSocket = _ installSignalHandler() From cef04055d05a102dd1e18daad67ad35d8acd0ef5 Mon Sep 17 00:00:00 2001 From: ouyangxiaochen Date: Thu, 13 Apr 2017 14:55:18 +0800 Subject: [PATCH 2/3] Removing 'return' keyword in Scala method --- .../scala/org/apache/spark/repl/ExecutorClassLoader.scala | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/repl/src/main/scala/org/apache/spark/repl/ExecutorClassLoader.scala b/repl/src/main/scala/org/apache/spark/repl/ExecutorClassLoader.scala index df13b32451af..1629cdab111a 100644 --- a/repl/src/main/scala/org/apache/spark/repl/ExecutorClassLoader.scala +++ b/repl/src/main/scala/org/apache/spark/repl/ExecutorClassLoader.scala @@ -194,7 +194,7 @@ class ExecutorClassLoader( ClassWriter.COMPUTE_FRAMES + ClassWriter.COMPUTE_MAXS) val cleaner = new ConstructorCleaner(name, cw) cr.accept(cleaner, 0) - return cw.toByteArray + cw.toByteArray } else { // Pass the class through unmodified val bos = new ByteArrayOutputStream @@ -208,7 +208,7 @@ class ExecutorClassLoader( done = true } } - return bos.toByteArray + bos.toByteArray } } @@ -238,9 +238,9 @@ extends ClassVisitor(ASM5, cv) { mv.visitInsn(RETURN) mv.visitMaxs(-1, -1) // stack size and local vars will be auto-computed mv.visitEnd() - return null + null } else { - return mv + mv } } } From b2594719da6eb72c8be55c56d3a6c16c797f3ba1 Mon Sep 17 00:00:00 2001 From: ouyangxiaochen Date: Thu, 13 Apr 2017 18:32:22 +0800 Subject: [PATCH 3/3] revert file ExecutorClassLoader to origin --- .../scala/org/apache/spark/repl/ExecutorClassLoader.scala | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/repl/src/main/scala/org/apache/spark/repl/ExecutorClassLoader.scala b/repl/src/main/scala/org/apache/spark/repl/ExecutorClassLoader.scala index 1629cdab111a..df13b32451af 100644 --- a/repl/src/main/scala/org/apache/spark/repl/ExecutorClassLoader.scala +++ b/repl/src/main/scala/org/apache/spark/repl/ExecutorClassLoader.scala @@ -194,7 +194,7 @@ class ExecutorClassLoader( ClassWriter.COMPUTE_FRAMES + ClassWriter.COMPUTE_MAXS) val cleaner = new ConstructorCleaner(name, cw) cr.accept(cleaner, 0) - cw.toByteArray + return cw.toByteArray } else { // Pass the class through unmodified val bos = new ByteArrayOutputStream @@ -208,7 +208,7 @@ class ExecutorClassLoader( done = true } } - bos.toByteArray + return bos.toByteArray } } @@ -238,9 +238,9 @@ extends ClassVisitor(ASM5, cv) { mv.visitInsn(RETURN) mv.visitMaxs(-1, -1) // stack size and local vars will be auto-computed mv.visitEnd() - null + return null } else { - mv + return mv } } }