Repository: kylin Updated Branches: refs/heads/master 9a913582b -> 45759972a
KYLIN-1574 Unclosed ResultSet in QueryService#getMetadata() Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/45759972 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/45759972 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/45759972 Branch: refs/heads/master Commit: 45759972a72ff7f9608525e3e9383dad8810edb0 Parents: 9a91358 Author: Ted Yu <yuzhih...@gmail.com> Authored: Thu Apr 14 20:21:18 2016 +0800 Committer: shaofengshi <shaofeng...@apache.org> Committed: Thu Apr 14 20:21:52 2016 +0800 ---------------------------------------------------------------------- .../main/java/org/apache/kylin/rest/service/QueryService.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/45759972/server/src/main/java/org/apache/kylin/rest/service/QueryService.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/kylin/rest/service/QueryService.java b/server/src/main/java/org/apache/kylin/rest/service/QueryService.java index 059a095..4770a73 100644 --- a/server/src/main/java/org/apache/kylin/rest/service/QueryService.java +++ b/server/src/main/java/org/apache/kylin/rest/service/QueryService.java @@ -281,13 +281,14 @@ public class QueryService extends BasicService { if (StringUtils.isBlank(project)) { return Collections.emptyList(); } + ResultSet JDBCTableMeta = null; try { DataSource dataSource = cacheService.getOLAPDataSource(project); conn = dataSource.getConnection(); DatabaseMetaData metaData = conn.getMetaData(); logger.debug("getting table metas"); - ResultSet JDBCTableMeta = metaData.getTables(null, null, null, null); + JDBCTableMeta = metaData.getTables(null, null, null, null); tableMetas = new LinkedList<TableMeta>(); Map<String, TableMeta> tableMap = new HashMap<String, TableMeta>(); @@ -321,6 +322,9 @@ public class QueryService extends BasicService { logger.debug("done column metas"); } finally { close(columnMeta, null, conn); + if (JDBCTableMeta != null) { + JDBCTableMeta.close(); + } } return tableMetas;
