Skip to content

Fixed closing of ResultSet on prepareStatement and createStatement #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 13, 2024
Merged

Fixed closing of ResultSet on prepareStatement and createStatement #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions jdbc/src/main/java/tech/ydb/jdbc/context/StaticQueryResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,12 @@ public StaticQueryResult(YdbStatement statement, String ast, String plan) {
}

@Override
public void close() {
// nothing
public void close() throws SQLException {
for (ExpressionResult res: results) {
if (res.resultSet != null) {
res.resultSet.close();
}
}
}

@Override
Expand Down
3 changes: 0 additions & 3 deletions jdbc/src/main/java/tech/ydb/jdbc/impl/BaseYdbStatement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ public YdbConnection getConnection() {
@Override
public void close() throws SQLException {
clearBatch();
state.close();
state = YdbQueryResult.EMPTY;
isClosed = true;
}
Expand Down Expand Up @@ -144,9 +143,7 @@ public int getUpdateCount() throws SQLException {
}

protected void cleanState() throws SQLException {
state.close();
state = YdbQueryResult.EMPTY;

clearWarnings();
}

Expand Down
4 changes: 1 addition & 3 deletions jdbc/src/main/java/tech/ydb/jdbc/impl/YdbConnectionImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,6 @@ public int getHoldability() throws SQLException {
@Override
public YdbStatement createStatement(int resultSetType, int resultSetConcurrency,
int resultSetHoldability) throws SQLException {
executor.ensureOpened();
ctx.getTracer().trace("create statement");
checkStatementParams(resultSetType, resultSetConcurrency, resultSetHoldability);
return new YdbStatementImpl(this, resultSetType);
Expand Down Expand Up @@ -239,9 +238,8 @@ public YdbPreparedStatement prepareStatement(String sql, int autoGeneratedKeys)

private YdbPreparedStatement prepareStatement(String sql, int resultSetType, YdbPrepareMode mode)
throws SQLException {
executor.ensureOpened();
validator.clearWarnings();

validator.clearWarnings();
ctx.getTracer().trace("prepare statement");
YdbQuery query = ctx.findOrParseYdbQuery(sql);
YdbPreparedQuery params = ctx.findOrPrepareParams(query, mode);
Expand Down
57 changes: 54 additions & 3 deletions jdbc/src/test/java/tech/ydb/jdbc/impl/YdbLazyResultSetImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import java.net.URL;
import java.sql.Date;
import java.sql.JDBCType;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.SQLException;
Expand Down Expand Up @@ -57,9 +58,8 @@
import tech.ydb.table.values.Value;
import tech.ydb.test.junit5.YdbHelperExtension;



public class YdbLazyResultSetImplTest {

@RegisterExtension
private static final YdbHelperExtension ydb = new YdbHelperExtension();

Expand Down Expand Up @@ -125,7 +125,6 @@ public void close() throws SQLException {
Assertions.assertTrue(resultSet.isClosed());
}


@Test
public void unwrap() throws SQLException {
Assertions.assertTrue(resultSet.isWrapperFor(YdbResultSet.class));
Expand Down Expand Up @@ -265,6 +264,58 @@ public void moveOnEmptyResultSet() throws SQLException {
}
}

@Test
public void closeResultSetOnExecuteNext() throws SQLException {
ResultSet rs1 = statement.executeQuery(TEST_TABLE.selectSQL());
Assertions.assertFalse(rs1.isClosed());
ResultSet rs2 = statement.executeQuery(TEST_TABLE.selectSQL());
Assertions.assertTrue(rs1.isClosed());
Assertions.assertFalse(rs2.isClosed());

rs2.close();
}

@Test
public void closeResultSetOnCreateStatement() throws SQLException {
ResultSet rs1 = statement.executeQuery(TEST_TABLE.selectSQL());
Assertions.assertFalse(rs1.isClosed());

Statement other = jdbc.connection().createStatement();

Assertions.assertFalse(rs1.isClosed()); // new statement doesn't close current result set

ResultSet rs2 = other.executeQuery(TEST_TABLE.selectSQL());
Assertions.assertTrue(rs1.isClosed());
Assertions.assertFalse(rs2.isClosed());

other.close();
Assertions.assertFalse(rs2.isClosed());

rs2.close();
}

@Test
public void closeResultSetOnPrepareStatement() throws SQLException {
ResultSet rs1 = statement.executeQuery(TEST_TABLE.selectSQL());
Assertions.assertFalse(rs1.isClosed());

PreparedStatement ps = jdbc.connection().prepareStatement(TEST_TABLE.selectAllByKey("?"));

Assertions.assertFalse(rs1.isClosed()); // prepare statement doesn't close current result set
ps.setInt(1, 1);

Assertions.assertFalse(rs1.isClosed()); // prepare statement doesn't close current result set

ResultSet rs2 = ps.executeQuery();
Assertions.assertTrue(rs1.isClosed());
Assertions.assertFalse(rs2.isClosed());

ps.close();
Assertions.assertFalse(rs2.isClosed());

rs2.close();
}

@Test
public void next() throws SQLException {
Assertions.assertEquals(0, resultSet.getRow());
Expand Down
54 changes: 53 additions & 1 deletion jdbc/src/test/java/tech/ydb/jdbc/impl/YdbResultSetImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import java.net.URL;
import java.sql.Date;
import java.sql.JDBCType;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.SQLException;
Expand Down Expand Up @@ -125,7 +126,6 @@ public void close() throws SQLException {
Assertions.assertTrue(resultSet.isClosed());
}


@Test
public void unwrap() throws SQLException {
Assertions.assertTrue(resultSet.isWrapperFor(YdbResultSet.class));
Expand Down Expand Up @@ -295,6 +295,58 @@ public void moveOnEmptyResultSet() throws SQLException {
}
}

@Test
public void closeResultSetOnExecuteNext() throws SQLException {
ResultSet rs1 = statement.executeQuery(TEST_TABLE.selectSQL());
Assertions.assertFalse(rs1.isClosed());
ResultSet rs2 = statement.executeQuery(TEST_TABLE.selectSQL());
Assertions.assertTrue(rs1.isClosed());
Assertions.assertFalse(rs2.isClosed());

rs2.close();
}

@Test
public void closeResultSetOnCreateStatement() throws SQLException {
ResultSet rs1 = statement.executeQuery(TEST_TABLE.selectSQL());
Assertions.assertFalse(rs1.isClosed());

Statement other = jdbc.connection().createStatement();

Assertions.assertFalse(rs1.isClosed()); // new statement doesn't close current result set

ResultSet rs2 = other.executeQuery(TEST_TABLE.selectSQL());
Assertions.assertTrue(rs1.isClosed());
Assertions.assertFalse(rs2.isClosed());

other.close();
Assertions.assertFalse(rs2.isClosed());

rs2.close();
}

@Test
public void closeResultSetOnPrepareStatement() throws SQLException {
ResultSet rs1 = statement.executeQuery(TEST_TABLE.selectSQL());
Assertions.assertFalse(rs1.isClosed());

PreparedStatement ps = jdbc.connection().prepareStatement(TEST_TABLE.selectAllByKey("?"));

Assertions.assertFalse(rs1.isClosed()); // prepare statement doesn't close current result set
ps.setInt(1, 1);

Assertions.assertFalse(rs1.isClosed()); // prepare statement doesn't close current result set

ResultSet rs2 = ps.executeQuery();
Assertions.assertTrue(rs1.isClosed());
Assertions.assertFalse(rs2.isClosed());

ps.close();
Assertions.assertFalse(rs2.isClosed());

rs2.close();
}

@Test
public void next() throws SQLException {
Assertions.assertEquals(0, resultSet.getRow());
Expand Down