You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by sh...@apache.org on 2017/07/22 13:55:16 UTC
kylin git commit: KYLIN-2643 fix unclosed statement in
PushDownRunnerJdbcImpl.java
Repository: kylin
Updated Branches:
refs/heads/master 61ff3c310 -> 6ca141a9f
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/6ca141a9
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/6ca141a9
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/6ca141a9
Branch: refs/heads/master
Commit: 6ca141a9f2e6cd5bc67fc37ec0fba61b1fc2d49c
Parents: 61ff3c3
Author: shaofengshi <sh...@apache.org>
Authored: Sat Jul 22 21:55:07 2017 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Sat Jul 22 21:55:07 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/6ca141a9/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() {