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 2015/05/14 21:20:03 UTC
[2/3] drill git commit: Update Drill to use latest sqlline
Update Drill to use latest sqlline
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/f0d0526f
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/f0d0526f
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/f0d0526f
Branch: refs/heads/merge_2015_05_14
Commit: f0d0526f5b889e532197aa5a716cb539f3900c82
Parents: ae4ced1
Author: Jacques Nadeau <ja...@apache.org>
Authored: Thu May 14 09:16:41 2015 -0700
Committer: Jacques Nadeau <ja...@apache.org>
Committed: Thu May 14 10:25:37 2015 -0700
----------------------------------------------------------------------
distribution/src/resources/sqlline | 4 +++-
pom.xml | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/f0d0526f/distribution/src/resources/sqlline
----------------------------------------------------------------------
diff --git a/distribution/src/resources/sqlline b/distribution/src/resources/sqlline
index b1b9014..2c9c783 100644
--- a/distribution/src/resources/sqlline
+++ b/distribution/src/resources/sqlline
@@ -39,7 +39,9 @@ bin=`cd "$bin">/dev/null; pwd`
# is.)
# Put our property specification before previous value of DRILL_SHELL_JAVA_OPTS
# so that it can still be overridden via DRILL_SHELL_JAVA_OPTS.
-DRILL_SHELL_JAVA_OPTS="-Dsqlline.isolation=TRANSACTION_NONE $DRILL_SHELL_JAVA_OPTS"
+#
+# This is not currently needed as the new SQLLine we are using doesn't isolate.
+# DRILL_SHELL_JAVA_OPTS="-Dsqlline.isolation=TRANSACTION_NONE $DRILL_SHELL_JAVA_OPTS"
DRILL_SHELL_JAVA_OPTS="$DRILL_SHELL_JAVA_OPTS -Dlog.path=$DRILL_LOG_DIR/sqlline.log -Dlog.query.path=$DRILL_LOG_DIR/sqlline_queries.json"
http://git-wip-us.apache.org/repos/asf/drill/blob/f0d0526f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index cf17a79..f4147f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1032,7 +1032,7 @@
<dependency>
<groupId>sqlline</groupId>
<artifactId>sqlline</artifactId>
- <version>1.1.6</version>
+ <version>1.1.9-drill-r1</version>
</dependency>
<dependency>
@@ -1370,7 +1370,7 @@
<dependency>
<groupId>sqlline</groupId>
<artifactId>sqlline</artifactId>
- <version>1.1.6</version>
+ <version>1.1.9-drill-r1</version>
</dependency>
<!-- Test Dependencies -->
<dependency>