Skip to content
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

Jump to bottom

fix: Noop in case there is no change in autocommit value for setAutocommit() method #2662

Merged
merged 5 commits into from Oct 10, 2023
Merged

fix: Noop in case there is no change in autocommit value for setAutocommit() method #2662

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ed5d6dc
Fix: Noop in case there is no change in autocommit value for setAutoc…
ankiaga Oct 9, 2023
e95a142
Resolved comments and Added tests
ankiaga Oct 9, 2023
41915e0
Resolved comments
ankiaga Oct 9, 2023
ee83c79
Fix formatting errors
ankiaga Oct 10, 2023
f161539
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Oct 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ConnectionImpl.java
View file
Open in desktop
Expand Up @@ -402,6 +402,9 @@ public boolean isClosed() {
@Override
public void setAutocommit(boolean autocommit) {
ConnectionPreconditions.checkState(!isClosed(), CLOSED_ERROR_MSG);
if (isAutocommit() == autocommit) {
olavloite marked this conversation as resolved.
Show resolved Hide resolved
return;
}
ConnectionPreconditions.checkState(!isBatchActive(), "Cannot set autocommit while in a batch");
ConnectionPreconditions.checkState(
!isTransactionStarted(), "Cannot set autocommit while a transaction is active");
Expand Down
134 changes: 134 additions & 0 deletions ...e-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/ConnectionImplTest.java
View file
Open in desktop
Expand Up @@ -412,6 +412,140 @@ public void testExecuteSetAutocommitOff() {
}
}

@Test
public void testSetAutocommitToTrue_inAutoCommitAndNotInTransaction_noop() {
try (ConnectionImpl subject =
createConnection(
ConnectionOptions.newBuilder()
.setCredentials(NoCredentials.getInstance())
.setUri(URI)
.build())) {
assertThat(subject.isAutocommit(), is(true));
olavloite marked this conversation as resolved.
Show resolved Hide resolved

subject.setAutocommit(true);

assertThat(subject.isAutocommit(), is(true));
}
}

@Test
public void testSetAutocommitToTrue_inAutoCommitAndInTransaction_noop() {
try (ConnectionImpl subject =
createConnection(
ConnectionOptions.newBuilder()
.setCredentials(NoCredentials.getInstance())
.setUri(URI)
.build())) {
assertThat(subject.isAutocommit(), is(true));
ankiaga marked this conversation as resolved.
Show resolved Hide resolved
subject.execute(Statement.of("begin transaction"));

subject.setAutocommit(true);

assertThat(subject.isAutocommit(), is(true));
}
}

@Test
public void testSetAutocommitToFalse_inAutoCommitAndNotInTransaction_autocommitModeChanged() {
try (ConnectionImpl subject =
createConnection(
ConnectionOptions.newBuilder()
.setCredentials(NoCredentials.getInstance())
.setUri(URI)
.build())) {
assertThat(subject.isAutocommit(), is(true));

subject.setAutocommit(false);

assertThat(subject.isAutocommit(), is(false));
}
}

@Test
public void testSetAutocommitToFalse_inAutoCommitAndInTransaction_throwsException() {
try (ConnectionImpl subject =
createConnection(
ConnectionOptions.newBuilder()
.setCredentials(NoCredentials.getInstance())
.setUri(URI)
.build())) {
assertThat(subject.isAutocommit(), is(true));
subject.execute(Statement.of("begin transaction"));

subject.setAutocommit(false);
fail("Cannot set autocommit while in a temporary transaction");
Copy link
Collaborator

Choose a reason for hiding this comment

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

nit: use assertThrows(..) for this.

I know that there are examples in this test class that use this setup with a try-fail block. Those are however left-overs from when this library had to support Java 7, and we did not have support for lambda expressions.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

} catch (SpannerException e) {
assertThat(e.getErrorCode(), is(equalTo(ErrorCode.FAILED_PRECONDITION)));
}
}

@Test
public void testSetAutocommitToFalse_notInAutoCommitAndTransactionNotStarted_noop() {
try (ConnectionImpl subject =
createConnection(
ConnectionOptions.newBuilder()
.setCredentials(NoCredentials.getInstance())
.setUri(URI + ";autocommit=false")
.build())) {
assertThat(subject.isAutocommit(), is(false));

subject.setAutocommit(false);

assertThat(subject.isAutocommit(), is(false));
}
}

@Test
public void testSetAutocommitToFalse_notInAutoCommitAndTransactionStarted_noop() {
try (ConnectionImpl subject =
createConnection(
ConnectionOptions.newBuilder()
.setCredentials(NoCredentials.getInstance())
.setUri(URI + ";autocommit=false")
.build())) {
assertThat(subject.isAutocommit(), is(false));
subject.executeQuery(Statement.of(SELECT));

subject.setAutocommit(false);

assertThat(subject.isAutocommit(), is(false));
}
}

@Test
public void testSetAutocommitToTrue_notInAutoCommitAndTransactionNotStarted_autocommitModeChanged() {
try (ConnectionImpl subject =
createConnection(
ConnectionOptions.newBuilder()
.setCredentials(NoCredentials.getInstance())
.setUri(URI + ";autocommit=false")
.build())) {
assertThat(subject.isAutocommit(), is(false));

subject.setAutocommit(true);

assertThat(subject.isAutocommit(), is(true));
}
}

@Test
public void testSetAutocommitToTrue_notInAutoCommitAndTransactionStarted_throwsException() {
try (ConnectionImpl subject =
createConnection(
ConnectionOptions.newBuilder()
.setCredentials(NoCredentials.getInstance())
.setUri(URI + ";autocommit=false")
.build())) {
assertThat(subject.isAutocommit(), is(false));
subject.executeQuery(Statement.of(SELECT));

subject.setAutocommit(true);
fail("Cannot set autocommit while in a temporary transaction");
} catch (SpannerException e) {
assertThat(e.getErrorCode(), is(equalTo(ErrorCode.FAILED_PRECONDITION)));
}
}

@Test
public void testExecuteGetAutocommit() {
try (ConnectionImpl subject =
Expand Down