This is an automated email from the ASF dual-hosted git repository. arina pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/drill.git
commit 43d1ad31ad72ef9f307f7ef1e9c26be0a0b30f50 Author: Arina Ielchiieva <arina.yelchiy...@gmail.com> AuthorDate: Wed Oct 16 18:10:20 2019 +0300 DRILL-7401: Upgrade to SqlLine 1.9.0 closes #1875 --- distribution/src/resources/sqlline | 7 +------ distribution/src/resources/sqlline.bat | 13 ++++++------- exec/java-exec/src/main/resources/drill-sqlline.conf | 5 ++++- pom.xml | 2 +- 4 files changed, 12 insertions(+), 15 deletions(-) diff --git a/distribution/src/resources/sqlline b/distribution/src/resources/sqlline index 8defce9..d8b36cf 100644 --- a/distribution/src/resources/sqlline +++ b/distribution/src/resources/sqlline @@ -78,12 +78,7 @@ if ! $is_cygwin; then DRILL_SHELL_OPTS="$DRILL_SHELL_OPTS --color=true" fi -# To add nohup support for SQLline script -if [[ ( ! $(ps -o stat= -p $$) =~ "+" ) && ! ( -p /dev/stdin ) ]]; then - export SQLLINE_JAVA_OPTS="$SQLLINE_JAVA_OPTS -Djline.terminal=jline.UnsupportedTerminal" -fi - -SHELL_OPTS="$DRILL_SHELL_JAVA_OPTS $SQLLINE_JAVA_OPTS $DRILL_SHELL_LOG_OPTS $CLIENT_GC_OPTS" +SHELL_OPTS="$DRILL_SHELL_JAVA_OPTS $SQLLINE_JAVA_OPTS $DRILL_SHELL_LOG_OPTS $CLIENT_GC_OPTS -Dorg.jline.terminal.dumb=true" CMD="$JAVA $SHELL_OPTS -cp $CP sqlline.SqlLine -ac org.apache.drill.exec.client.DrillSqlLineApplication" # The wrapper is purely for unit testing. diff --git a/distribution/src/resources/sqlline.bat b/distribution/src/resources/sqlline.bat index 6f79395..daf5afe 100755 --- a/distribution/src/resources/sqlline.bat +++ b/distribution/src/resources/sqlline.bat @@ -117,7 +117,6 @@ echo. goto error :initDrillEnv -echo DRILL_ARGS - "%DRILL_ARGS%" rem ---- rem Deal with Drill variables @@ -131,7 +130,7 @@ if "test%DRILL_LOG_DIR%" == "test" ( set DRILL_LOG_DIR=%DRILL_HOME%\log ) -@rem Drill temporary directory is used as base for temporary storage of Dynamic UDF jars. +rem Drill temporary directory is used as base for temporary storage of Dynamic UDF jars if "test%DRILL_TMP_DIR%" == "test" ( set DRILL_TMP_DIR=%TEMP% ) @@ -141,11 +140,11 @@ rem Deal with Hadoop JARs, if HADOOP_HOME was specified rem ---- if "test%HADOOP_HOME%" == "test" ( - echo HADOOP_HOME not detected... + rem HADOOP_HOME not detected... set USE_HADOOP_CP=0 set HADOOP_HOME=%DRILL_HOME%\winutils ) else ( - echo Calculating HADOOP_CLASSPATH ... + rem Calculating HADOOP_CLASSPATH ... for %%i in (%HADOOP_HOME%\lib\*.jar) do ( set IGNOREJAR=0 for /F "tokens=*" %%A in (%DRILL_BIN_DIR%\hadoop-excludes.txt) do ( @@ -163,10 +162,10 @@ rem Deal with HBase JARs, if HBASE_HOME was specified rem ---- if "test%HBASE_HOME%" == "test" ( - echo HBASE_HOME not detected... + rem HBASE_HOME not detected... set USE_HBASE_CP=0 ) else ( - echo Calculating HBASE_CLASSPATH ... + rem Calculating HBASE_CLASSPATH ... for %%i in (%HBASE_HOME%\lib\*.jar) do ( set IGNOREJAR=0 for /F "tokens=*" %%A in (%DRILL_BIN_DIR%\hadoop-excludes.txt) do ( @@ -179,7 +178,7 @@ if "test%HBASE_HOME%" == "test" ( set USE_HBASE_CP=1 ) -echo Calculating Drill classpath... +rem Calculating Drill classpath... set DRILL_CP=%DRILL_CONF_DIR% if NOT "test%DRILL_CLASSPATH_PREFIX%"=="test" set DRILL_CP=!DRILL_CP!;%DRILL_CLASSPATH_PREFIX% diff --git a/exec/java-exec/src/main/resources/drill-sqlline.conf b/exec/java-exec/src/main/resources/drill-sqlline.conf index 58d0413..cde49cb 100644 --- a/exec/java-exec/src/main/resources/drill-sqlline.conf +++ b/exec/java-exec/src/main/resources/drill-sqlline.conf @@ -87,7 +87,10 @@ drill.sqlline { maxColumnWidth: 80, colorScheme: obsidian, # display null values for varchar / char / boolean as null - nullValue: "null" + nullValue: "null", + # will ask for the credentials if there is only one specified + connectInteractionMode: useNPTogetherOrEmpty, + showLineNumbers: true }, # display prompt as `apache drill>` or when schema is set as `apache drill (dfs.tmp)>` prompt.with_schema: true diff --git a/pom.xml b/pom.xml index 36684cc..d551890 100644 --- a/pom.xml +++ b/pom.xml @@ -60,7 +60,7 @@ <calcite.version>1.20.0-drill-r1</calcite.version> <avatica.version>1.15.0</avatica.version> <janino.version>3.0.11</janino.version> - <sqlline.version>1.8.0</sqlline.version> + <sqlline.version>1.9.0</sqlline.version> <jackson.version>2.9.9</jackson.version> <jackson.databind.version>2.9.9</jackson.databind.version> <zookeeper.version>3.4.12</zookeeper.version>