jdbc support

allwefantasy · allwefantasy · commit c6a22a279621 · 2016-09-07T16:34:30.000+08:00
diff --git a/src/main/java/com/alibaba/druid/pool/ElasticSearchConnection.java b/src/main/java/com/alibaba/druid/pool/ElasticSearchConnection.java
@@ -12,9 +12,8 @@
 import java.net.URL;
 import java.net.UnknownHostException;
 import java.sql.*;
-import java.util.Calendar;
-import java.util.Map;
-import java.util.Properties;
+import java.sql.Date;
+import java.util.*;
 import java.util.concurrent.Executor;
 
 /**
@@ -25,14 +24,21 @@ public class ElasticSearchConnection implements Connection {
     private Client client;
 
     public ElasticSearchConnection(String jdbcUrl) {
-        String hostAndPort = jdbcUrl.split("/")[2];
-        String host = hostAndPort.split(":")[0];
-        String port = hostAndPort.split(":")[1];
+
+
         Settings settings = Settings.builder().put("client.transport.ignore_cluster_name", true).build();
-        Connection conn = null;
         try {
-            client = TransportClient.builder().settings(settings).build().
-                    addTransportAddress(new InetSocketTransportAddress(InetAddress.getByName(host), Integer.parseInt(port)));
+            TransportClient transportClient = TransportClient.builder().settings(settings).build();
+
+            String hostAndPortArrayStr = jdbcUrl.split("/")[2];
+            String[] hostAndPortArray = hostAndPortArrayStr.split(",");
+
+            for (String hostAndPort : hostAndPortArray) {
+                String host = hostAndPort.split(":")[0];
+                String port = hostAndPort.split(":")[1];
+                transportClient.addTransportAddress(new InetSocketTransportAddress(InetAddress.getByName(host), Integer.parseInt(port)));
+            }
+            client = transportClient;
         } catch (UnknownHostException e) {
             e.printStackTrace();
         }
diff --git a/src/test/java/org/nlpcn/es4sql/JDBCTests.java b/src/test/java/org/nlpcn/es4sql/JDBCTests.java
@@ -4,8 +4,12 @@
 import com.alibaba.druid.pool.DruidDataSource;
 
 import com.alibaba.druid.pool.ElasticSearchDruidDataSourceFactory;
+import org.junit.Assert;
 import org.junit.Test;
+
 import java.sql.*;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Properties;
 
 /**
@@ -15,19 +19,23 @@ public class JDBCTests {
     @Test
     public void testJDBC() throws Exception {
         Properties properties = new Properties();
-        properties.put("url", "jdbc:elasticsearch://127.0.0.1:9300/twitter2");
+        properties.put("url", "jdbc:elasticsearch://127.0.0.1:9300/" + TestsConstants.TEST_INDEX);
         DruidDataSource dds = (DruidDataSource) ElasticSearchDruidDataSourceFactory.createDataSource(properties);
-        dds.setInitialSize(1);
         Connection connection = dds.getConnection();
-        PreparedStatement ps = connection.prepareStatement("SELECT split(trim(concat_ws('dd',newtype,num_d)),'dd')[0] as nt from  twitter2");
+        PreparedStatement ps = connection.prepareStatement("SELECT  gender,lastname,age from  " + TestsConstants.TEST_INDEX + " where lastname='Heath'");
         ResultSet resultSet = ps.executeQuery();
+        List<String> result = new ArrayList<String>();
         while (resultSet.next()) {
-            System.out.println(resultSet.getString("nt"));
+            result.add(resultSet.getString("lastname") + "," + resultSet.getInt("age") + "," + resultSet.getString("gender"));
         }
 
         ps.close();
         connection.close();
         dds.close();
+
+        Assert.assertTrue(result.size()==2);
+        Assert.assertTrue(result.get(0).equals("Heath,39,F"));
+        Assert.assertTrue(result.get(1).equals("Heath,39,F"));
     }
 
 }
diff --git a/src/test/java/org/nlpcn/es4sql/MainTestSuite.java b/src/test/java/org/nlpcn/es4sql/MainTestSuite.java
@@ -38,7 +38,8 @@
         ShowTest.class,
         CSVResultsExtractorTests.class,
         SourceFieldTest.class,
-		SQLFunctionsTest.class
+		SQLFunctionsTest.class,
+		JDBCTests.class
 })
 public class MainTestSuite {
 
diff --git a/src/test/java/org/nlpcn/es4sql/SQLFunctionsTest.java b/src/test/java/org/nlpcn/es4sql/SQLFunctionsTest.java
@@ -129,7 +129,7 @@ public void concat_ws_field_and_string() throws Exception {
     @Test
     public void test() throws Exception {
 
-        String query = "select  case when ty=0 then '云点播CV' when ty=1 then '云直播CV' end as tyname,sum(cv) as cv  from cloud_play_stat_cust  where day='20160906' group by  tyname";
+        String query = "SELECT  gender,lastname,age from  " + TestsConstants.TEST_INDEX + " where lastname='Heath'";
 
         SearchDao searchDao = MainTestSuite.getSearchDao() != null ? MainTestSuite.getSearchDao() : getSearchDao();
         System.out.println(searchDao.explain(query).explain().explain());
