fix jdbcuri into drillbit mode
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f1aa9e19 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f1aa9e19 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f1aa9e19 Branch: refs/heads/master Commit: f1aa9e197897f1161051873f3598eaafc813f551 Parents: 0db7177 Author: Fabrizio Spataro <fabrizio.spat...@bizmate.it> Authored: Fri Oct 14 12:52:57 2016 +0200 Committer: Andrea Cosentino <anco...@gmail.com> Committed: Mon Oct 17 13:11:29 2016 +0200 ---------------------------------------------------------------------- .../camel/component/drill/DrillEndpoint.java | 23 ++++++++------------ .../camel/component/drill/ProducerTest.java | 4 +++- 2 files changed, 12 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/f1aa9e19/components/camel-drill/src/main/java/org/apache/camel/component/drill/DrillEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-drill/src/main/java/org/apache/camel/component/drill/DrillEndpoint.java b/components/camel-drill/src/main/java/org/apache/camel/component/drill/DrillEndpoint.java index 9595bc0..708f42c 100644 --- a/components/camel-drill/src/main/java/org/apache/camel/component/drill/DrillEndpoint.java +++ b/components/camel-drill/src/main/java/org/apache/camel/component/drill/DrillEndpoint.java @@ -79,20 +79,15 @@ public class DrillEndpoint extends DefaultPollingEndpoint { } public String toJDBCUri() { - String url = "jdbc:drill:"; - if (mode.equals(DrillConnectionMode.DRILLBIT)) { - // TODO JIRA BUG connection mode - url += mode.name().toLowerCase() + "=" + host; - } else { - url += mode.name().toLowerCase() + "=" + host + ":" + port; - } - - if (StringUtils.isNotBlank(directory)) { - url += "/" + directory; - } - if (StringUtils.isNotBlank(clusterId)) { - url += "/" + clusterId; - } + String url = "jdbc:drill:" + mode.name().toLowerCase() + "=" + host + ":" + port; + if (mode.equals(DrillConnectionMode.ZK)) { + if (StringUtils.isNotBlank(directory)) { + url += "/" + directory; + } + if (StringUtils.isNotBlank(clusterId)) { + url += "/" + clusterId; + } + } return url; } http://git-wip-us.apache.org/repos/asf/camel/blob/f1aa9e19/components/camel-drill/src/test/java/org/apache/camel/component/drill/ProducerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-drill/src/test/java/org/apache/camel/component/drill/ProducerTest.java b/components/camel-drill/src/test/java/org/apache/camel/component/drill/ProducerTest.java index f3c8050..1b00a48 100644 --- a/components/camel-drill/src/test/java/org/apache/camel/component/drill/ProducerTest.java +++ b/components/camel-drill/src/test/java/org/apache/camel/component/drill/ProducerTest.java @@ -29,6 +29,7 @@ public class ProducerTest extends CamelTestSupport { private final String host = "localhost"; private final DrillConnectionMode mode = DrillConnectionMode.DRILLBIT; + private final Integer port = 31010; // default drillbit port private final String query = "select * from query"; @Test @@ -45,7 +46,8 @@ public class ProducerTest extends CamelTestSupport { protected RouteBuilder createRouteBuilder() throws Exception { return new RouteBuilder() { public void configure() { - from("direct:in").setHeader(DrillConstants.DRILL_QUERY, constant(query)).to("drill://" + host + "?mode=" + mode.name()).log("${body}").to("mock:result"); + from("direct:in").setHeader(DrillConstants.DRILL_QUERY, constant(query)).to("drill://" + host + "?mode=" + mode.name() + "&port=" + port).log("${body}") + .to("mock:result"); } }; }
