Visitar URL original
fix(bigquery-jdbc): avoid rollback on statement close in manual commit mode by yagudin10 · Pull Request #13503 · googleapis/google-cloud-java · GitHub
Skip to content

fix(bigquery-jdbc): avoid rollback on statement close in manual commit mode #13503

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
keshavdandeva merged 9 commits into from
Jun 25, 2026
Merged

fix(bigquery-jdbc): avoid rollback on statement close in manual commit mode #13503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e81a651
fix(bigquery-jdbc): avoid rollback on statement close in manual commi…
yagudin10 Jun 16, 2026
bb53c59
Merge branch 'main' into main
yagudin10 Jun 17, 2026
2751219
fix(bigquery-jdbc): rollback active transactions when closing connection
yagudin10 Jun 18, 2026
f49a91d
Merge branch 'main' into main
yagudin10 Jun 18, 2026
1c7abba
Merge branch 'main' into main
yagudin10 Jun 23, 2026
38139f9
Merge branch 'main' into main
logachev Jun 23, 2026
91a9e02
fix(bigquery-jdbc): fix formatting
yagudin10 Jun 24, 2026
f8561be
Merge branch 'main' into main
logachev Jun 25, 2026
5b16b74
Merge branch 'main' into main
keshavdandeva Jun 25, 2026
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
15 changes: 15 additions & 0 deletions java-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -985,6 +985,21 @@ private void closeImpl() throws SQLException {
}
this.openStatements.clear();

if (isTransactionStarted()) {
try {
// It looks like there's no need to start a new transaction after a rollback,
// but the commit behavior is preserved since close() may still fail before isClosed is
// updated.
rollbackImpl();
} catch (SQLException e) {
if (exceptionToThrow == null) {
exceptionToThrow = e;
} else {
exceptionToThrow.addSuppressed(e);
}
}
}

boolean interrupted = Thread.currentThread().isInterrupted();

try {
Expand Down
3 changes: 0 additions & 3 deletions java-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryStatement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,9 +526,6 @@ private void closeStatementResources() throws SQLException {
this.currentUpdateCount = -1;
this.currentJobIdIndex = -1;
if (this.connection != null) {
if (this.connection.isTransactionStarted()) {

@logachev logachev Jun 17, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please add this logic to the connection.closeImpl()?

I think when connection is closed, it needs to cancel any pending transaction otherwise they will be eventually cancelled by some timeout.

@yagudin10 yagudin10 Jun 18, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.
Not sure about calling rollbackImpl() as-is, since it starts a new transaction after the rollback, which seems unnecessary during close().
On the other hand, connection.close() may fail before the connection is fully closed, so keeping the existing rollback behavior might actually be the safer option.

this.connection.rollback();
}
this.connection.removeStatement(this);
}
}
Expand Down
14 changes: 14 additions & 0 deletions java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/BigQueryStatementTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,6 +492,20 @@ public void testCancelWithJoblessQuery() throws SQLException, InterruptedExcepti
verify(bigquery, Mockito.never()).cancel(any(JobId.class));
}

@Test
public void testCancelDoesNotRollbackTransaction() throws SQLException {
doReturn(true).when(bigQueryConnection).isTransactionStarted();
BigQueryStatement statementSpy = Mockito.spy(bigQueryStatement);
statementSpy.jobIds.add(jobId);

statementSpy.cancel();

// Cancel should call bigquery.cancel() but not rollback the transaction
verify(bigquery).cancel(eq(jobId));
verify(bigQueryConnection, Mockito.never()).rollback();
verify(bigQueryConnection).removeStatement(statementSpy);
}

