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/02/05 06:43:11 UTC
drill git commit: DRILL-2126: make jdbc connection impl honor
parameters passed from user
Repository: drill
Updated Branches:
refs/heads/master a9ee79110 -> a0d10063c
DRILL-2126: make jdbc connection impl honor parameters passed from user
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/a0d10063
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/a0d10063
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/a0d10063
Branch: refs/heads/master
Commit: a0d10063cec38fa81d983dcfaf8e4f9cb4136a01
Parents: a9ee791
Author: Hanifi Gunes <hg...@maprtech.com>
Authored: Fri Jan 30 14:01:30 2015 -0800
Committer: Parth Chandra <pc...@maprtech.com>
Committed: Wed Feb 4 21:42:34 2015 -0800
----------------------------------------------------------------------
.../main/java/org/apache/drill/common/config/DrillConfig.java | 7 ++++++-
.../drill/exec/compile/bytecode/ReplaceMethodInvoke.java | 2 +-
.../java/org/apache/drill/jdbc/DrillConnectionConfig.java | 1 +
.../main/java/org/apache/drill/jdbc/DrillConnectionImpl.java | 4 ++--
4 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/a0d10063/common/src/main/java/org/apache/drill/common/config/DrillConfig.java
----------------------------------------------------------------------
diff --git a/common/src/main/java/org/apache/drill/common/config/DrillConfig.java b/common/src/main/java/org/apache/drill/common/config/DrillConfig.java
index 4c6c766..f075cc9 100644
--- a/common/src/main/java/org/apache/drill/common/config/DrillConfig.java
+++ b/common/src/main/java/org/apache/drill/common/config/DrillConfig.java
@@ -95,7 +95,12 @@ public final class DrillConfig extends NestedConfig{
return create(null, true);
}
- public static DrillConfig createClient() {
+ /**
+ * Creates a {{@link DrillConfig configuration}} disabling server specific configuration options.
+ *
+ * @return {{@link DrillConfig}} instance
+ */
+ public static DrillConfig forClient() {
return create(null, false);
}
http://git-wip-us.apache.org/repos/asf/drill/blob/a0d10063/exec/java-exec/src/test/java/org/apache/drill/exec/compile/bytecode/ReplaceMethodInvoke.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/compile/bytecode/ReplaceMethodInvoke.java b/exec/java-exec/src/test/java/org/apache/drill/exec/compile/bytecode/ReplaceMethodInvoke.java
index c7467a0..f9971a7 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/compile/bytecode/ReplaceMethodInvoke.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/compile/bytecode/ReplaceMethodInvoke.java
@@ -63,7 +63,7 @@ public class ReplaceMethodInvoke {
check(output);
- DrillConfig c = DrillConfig.createClient();
+ DrillConfig c = DrillConfig.forClient();
SystemOptionManager m = new SystemOptionManager(c, new LocalPStoreProvider(c));
m.init();
QueryClassLoader ql = new QueryClassLoader(DrillConfig.create(), m);
http://git-wip-us.apache.org/repos/asf/drill/blob/a0d10063/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillConnectionConfig.java
----------------------------------------------------------------------
diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillConnectionConfig.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillConnectionConfig.java
index 584bbb4..54e31b1 100644
--- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillConnectionConfig.java
+++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillConnectionConfig.java
@@ -33,6 +33,7 @@ public class DrillConnectionConfig extends ConnectionConfigImpl {
public boolean isLocal(){
return "local".equals(props.getProperty("zk"));
}
+
public String getZookeeperConnectionString(){
return props.getProperty("zk");
}
http://git-wip-us.apache.org/repos/asf/drill/blob/a0d10063/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillConnectionImpl.java
----------------------------------------------------------------------
diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillConnectionImpl.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillConnectionImpl.java
index 4c54780..2c51ec0 100644
--- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillConnectionImpl.java
+++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillConnectionImpl.java
@@ -67,7 +67,7 @@ abstract class DrillConnectionImpl extends AvaticaConnection implements org.apac
throw new SQLException("Running Drill in embedded mode using the JDBC jar alone is not supported.");
}
- DrillConfig dConfig = DrillConfig.create();
+ final DrillConfig dConfig = DrillConfig.create(info);
this.allocator = new TopLevelAllocator(dConfig);
RemoteServiceSet set = GlobalServiceSetReference.SETS.get();
if (set == null) {
@@ -87,7 +87,7 @@ abstract class DrillConnectionImpl extends AvaticaConnection implements org.apac
this.client = new DrillClient(dConfig, set.getCoordinator());
this.client.connect(null, info);
} else {
- DrillConfig dConfig = DrillConfig.createClient();
+ final DrillConfig dConfig = DrillConfig.forClient();
this.allocator = new TopLevelAllocator(dConfig);
this.client = new DrillClient();
this.client.connect(config.getZookeeperConnectionString(), info);