Skip to content

fix: skip session delete in case of multiplexed sessions #4029

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
Aug 29, 2025
Merged

fix: skip session delete in case of multiplexed sessions #4029

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
6 changes: 6 additions & 0 deletions google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,12 +468,18 @@ public AsyncTransactionManagerImpl transactionManagerAsync(TransactionOption...

@Override
public ApiFuture<Empty> asyncClose() {
if (getIsMultiplexed()) {
return com.google.api.core.ApiFutures.immediateFuture(Empty.getDefaultInstance());
}
XGoogSpannerRequestId reqId = this.getRequestIdCreator().nextRequestId(this.getChannel(), 1);
return spanner.getRpc().asyncDeleteSession(getName(), reqId.withOptions(getOptions()));
}

@Override
public void close() {
if (getIsMultiplexed()) {
return;
}
ISpan span = tracer.spanBuilder(SpannerImpl.DELETE_SESSION);
try (IScope s = tracer.withSpan(span)) {
XGoogSpannerRequestId reqId = this.getRequestIdCreator().nextRequestId(this.getChannel(), 1);
Expand Down
52 changes: 40 additions & 12 deletions google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3601,9 +3601,16 @@ public void testBackendPartitionQueryOptions() {
// statistics package and directed read options.
List<AbstractMessage> requests = mockSpanner.getRequests();
assert requests.size() >= 2 : "required to have at least 2 requests";
assertThat(requests.get(requests.size() - 1)).isInstanceOf(DeleteSessionRequest.class);
assertThat(requests.get(requests.size() - 2)).isInstanceOf(ExecuteSqlRequest.class);
ExecuteSqlRequest executeSqlRequest = (ExecuteSqlRequest) requests.get(requests.size() - 2);
if (isMultiplexedSessionsEnabled()) {
assertThat(requests.get(requests.size() - 1)).isInstanceOf(ExecuteSqlRequest.class);
} else {
assertThat(requests.get(requests.size() - 1)).isInstanceOf(DeleteSessionRequest.class);
assertThat(requests.get(requests.size() - 2)).isInstanceOf(ExecuteSqlRequest.class);
}
ExecuteSqlRequest executeSqlRequest =
(ExecuteSqlRequest)
requests.get(
isMultiplexedSessionsEnabled() ? requests.size() - 1 : requests.size() - 2);
assertThat(executeSqlRequest.getQueryOptions()).isNotNull();
assertThat(executeSqlRequest.getQueryOptions().getOptimizerVersion()).isEqualTo("1");
assertThat(executeSqlRequest.getQueryOptions().getOptimizerStatisticsPackage())
Expand Down Expand Up @@ -3651,9 +3658,16 @@ public void testBackendPartitionQueryOptions() {
// statistics package and directed read options.
List<AbstractMessage> requests = mockSpanner.getRequests();
assert requests.size() >= 2 : "required to have at least 2 requests";
assertThat(requests.get(requests.size() - 1)).isInstanceOf(DeleteSessionRequest.class);
assertThat(requests.get(requests.size() - 2)).isInstanceOf(ExecuteSqlRequest.class);
ExecuteSqlRequest executeSqlRequest = (ExecuteSqlRequest) requests.get(requests.size() - 2);
if (isMultiplexedSessionsEnabled()) {
assertThat(requests.get(requests.size() - 1)).isInstanceOf(ExecuteSqlRequest.class);
} else {
assertThat(requests.get(requests.size() - 1)).isInstanceOf(DeleteSessionRequest.class);
assertThat(requests.get(requests.size() - 2)).isInstanceOf(ExecuteSqlRequest.class);
}
ExecuteSqlRequest executeSqlRequest =
(ExecuteSqlRequest)
requests.get(
isMultiplexedSessionsEnabled() ? requests.size() - 1 : requests.size() - 2);
assertThat(executeSqlRequest.getQueryOptions()).isNotNull();
assertThat(executeSqlRequest.getQueryOptions().getOptimizerVersion()).isEqualTo("1");
assertThat(executeSqlRequest.getQueryOptions().getOptimizerStatisticsPackage())
Expand Down Expand Up @@ -3697,9 +3711,16 @@ public void testBackendPartitionReadOptions() {
// statistics package and directed read options.
List<AbstractMessage> requests = mockSpanner.getRequests();
assert requests.size() >= 2 : "required to have at least 2 requests";
assertThat(requests.get(requests.size() - 1)).isInstanceOf(DeleteSessionRequest.class);
assertThat(requests.get(requests.size() - 2)).isInstanceOf(ReadRequest.class);
ReadRequest readRequest = (ReadRequest) requests.get(requests.size() - 2);
if (isMultiplexedSessionsEnabled()) {
assertThat(requests.get(requests.size() - 1)).isInstanceOf(ReadRequest.class);
} else {
assertThat(requests.get(requests.size() - 1)).isInstanceOf(DeleteSessionRequest.class);
assertThat(requests.get(requests.size() - 2)).isInstanceOf(ReadRequest.class);
}
ReadRequest readRequest =
(ReadRequest)
requests.get(
isMultiplexedSessionsEnabled() ? requests.size() - 1 : requests.size() - 2);
assertThat(readRequest.getDirectedReadOptions()).isEqualTo(DIRECTED_READ_OPTIONS1);
}
}
Expand Down Expand Up @@ -3740,9 +3761,16 @@ public void testBackendPartitionReadOptions() {
// statistics package and directed read options.
List<AbstractMessage> requests = mockSpanner.getRequests();
assert requests.size() >= 2 : "required to have at least 2 requests";
assertThat(requests.get(requests.size() - 1)).isInstanceOf(DeleteSessionRequest.class);
assertThat(requests.get(requests.size() - 2)).isInstanceOf(ReadRequest.class);
ReadRequest readRequest = (ReadRequest) requests.get(requests.size() - 2);
if (isMultiplexedSessionsEnabled()) {
assertThat(requests.get(requests.size() - 1)).isInstanceOf(ReadRequest.class);
} else {
assertThat(requests.get(requests.size() - 1)).isInstanceOf(DeleteSessionRequest.class);
assertThat(requests.get(requests.size() - 2)).isInstanceOf(ReadRequest.class);
}
ReadRequest readRequest =
(ReadRequest)
requests.get(
isMultiplexedSessionsEnabled() ? requests.size() - 1 : requests.size() - 2);
assertThat(readRequest.getDirectedReadOptions()).isEqualTo(DIRECTED_READ_OPTIONS2);
}
}
Expand Down
Loading