Repository: kylin Updated Branches: refs/heads/2.1.x a2411fb4b -> 0e139d8b5
KYLIN-2643 fix unclosed statement in PushDownRunnerJdbcImpl.java Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/0e139d8b Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/0e139d8b Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/0e139d8b Branch: refs/heads/2.1.x Commit: 0e139d8b530fdd438cb2cae0cbe94ad99a953326 Parents: a2411fb Author: shaofengshi <shaofeng...@apache.org> Authored: Sat Jul 22 21:55:07 2017 +0800 Committer: shaofengshi <shaofeng...@apache.org> Committed: Sat Jul 22 21:55:45 2017 +0800 ---------------------------------------------------------------------- .../kylin/query/adhoc/PushDownRunnerJdbcImpl.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/0e139d8b/query/src/main/java/org/apache/kylin/query/adhoc/PushDownRunnerJdbcImpl.java ---------------------------------------------------------------------- diff --git a/query/src/main/java/org/apache/kylin/query/adhoc/PushDownRunnerJdbcImpl.java b/query/src/main/java/org/apache/kylin/query/adhoc/PushDownRunnerJdbcImpl.java index 8001880..93cd9a5 100644 --- a/query/src/main/java/org/apache/kylin/query/adhoc/PushDownRunnerJdbcImpl.java +++ b/query/src/main/java/org/apache/kylin/query/adhoc/PushDownRunnerJdbcImpl.java @@ -29,6 +29,7 @@ import java.util.List; import org.apache.commons.pool.impl.GenericObjectPool; import org.apache.kylin.common.KylinConfig; +import org.apache.kylin.common.util.DBUtils; import org.apache.kylin.metadata.querymeta.SelectedColumnMeta; import org.apache.kylin.source.adhocquery.IPushDownRunner; @@ -62,18 +63,13 @@ public class PushDownRunnerJdbcImpl implements IPushDownRunner { Connection connection = this.getConnection(); ResultSet resultSet = null; - try { - statement = connection.createStatement(); - resultSet = statement.executeQuery(query); - extractResults(resultSet, results); - } catch (SQLException sqlException) { - throw sqlException; - } - //extract column metadata ResultSetMetaData metaData = null; int columnCount = 0; try { + statement = connection.createStatement(); + resultSet = statement.executeQuery(query); + extractResults(resultSet, results); metaData = resultSet.getMetaData(); columnCount = metaData.getColumnCount(); @@ -88,9 +84,12 @@ public class PushDownRunnerJdbcImpl implements IPushDownRunner { } catch (SQLException sqlException) { throw sqlException; + } finally { + DBUtils.closeQuietly(resultSet); + DBUtils.closeQuietly(statement); + closeConnection(connection); } - closeConnection(connection); } private Connection getConnection() {
