You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by pa...@apache.org on 2015/05/09 01:48:32 UTC
[1/2] drill git commit: DRIL-2994: Incorrect error message when
disconnecting from a direct drillbit connection
Repository: drill
Updated Branches:
refs/heads/master 7abd7cf4e -> c2bd69879
DRIL-2994: Incorrect error message when disconnecting from a direct drillbit connection
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/33713f84
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/33713f84
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/33713f84
Branch: refs/heads/master
Commit: 33713f8459929c16f3f8308a31cdcb55f8c8574b
Parents: 7abd7cf
Author: Parth Chandra <pa...@apache.org>
Authored: Fri May 8 11:38:49 2015 -0700
Committer: Parth Chandra <pa...@apache.org>
Committed: Fri May 8 16:45:10 2015 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/drill/exec/client/DrillClient.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/33713f84/exec/java-exec/src/main/java/org/apache/drill/exec/client/DrillClient.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/client/DrillClient.java b/exec/java-exec/src/main/java/org/apache/drill/exec/client/DrillClient.java
index 5b28f16..9924704 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/client/DrillClient.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/client/DrillClient.java
@@ -123,7 +123,7 @@ public class DrillClient implements Closeable, ConnectionThrottle {
// if isDirect is true, the client will connect directly to the drillbit instead of
// going thru the zookeeper
this.isDirectConnection = isDirect;
- this.ownsZkConnection = coordinator == null;
+ this.ownsZkConnection = coordinator == null && !isDirect;
this.ownsAllocator = allocator == null;
this.allocator = ownsAllocator ? new TopLevelAllocator(config) : allocator;
this.config = config;
[2/2] drill git commit: DRILL-2570 - exclude "META-INF/services" dir
from jdbc-all
Posted by pa...@apache.org.
DRILL-2570 - exclude "META-INF/services" dir from jdbc-all
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/c2bd6987
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/c2bd6987
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/c2bd6987
Branch: refs/heads/master
Commit: c2bd69879b6760712393a6ee2c4e34071a4b7795
Parents: 33713f8
Author: Patrick Wong <pw...@maprtech.com>
Authored: Thu Apr 9 15:42:55 2015 -0700
Committer: Parth Chandra <pa...@apache.org>
Committed: Fri May 8 16:47:55 2015 -0700
----------------------------------------------------------------------
exec/jdbc-all/pom.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/c2bd6987/exec/jdbc-all/pom.xml
----------------------------------------------------------------------
diff --git a/exec/jdbc-all/pom.xml b/exec/jdbc-all/pom.xml
index 9042769..388f8ba 100644
--- a/exec/jdbc-all/pom.xml
+++ b/exec/jdbc-all/pom.xml
@@ -264,6 +264,7 @@
<exclude name="**/*.SF"/>
<exclude name="**/*.RSA"/>
<exclude name="**/*.DSA"/>
+ <exclude name="META-INF/services/*"/>
<exclude name="META-INF/*.SF"/>
<exclude name="META-INF/*.RSA"/>
<exclude name="META-INF/*.DSA"/>