Fix worker connection leak in JDBC connectors

trinodb · Jan 24, 2017 · 5289297 · 5289297
1 parent bdc508e
commit 5289297
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/BaseJdbcClient.java b/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/BaseJdbcClient.java
@@ -258,12 +258,12 @@ public Connection getConnection(JdbcSplit split)
     }
 
     @Override
-    public PreparedStatement buildSql(JdbcSplit split, List<JdbcColumnHandle> columnHandles)
+    public PreparedStatement buildSql(Connection connection, JdbcSplit split, List<JdbcColumnHandle> columnHandles)
             throws SQLException
     {
         return new QueryBuilder(identifierQuote).buildSql(
                 this,
-                getConnection(split),
+                connection,
                 split.getCatalogName(),
                 split.getSchemaName(),
                 split.getTableName(),

diff --git a/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcClient.java b/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcClient.java
@@ -41,7 +41,7 @@ public interface JdbcClient
     Connection getConnection(JdbcSplit split)
             throws SQLException;
 
-    PreparedStatement buildSql(JdbcSplit split, List<JdbcColumnHandle> columnHandles)
+    PreparedStatement buildSql(Connection connection, JdbcSplit split, List<JdbcColumnHandle> columnHandles)
             throws SQLException;
 
     JdbcOutputTableHandle beginCreateTable(ConnectorTableMetadata tableMetadata);

diff --git a/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcRecordCursor.java b/presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcRecordCursor.java
@@ -73,7 +73,7 @@ public JdbcRecordCursor(JdbcClient jdbcClient, JdbcSplit split, List<JdbcColumnH
 
         try {
             connection = jdbcClient.getConnection(split);
-            statement = jdbcClient.buildSql(split, columnHandles);
+            statement = jdbcClient.buildSql(connection, split, columnHandles);
             log.debug("Executing: %s", statement.toString());
             resultSet = statement.executeQuery();
         }