You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by ja...@apache.org on 2014/06/20 22:24:44 UTC
[08/32] git commit: DRILL-1008: Update the way that Windows
sqlline.bat composes its classpath
DRILL-1008: Update the way that Windows sqlline.bat composes its classpath
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/7d436697
Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/7d436697
Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/7d436697
Branch: refs/heads/master
Commit: 7d436697c0d27b0fb6863b8a37efe1e1952ffc28
Parents: a88ebb2
Author: Patrick Wong <pw...@maprtech.com>
Authored: Wed Jun 18 00:22:51 2014 +0000
Committer: Jacques Nadeau <ja...@apache.org>
Committed: Wed Jun 18 21:44:54 2014 -0700
----------------------------------------------------------------------
distribution/src/resources/sqlline.bat | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/7d436697/distribution/src/resources/sqlline.bat
----------------------------------------------------------------------
diff --git a/distribution/src/resources/sqlline.bat b/distribution/src/resources/sqlline.bat
index dde4608..48aa97d 100755
--- a/distribution/src/resources/sqlline.bat
+++ b/distribution/src/resources/sqlline.bat
@@ -133,22 +133,25 @@ if "test%HBASE_HOME%" == "test" (
)
echo Calculating Drill classpath...
-set DRILL_CLASSPATH=%DRILL_HOME%\jars\*;%DRILL_CLASSPATH%
-set DRILL_CLASSPATH=%DRILL_HOME%\lib\*;%DRILL_CLASSPATH%
-set DRILL_CLASSPATH=%DRILL_HOME%\contrib\*;%DRILL_CLASSPATH%
-if "test%USE_HADOOP_CP%"=="1" set DRILL_CLASSPATH=%HADOOP_CLASSPATH%;!DRILL_CLASSPATH!
-if "test%USE_HBASE_CP%"=="1" set DRILL_CLASSPATH=%HBASE_CLASSPATH%;!DRILL_CLASSPATH!
-set DRILL_CLASSPATH=%DRILL_CONF_DIR%;%DRILL_CLASSPATH%
+
+set DRILL_CP=%DRILL_CONF_DIR%
+if NOT "test%DRILL_CLASSPATH_PREFIX%"=="test" set DRILL_CP=!DRILL_CP!;%DRILL_CLASSPATH_PREFIX%
+set DRILL_CP=%DRILL_CP%;%DRILL_HOME%\jars\*
+set DRILL_CP=%DRILL_CP%;%DRILL_HOME%\extlib\*
+if "test%USE_HADOOP_CP%"=="test1" set DRILL_CP=!DRILL_CP!;%HADOOP_CLASSPATH%
+if "test%USE_HBASE_CP%"=="test1" set DRILL_CP=!DRILL_CP!;%HBASE_CLASSPATH%
+set DRILL_CP=%DRILL_CP%;%DRILL_HOME%\lib\*
+set DRILL_CP=%DRILL_CP%;%DRILL_HOME%\contrib\*
+if NOT "test%DRILL_CLASSPATH%"=="test" set DRILL_CP=!DRILL_CP!;%DRILL_CLASSPATH%
set "DRILL_SHELL_JAVA_OPTS=%DRILL_SHELL_JAVA_OPTS% -Dlog.path=%DRILL_LOG_DIR%\sqlline.log"
if NOT "test%QUERY%"=="test" (
- echo %QUERY% | java %DRILL_SHELL_JAVA_OPTS% %DRILL_JAVA_OPTS% -cp %DRILL_CLASSPATH% sqlline.SqlLine -d org.apache.drill.jdbc.Driver %DRILL_ARGS%
+ echo %QUERY% | java %DRILL_SHELL_JAVA_OPTS% %DRILL_JAVA_OPTS% -cp %DRILL_CP% sqlline.SqlLine -d org.apache.drill.jdbc.Driver %DRILL_ARGS%
) else (
if NOT "test%FILE%"=="test" (
- java %DRILL_SHELL_JAVA_OPTS% %DRILL_JAVA_OPTS% -cp %DRILL_CLASSPATH% sqlline.SqlLine -d org.apache.drill.jdbc.Driver %DRILL_ARGS% --run=%FILE%
+ java %DRILL_SHELL_JAVA_OPTS% %DRILL_JAVA_OPTS% -cp %DRILL_CP% sqlline.SqlLine -d org.apache.drill.jdbc.Driver %DRILL_ARGS% --run=%FILE%
) else (
- java %DRILL_SHELL_JAVA_OPTS% %DRILL_JAVA_OPTS% -cp %DRILL_CLASSPATH% sqlline.SqlLine -d org.apache.drill.jdbc.Driver %DRILL_ARGS%
+ java %DRILL_SHELL_JAVA_OPTS% %DRILL_JAVA_OPTS% -cp %DRILL_CP% sqlline.SqlLine -d org.apache.drill.jdbc.Driver %DRILL_ARGS%
)
)
-