Skip to content

fix(spanner-jdbc): report active transaction isolation level #14971

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

Open
Vcode2407 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(spanner-jdbc): report active transaction isolation level #14971

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
2 changes: 1 addition & 1 deletion java-spanner-jdbc/src/main/java/com/google/cloud/spanner/jdbc/AbstractJdbcConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ public void setTransactionIsolation(int level) throws SQLException {
@Override
public int getTransactionIsolation() throws SQLException {
checkClosed();
IsolationLevel isolationLevel = spanner.getDefaultIsolationLevel();
IsolationLevel isolationLevel = spanner.getTransactionIsolationLevel();
if (isolationLevel == IsolationLevel.ISOLATION_LEVEL_UNSPECIFIED) {
return JdbcDatabaseMetaData.getDatabaseDefaultTransactionIsolation(getDatabaseClient());
}
Expand Down
16 changes: 16 additions & 0 deletions java-spanner-jdbc/src/test/java/com/google/cloud/spanner/jdbc/TransactionMockServerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,22 @@ public void testUsesManualIsolationLevel() throws SQLException {
}
}

@Test
public void testReportsCurrentTransactionIsolationLevel() throws SQLException {
try (Connection connection = createJdbcConnection();
Statement statement = connection.createStatement()) {
connection.setAutoCommit(true);
connection.setTransactionIsolation(Connection.TRANSACTION_SERIALIZABLE);
assertEquals(Connection.TRANSACTION_SERIALIZABLE, connection.getTransactionIsolation());

statement.execute("begin transaction isolation level repeatable read");
assertEquals(Connection.TRANSACTION_REPEATABLE_READ, connection.getTransactionIsolation());

statement.execute("rollback");
assertEquals(Connection.TRANSACTION_SERIALIZABLE, connection.getTransactionIsolation());
}
}

@Test
public void testUsesDefaultIsolationLevelInConnectionString() throws SQLException {
for (IsolationLevel isolationLevel :
Expand Down
5 changes: 5 additions & 0 deletions ...er/google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/Connection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,11 @@ <T> T getConnectionPropertyValue(
/** Returns the default isolation level for read/write transactions for this connection. */
IsolationLevel getDefaultIsolationLevel();

/** Returns the isolation level of the current transaction, or the connection default. */
default IsolationLevel getTransactionIsolationLevel() {
return getDefaultIsolationLevel();
}

/** Sets the read lock mode for read/write transactions for this connection. */
void setReadLockMode(ReadLockMode readLockMode);

Expand Down
8 changes: 3 additions & 5 deletions ...oogle-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ConnectionImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -930,11 +930,9 @@ public void setTransactionMode(TransactionMode transactionMode) {
this.unitOfWorkType = UnitOfWorkType.of(transactionMode);
}

IsolationLevel getTransactionIsolationLevel() {
ConnectionPreconditions.checkState(!isClosed(), CLOSED_ERROR_MSG);
ConnectionPreconditions.checkState(!isDdlBatchActive(), "This connection is in a DDL batch");
ConnectionPreconditions.checkState(isInTransaction(), "This connection has no transaction");
return this.transactionIsolationLevel;
@Override
public IsolationLevel getTransactionIsolationLevel() {
return isInTransaction() ? transactionIsolationLevel : getDefaultIsolationLevel();
}
Comment on lines +934 to 936

@gemini-code-assist gemini-code-assist Bot Nov 11, 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.

medium

To maintain consistency with other methods in ConnectionImpl and ensure that operations on a closed connection fail fast, we should preserve the check that the connection is not closed.

Suggested change
public IsolationLevel getTransactionIsolationLevel() {
return isInTransaction() ? transactionIsolationLevel : getDefaultIsolationLevel();
}
public IsolationLevel getTransactionIsolationLevel() {
ConnectionPreconditions.checkState(!isClosed(), CLOSED_ERROR_MSG);
return isInTransaction() ? transactionIsolationLevel : getDefaultIsolationLevel();
}


void setTransactionIsolationLevel(IsolationLevel isolationLevel) {
Expand Down
Loading