@ParameterizedTest
@ValueSource(booleans = {true, false})
public void testGetStatementType(boolean isReadOnlyTokenUsed) throws Exception {
Expand Down
90 changes: 90 additions & 0 deletions java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/it/ITBigQueryJDBCTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2211,6 +2211,96 @@ public void testConnectionWithMultipleTransactionCommits() throws SQLException {
connection.close();
}

@Test
public void testPreparedStatementCloseDoesNotRollbackTransaction() throws SQLException {
String TRANSACTION_TABLE = "JDBC_PS_CLOSE_TABLE" + randomNumber;
String createTransactionTable =
String.format(
"CREATE OR REPLACE TABLE %s.%s (`id` INTEGER, `name` STRING, `age` INTEGER);",
DATASET, TRANSACTION_TABLE);
String insertQuery =
String.format(
"INSERT INTO %s.%s (id, name, age) VALUES (?, ?, ?);", DATASET, TRANSACTION_TABLE);
String selectQuery =
String.format("SELECT id, name, age FROM %s.%s ORDER BY id;", DATASET, TRANSACTION_TABLE);

bigQueryStatement.execute(createTransactionTable);

try (Connection connection = DriverManager.getConnection(session_enabled_connection_uri)) {
connection.setAutoCommit(false);
try (PreparedStatement ps1 = connection.prepareStatement(insertQuery);
PreparedStatement ps2 = connection.prepareStatement(insertQuery)) {
ps1.setInt(1, 1);
ps1.setString(2, "DwightShrute");
ps1.setInt(3, 10);
assertEquals(1, ps1.executeUpdate());

ps2.setInt(1, 2);
ps2.setString(2, "MichaelScott");
ps2.setInt(3, 20);
assertEquals(1, ps2.executeUpdate());

ps1.close();
connection.commit();

try (ResultSet resultSet = bigQueryStatement.executeQuery(selectQuery)) {
int rowCount = 0;
while (resultSet.next()) {
rowCount++;
assertEquals(rowCount, resultSet.getInt(1));
}
assertEquals(2, rowCount);
}
} finally {
bigQueryStatement.execute(
String.format("DROP TABLE IF EXISTS %s.%s", DATASET, TRANSACTION_TABLE));
}
}
}

@Test
public void testClosingUnusedPreparedStatementDoesNotRollbackPreviousExecute()
throws SQLException {
String TRANSACTION_TABLE = "JDBC_PS_UNUSED_CLOSE_TABLE" + randomNumber;
String createTransactionTable =
String.format(
"CREATE OR REPLACE TABLE %s.%s (`id` INTEGER, `name` STRING, `age` INTEGER);",
DATASET, TRANSACTION_TABLE);
String insertQuery =
String.format(
"INSERT INTO %s.%s (id, name, age) VALUES (?, ?, ?);", DATASET, TRANSACTION_TABLE);
String selectQuery =
String.format("SELECT id, name, age FROM %s.%s ORDER BY id;", DATASET, TRANSACTION_TABLE);

bigQueryStatement.execute(createTransactionTable);

try (Connection connection = DriverManager.getConnection(session_enabled_connection_uri)) {
connection.setAutoCommit(false);
try (PreparedStatement ps1 = connection.prepareStatement(insertQuery);
PreparedStatement ps2 = connection.prepareStatement(insertQuery)) {

ps2.setInt(1, 1);
ps2.setString(2, "MichaelScott");
ps2.setInt(3, 20);
assertEquals(1, ps2.executeUpdate());

ps1.close();
connection.commit();

try (ResultSet resultSet = bigQueryStatement.executeQuery(selectQuery)) {
assertTrue(resultSet.next());
assertEquals(1, resultSet.getInt(1));
assertEquals("MichaelScott", resultSet.getString(2));
assertEquals(20, resultSet.getInt(3));
assertFalse(resultSet.next());
}
}
} finally {
bigQueryStatement.execute(
String.format("DROP TABLE IF EXISTS %s.%s", DATASET, TRANSACTION_TABLE));
}
}

// Private Helper functions
private String getSessionId() throws InterruptedException {
QueryJobConfiguration stubJobConfig =
Expand Down
Loading