honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SQL: close ResultSet after asserting (elastic/x-pack-elasticsearch#3601) 

The on-closing Connection is closed so there's no leak however closing
the ResultSet is good practice and tests another piece of code as well

Original commit: elastic/x-pack-elasticsearch@3a9cee70a3
This commit is contained in:
Costin Leau 2018-01-17 22:14:07 +02:00 committed by GitHub
parent d6e292087b
commit 41c1c5fdd1
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
qa/sql/src/main/java/org/elasticsearch/xpack/qa/sql/jdbc/JdbcAssert.java
View File

@ -32,14 +32,13 @@ public class JdbcAssert {
}
public static void assertResultSets(ResultSet expected, ResultSet actual, Logger logger) throws SQLException {
assertResultSetMetadata(expected, actual, logger);
assertResultSetData(expected, actual, logger);
}
public static void assertResultSetMetadata(ResultSet expected, ResultSet actual) throws SQLException {
assertResultSetMetadata(expected, actual, null);
try (ResultSet ex = expected; ResultSet ac = actual) {
assertResultSetMetadata(ex, ac, logger);
assertResultSetData(ex, ac, logger);
}
}
// metadata doesn't consume a ResultSet thus it shouldn't close it
public static void assertResultSetMetadata(ResultSet expected, ResultSet actual, Logger logger) throws SQLException {
ResultSetMetaData expectedMeta = expected.getMetaData();
ResultSetMetaData actualMeta = actual.getMetaData();
@ -98,7 +97,14 @@ public class JdbcAssert {
}
}
// The ResultSet is consumed and thus it should be closed
public static void assertResultSetData(ResultSet expected, ResultSet actual, Logger logger) throws SQLException {
try (ResultSet ex = expected; ResultSet ac = actual) {
doAssertResultSetData(ex, ac, logger);
}
}
private static void doAssertResultSetData(ResultSet expected, ResultSet actual, Logger logger) throws SQLException {
ResultSetMetaData metaData = expected.getMetaData();
int columns = metaData.getColumnCount();