From dad863d602defa0ad99cb46fd3e960677824230f Mon Sep 17 00:00:00 2001 From: wangwei Date: Tue, 25 Aug 2015 19:06:49 +0800 Subject: [PATCH 1/3] SparkSQLCLIDriver_ConsoleReader --- .../apache/spark/sql/hive/thriftserver/SparkSQLCLIDriver.scala | 1 + 1 file changed, 1 insertion(+) 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 d3886142b388d..b86a127ffc632 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 @@ -171,6 +171,7 @@ private[hive] object SparkSQLCLIDriver extends Logging { val reader = new ConsoleReader() reader.setBellEnabled(false) + reader.setExpandEvents(false) // reader.setDebug(new PrintWriter(new FileWriter("writer.debug", true))) CliDriver.getCommandCompleter.foreach((e) => reader.addCompleter(e)) From 74e23c00cfd7fd75b3d0359163bccaf5c64ecf85 Mon Sep 17 00:00:00 2001 From: wangwei Date: Tue, 25 Aug 2015 20:01:16 +0800 Subject: [PATCH 2/3] SparkSQLCLIDriver_ConsoleReader_2 --- .../spark/sql/hive/thriftserver/SparkSQLCLIDriver.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 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 b86a127ffc632..0f776be3fdaf8 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 @@ -23,7 +23,7 @@ import java.io._ import java.util.{ArrayList => JArrayList, Locale} import jline.console.ConsoleReader -import jline.console.history.FileHistory +import jline.console.history.{History, FileHistory} import org.apache.commons.lang3.StringUtils import org.apache.commons.logging.LogFactory @@ -171,7 +171,7 @@ private[hive] object SparkSQLCLIDriver extends Logging { val reader = new ConsoleReader() reader.setBellEnabled(false) - reader.setExpandEvents(false) +// reader.setExpandEvents(false) // reader.setDebug(new PrintWriter(new FileWriter("writer.debug", true))) CliDriver.getCommandCompleter.foreach((e) => reader.addCompleter(e)) @@ -180,7 +180,7 @@ private[hive] object SparkSQLCLIDriver extends Logging { try { if (new File(historyDirectory).exists()) { val historyFile = historyDirectory + File.separator + ".hivehistory" - reader.setHistory(new FileHistory(new File(historyFile))) + reader.setHistory(new History(new File(historyFile))) } else { logWarning("WARNING: Directory for Hive history file: " + historyDirectory + " does not exist. History will not be available during this session.") From 68b13cc50a77727772376ab1e6a5dc74bc4c3dc0 Mon Sep 17 00:00:00 2001 From: wangwei Date: Tue, 25 Aug 2015 21:54:42 +0800 Subject: [PATCH 3/3] ExpendEvents --- .../spark/sql/hive/thriftserver/SparkSQLCLIDriver.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 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 0f776be3fdaf8..b86a127ffc632 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 @@ -23,7 +23,7 @@ import java.io._ import java.util.{ArrayList => JArrayList, Locale} import jline.console.ConsoleReader -import jline.console.history.{History, FileHistory} +import jline.console.history.FileHistory import org.apache.commons.lang3.StringUtils import org.apache.commons.logging.LogFactory @@ -171,7 +171,7 @@ private[hive] object SparkSQLCLIDriver extends Logging { val reader = new ConsoleReader() reader.setBellEnabled(false) -// reader.setExpandEvents(false) + reader.setExpandEvents(false) // reader.setDebug(new PrintWriter(new FileWriter("writer.debug", true))) CliDriver.getCommandCompleter.foreach((e) => reader.addCompleter(e)) @@ -180,7 +180,7 @@ private[hive] object SparkSQLCLIDriver extends Logging { try { if (new File(historyDirectory).exists()) { val historyFile = historyDirectory + File.separator + ".hivehistory" - reader.setHistory(new History(new File(historyFile))) + reader.setHistory(new FileHistory(new File(historyFile))) } else { logWarning("WARNING: Directory for Hive history file: " + historyDirectory + " does not exist. History will not be available during this session.")