support connectionProperties for JDBC

石源 · 石源 · commit 01f6d3c55b4f · 2018-05-30T11:16:35.000+08:00
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.nlpcn</groupId>
 	<artifactId>elasticsearch-sql</artifactId>
-	<version>6.2.4.3</version>
+	<version>6.2.4.4</version>
 	<packaging>jar</packaging>
 	<description>Query elasticsearch using SQL</description>
 	<name>elasticsearch-sql</name>
@@ -49,6 +49,18 @@
 		<elasticsearch.plugin.classname>org.elasticsearch.plugin.nlpcn.SqlPlug</elasticsearch.plugin.classname>
 	</properties>
 
+	<repositories>
+		<repository>
+			<id>elasticsearch-releases</id>
+			<url>https://artifacts.elastic.co/maven</url>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+	</repositories>
 
 	<dependencies>
 		<dependency>
@@ -99,7 +111,7 @@
 
         <dependency>
             <groupId>org.elasticsearch.client</groupId>
-            <artifactId>transport</artifactId>
+            <artifactId>x-pack-transport</artifactId>
             <version>${elasticsearch.version}</version>
             <scope>provided</scope>
         </dependency>
diff --git a/src/main/java/com/alibaba/druid/pool/ElasticSearchConnection.java b/src/main/java/com/alibaba/druid/pool/ElasticSearchConnection.java
@@ -4,7 +4,7 @@
 import org.elasticsearch.client.transport.TransportClient;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.transport.TransportAddress;
-import org.elasticsearch.transport.client.PreBuiltTransportClient;
+import org.elasticsearch.xpack.client.PreBuiltXPackTransportClient;
 
 import java.io.InputStream;
 import java.io.Reader;
@@ -24,12 +24,13 @@ public class ElasticSearchConnection implements Connection {
 
     private Client client;
 
-    public ElasticSearchConnection(String jdbcUrl) {
+    public ElasticSearchConnection(String jdbcUrl, Properties info) {
 
-
-        Settings settings = Settings.builder().put("client.transport.ignore_cluster_name", true).build();
+        Settings.Builder builder = Settings.builder();
+        info.forEach((k, v) -> builder.put(k.toString(), v.toString()));
+        Settings settings = builder.build();
         try {
-            TransportClient transportClient = new PreBuiltTransportClient(settings);
+            TransportClient transportClient = new PreBuiltXPackTransportClient(settings);
 
             String hostAndPortArrayStr = jdbcUrl.split("/")[2];
             String[] hostAndPortArray = hostAndPortArrayStr.split(",");
diff --git a/src/main/java/com/alibaba/druid/pool/ElasticSearchDruidDataSource.java b/src/main/java/com/alibaba/druid/pool/ElasticSearchDruidDataSource.java
@@ -655,7 +655,7 @@ public Connection createPhysicalConnection() throws SQLException {
 
     @Override
     public Connection createPhysicalConnection(String url, Properties info) throws SQLException {
-        Connection conn = new ElasticSearchConnection(url);
+        Connection conn = new ElasticSearchConnection(url, info);
         createCount.incrementAndGet();
 
         return conn;
diff --git a/src/test/java/org/nlpcn/es4sql/JDBCTests.java b/src/test/java/org/nlpcn/es4sql/JDBCTests.java
@@ -12,14 +12,18 @@
 import java.util.List;
 import java.util.Properties;
 
+import static com.alibaba.druid.pool.DruidDataSourceFactory.PROP_CONNECTIONPROPERTIES;
+import static com.alibaba.druid.pool.DruidDataSourceFactory.PROP_URL;
+
 /**
  * Created by allwefantasy on 8/26/16.
  */
 public class JDBCTests {
     @Test
     public void testJDBC() throws Exception {
         Properties properties = new Properties();
-        properties.put("url", "jdbc:elasticsearch://127.0.0.1:9300/" + TestsConstants.TEST_INDEX_ACCOUNT);
+        properties.put(PROP_URL, "jdbc:elasticsearch://127.0.0.1:9300/" + TestsConstants.TEST_INDEX_ACCOUNT);
+        properties.put(PROP_CONNECTIONPROPERTIES, "client.transport.ignore_cluster_name=true");
         DruidDataSource dds = (DruidDataSource) ElasticSearchDruidDataSourceFactory.createDataSource(properties);
         Connection connection = dds.getConnection();
         PreparedStatement ps = connection.prepareStatement("SELECT  gender,lastname,age from  " + TestsConstants.TEST_INDEX_ACCOUNT + " where lastname='Heath'");
