Adding Hikari Connection Pool support

amarflybot · amarflybot · commit 6947d2fd5fae · 2017-04-16T13:12:57.000+05:30
diff --git a/pom.xml b/pom.xml
@@ -47,6 +47,18 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-jdbc</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.apache.tomcat</groupId>
+					<artifactId>tomcat-jdbc</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<!-- exclude tomcat-jdbc, Spring Boot will use HikariCP automatically  -->
+		<dependency>
+			<groupId>com.zaxxer</groupId>
+			<artifactId>HikariCP</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
diff --git a/src/main/java/com/example/ApplicationConfig.java b/src/main/java/com/example/ApplicationConfig.java
@@ -1,16 +1,13 @@
 package com.example;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
+import com.zaxxer.hikari.HikariConfig;
+import com.zaxxer.hikari.HikariDataSource;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.datasource.SimpleDriverDataSource;
 import org.springframework.jdbc.support.rowset.ResultSetWrappingSqlRowSet;
 import org.springframework.jdbc.support.rowset.SqlRowSet;
 
-import javax.sql.DataSource;
-import java.sql.Driver;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 import java.util.Spliterator;
@@ -25,29 +22,8 @@
 @Configuration
 public class ApplicationConfig {
 
-    @Autowired
-    private DataSourceProperties dataSourceProperties;
-
-    @Autowired
-    private ApplicationProperties applicationProperties;
-
-    @Bean
-    DataSource dataSource() {
-        Driver driver = new org.apache.phoenix.jdbc.PhoenixDriver();
-        String url = dataSourceProperties.getUrl();
-        DataSource dataSource = new SimpleDriverDataSource(driver,url);
-        return dataSource;
-    }
-
-    @Bean
-    JdbcTemplate jdbcTemplate(final DataSource dataSource) {
-        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-        jdbcTemplate.setFetchSize(applicationProperties.getDatasource().getFetchSize());
-        return jdbcTemplate;
-    }
-
     @Bean
-    public QueryStream streamer(JdbcTemplate jdbcTemplate) {
+    public QueryStream streamer(final JdbcTemplate jdbcTemplate) {
         return new QueryStream() {
             @Override
             public <T> T streamQuery(String sql, Function<Stream<SqlRowSet>, ? extends T> streamer, Object... args) {
@@ -63,7 +39,7 @@ public <T> T streamQuery(String sql, Function<Stream<SqlRowSet>, ? extends T> st
                         private boolean first = true;
                         @Override
                         public boolean hasNext() {
-                            return !rowSet.isLast();
+                            return rowSet.next();
                         }
 
                         @Override
diff --git a/src/main/java/com/example/DataSourceResource.java b/src/main/java/com/example/DataSourceResource.java
diff --git a/src/main/java/com/example/JdbcStream.java b/src/main/java/com/example/JdbcStream.java
@@ -1,17 +1,16 @@
 package com.example;
 
 
-import org.apache.phoenix.jdbc.PhoenixResultSet;
+import com.zaxxer.hikari.HikariDataSource;
+import com.zaxxer.hikari.pool.HikariProxyResultSet;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.datasource.DataSourceUtils;
 import org.springframework.jdbc.support.rowset.ResultSetWrappingSqlRowSet;
 import org.springframework.jdbc.support.rowset.SqlRowSet;
 import org.springframework.stereotype.Component;
 
-import javax.sql.DataSource;
 import java.io.Closeable;
-import java.io.IOException;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
@@ -31,7 +30,7 @@
 public class JdbcStream extends JdbcTemplate {
 
     @Autowired
-    public JdbcStream(DataSource dataSource) {
+    public JdbcStream(HikariDataSource dataSource) {
         super(dataSource);
     }
 
@@ -49,9 +48,13 @@ public boolean hasNext() {
                 @Override
                 public SqlRow next() {
                     ResultSetWrappingSqlRowSet resultSetWrappingSqlRowSet = (ResultSetWrappingSqlRowSet) rowSet;
-                    PhoenixResultSet resultSet = (PhoenixResultSet) resultSetWrappingSqlRowSet.getResultSet();
-                    if (resultSet.getCurrentRow() == null) {
-                        throw new NoSuchElementException();
+                    HikariProxyResultSet resultSet = (HikariProxyResultSet) resultSetWrappingSqlRowSet.getResultSet();
+                    try {
+                        if (resultSet.isClosed()) {
+                            throw new NoSuchElementException();
+                        }
+                    } catch (SQLException e) {
+                        throw new RuntimeException("Error handling the resultSet");
                     }
                     return sqlRow;
                 }
@@ -90,9 +93,13 @@ public boolean hasNext() {
                 @Override
                 public SqlRow next() {
                     ResultSetWrappingSqlRowSet resultSetWrappingSqlRowSet = (ResultSetWrappingSqlRowSet) rowSet;
-                    PhoenixResultSet resultSet = (PhoenixResultSet) resultSetWrappingSqlRowSet.getResultSet();
-                    if (resultSet.getCurrentRow() == null) {
-                        throw new NoSuchElementException();
+                    HikariProxyResultSet resultSet = (HikariProxyResultSet) resultSetWrappingSqlRowSet.getResultSet();
+                    try {
+                        if (resultSet.isClosed()) {
+                            throw new NoSuchElementException();
+                        }
+                    } catch (SQLException e) {
+                        throw new RuntimeException("Error handling the resultSet");
                     }
                     return sqlRow;
                 }
@@ -103,7 +110,7 @@ public SqlRow next() {
         ;
 
         @Override
-        public void close() throws IOException {
+        public void close() {
             DataSourceUtils.releaseConnection(connection, getDataSource());
         }
     }
diff --git a/src/main/java/com/example/JerseyConfig.java b/src/main/java/com/example/JerseyConfig.java
@@ -10,7 +10,7 @@
 public class JerseyConfig extends ResourceConfig{
 
     public JerseyConfig() {
-        register(DataSourceResource.class);
+        register(WebStatResource.class);
     }
 
 
diff --git a/src/main/java/com/example/SpringBootPhoenixApplication.java b/src/main/java/com/example/SpringBootPhoenixApplication.java
@@ -2,10 +2,14 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.web.support.SpringBootServletInitializer;
+import org.springframework.context.annotation.Bean;
+
+import javax.sql.DataSource;
 
 @SpringBootApplication
 @EnableConfigurationProperties(ApplicationProperties.class)
@@ -18,4 +22,14 @@ public static void main(String[] args) {
 				.configure(new SpringApplicationBuilder(SpringBootPhoenixApplication.class))
 				.run(args);
 	}
+
+	@Bean
+	CommandLineRunner commandLineRunner(final DataSource dataSource){
+		return new CommandLineRunner() {
+			@Override
+			public void run(String... strings) throws Exception {
+				System.out.println(dataSource);
+			}
+		};
+	}
 }
diff --git a/src/main/java/com/example/WebStatDao.java b/src/main/java/com/example/WebStatDao.java
@@ -0,0 +1,72 @@
+package com.example;
+
+import com.google.gson.Gson;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Repository;
+import org.springframework.util.Assert;
+
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.StreamingOutput;
+import java.io.*;
+import java.sql.SQLException;
+
+@Repository
+public class WebStatDao {
+
+    @Autowired
+    JdbcStream jdbcStream;
+
+    public StreamingOutput getStreamingOutputForSql(String sql, Object[] args) throws SQLException {
+        JdbcStream.StreamableQuery streamableQuery = jdbcStream.streamableQuery(sql, args);
+        StreamingOutput streamingOutput = getStreamingOutput(streamableQuery);
+        streamableQuery.close();
+        return streamingOutput;
+    }
+
+    private StreamingOutput getStreamingOutput(final JdbcStream.StreamableQuery streamableQuery) {
+
+        Gson gson = new Gson();
+
+        return new StreamingOutput() {
+            @Override
+            public void write(OutputStream os) throws IOException, WebApplicationException {
+                Writer writer = new BufferedWriter(new OutputStreamWriter(os));
+                writer.write("[");
+                final boolean[] first = {false};
+                try {
+                    streamableQuery
+                            .stream()
+                            .map(sqlRow -> {
+                                try {
+                                    WebStat webStat = WebStatMapper.mapWebStat(sqlRow);
+                                    return webStat;
+                                } catch (RuntimeException e) {
+                                    throw new RuntimeException("Cannot convert SqlRom to WebStat");
+                                }
+                            }).reduce((webStat1, webStat2) -> {
+                        Assert.notNull(webStat1, "Webstat cannot be null");
+                        try {
+                            if (first[0]) {
+                                writer.write(",");
+                            } else if (!first[0]){
+                                writer.write(gson.toJson(webStat1));
+                                writer.write(",");
+                            }
+                            first[0] = true;
+                            writer.write(gson.toJson(webStat2));
+                            writer.flush();
+                            //TimeUnit.MILLISECONDS.sleep(500);
+                        } catch (IOException e) {
+                            throw new RuntimeException("Cannot write to Stream back");
+                        }
+                        return webStat1;
+                    });
+                } catch (SQLException e) {
+                    e.printStackTrace();
+                }
+                writer.write("]");
+                writer.flush();
+            }
+        };
+    }
+}
diff --git a/src/main/java/com/example/WebStatResource.java b/src/main/java/com/example/WebStatResource.java
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`public class JerseyConfig extends ResourceConfig{`
`11`	`11`
`12`	`12`	`public JerseyConfig() {`
`13`		`- register(DataSourceResource.class);`
	`13`	`+ register(WebStatResource.class);`
`14`	`14`	`}`
`15`	`15`
`16`	`16`