17 files changed

+49
-111
lines changed
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616

1717
package com.google.cloud.spanner;
1818

19-
import com.google.api.core.ApiFuture;
20-
import com.google.protobuf.Empty;
21-
2219
/**
2320
* A {@code Session} can be used to perform transactions that read and/or modify data in a Cloud
2421
* Spanner database.
@@ -57,10 +54,4 @@ public interface Session extends DatabaseClient, AutoCloseable {
5754

5855
@Override
5956
void close();
60-
61-
/**
62-
* Closes the session asynchronously and returns the {@link ApiFuture} that can be used to monitor
63-
* the operation progress.
64-
*/
65-
ApiFuture<Empty> asyncClose();
6657
}
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import static com.google.cloud.spanner.SpannerExceptionFactory.newSpannerException;
2020
import static com.google.common.base.Preconditions.checkNotNull;
2121

22-
import com.google.api.core.ApiFuture;
2322
import com.google.cloud.Timestamp;
2423
import com.google.cloud.spanner.AbstractReadContext.MultiUseReadOnlyTransaction;
2524
import com.google.cloud.spanner.AbstractReadContext.SingleReadContext;
@@ -28,7 +27,6 @@
2827
import com.google.cloud.spanner.spi.v1.SpannerRpc;
2928
import com.google.common.collect.Lists;
3029
import com.google.protobuf.ByteString;
31-
import com.google.protobuf.Empty;
3230
import com.google.spanner.v1.BeginTransactionRequest;
3331
import com.google.spanner.v1.CommitRequest;
3432
import com.google.spanner.v1.CommitResponse;
@@ -198,11 +196,6 @@ public void prepareReadWriteTransaction() {
198196
readyTransactionId = beginTransaction();
199197
}
200198

201-
@Override
202-
public ApiFuture<Empty> asyncClose() {
203-
return spanner.getRpc().asyncDeleteSession(name, options);
204-
}
205-
206199
@Override
207200
public void close() {
208201
Span span = tracer.spanBuilder(SpannerImpl.DELETE_SESSION).startSpan();
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818

1919
import static com.google.cloud.spanner.SpannerExceptionFactory.newSpannerException;
2020

21-
import com.google.api.core.ApiFuture;
22-
import com.google.api.core.ApiFutures;
2321
import com.google.cloud.Timestamp;
2422
import com.google.cloud.grpc.GrpcTransportOptions;
2523
import com.google.cloud.grpc.GrpcTransportOptions.ExecutorFactory;
@@ -37,7 +35,6 @@
3735
import com.google.common.util.concurrent.MoreExecutors;
3836
import com.google.common.util.concurrent.SettableFuture;
3937
import com.google.common.util.concurrent.Uninterruptibles;
40-
import com.google.protobuf.Empty;
4138
import io.opencensus.common.Scope;
4239
import io.opencensus.trace.Annotation;
4340
import io.opencensus.trace.AttributeValue;
@@ -770,12 +767,6 @@ public TransactionRunner readWriteTransaction() {
770767
return new SessionPoolTransactionRunner(SessionPool.this, this);
771768
}
772769

773-
@Override
774-
public ApiFuture<Empty> asyncClose() {
775-
close();
776-
return ApiFutures.immediateFuture(Empty.getDefaultInstance());
777-
}
778-
779770
@Override
780771
public void close() {
781772
synchronized (lock) {
@@ -1008,7 +999,7 @@ private void closeIdleSessions(Instant currTime) {
1008999
}
10091000
for (PooledSession sess : sessionsToClose) {
10101001
logger.log(Level.FINE, "Closing session {0}", sess.getName());
1011-
closeSessionAsync(sess);
1002+
closeSession(sess);
10121003
}
10131004
}
10141005

@@ -1621,27 +1612,37 @@ int totalSessions() {
16211612
}
16221613
}
16231614

1624-
private ApiFuture<Empty> closeSessionAsync(final PooledSession sess) {
1625-
ApiFuture<Empty> res = sess.delegate.asyncClose();
1626-
res.addListener(
1615+
private void closeSessionAsync(final PooledSession sess) {
1616+
executor.submit(
16271617
new Runnable() {
16281618
@Override
16291619
public void run() {
1630-
synchronized (lock) {
1631-
allSessions.remove(sess);
1632-
if (isClosed()) {
1633-
decrementPendingClosures(1);
1634-
return;
1635-
}
1636-
// Create a new session if needed to unblock some waiter.
1637-
if (numWaiters() > numSessionsBeingCreated) {
1638-
createSessions(getAllowedCreateSessions(numWaiters() - numSessionsBeingCreated));
1639-
}
1640-
}
1620+
closeSession(sess);
16411621
}
1642-
},
1643-
executor);
1644-
return res;
1622+
});
1623+
}
1624+
1625+
private void closeSession(PooledSession sess) {
1626+
try {
1627+
sess.delegate.close();
1628+
} catch (SpannerException e) {
1629+
// Backend will delete these sessions after a while even if we fail to close them.
1630+
if (logger.isLoggable(Level.FINE)) {
1631+
logger.log(Level.FINE, "Failed to close session: " + sess.getName(), e);
1632+
}
1633+
} finally {
1634+
synchronized (lock) {
1635+
allSessions.remove(sess);
1636+
if (isClosed()) {
1637+
decrementPendingClosures(1);
1638+
return;
1639+
}
1640+
// Create a new session if needed to unblock some waiter.
1641+
if (numWaiters() > numSessionsBeingCreated) {
1642+
createSessions(getAllowedCreateSessions(numWaiters() - numSessionsBeingCreated));
1643+
}
1644+
}
1645+
}
16451646
}
16461647

16471648
private void prepareSession(final PooledSession sess) {
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
import static com.google.cloud.spanner.SpannerExceptionFactory.newSpannerException;
2020

21-
import com.google.api.core.ApiFuture;
2221
import com.google.api.core.NanoClock;
2322
import com.google.api.gax.core.CredentialsProvider;
2423
import com.google.api.gax.core.ExecutorProvider;
@@ -524,14 +523,9 @@ public Session createSession(
524523
@Override
525524
public void deleteSession(String sessionName, @Nullable Map<Option, ?> options)
526525
throws SpannerException {
527-
get(asyncDeleteSession(sessionName, options));
528-
}
529-
530-
@Override
531-
public ApiFuture<Empty> asyncDeleteSession(String sessionName, @Nullable Map<Option, ?> options) {
532526
DeleteSessionRequest request = DeleteSessionRequest.newBuilder().setName(sessionName).build();
533527
GrpcCallContext context = newCallContext(options, sessionName);
534-
return spannerStub.deleteSessionCallable().futureCall(request, context);
528+
get(spannerStub.deleteSessionCallable().futureCall(request, context));
535529
}
536530

537531
@Override
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package com.google.cloud.spanner.spi.v1;
1818

19-
import com.google.api.core.ApiFuture;
2019
import com.google.api.gax.longrunning.OperationFuture;
2120
import com.google.cloud.ServiceRpc;
2221
import com.google.cloud.spanner.SpannerException;
@@ -220,9 +219,6 @@ Session createSession(
220219

221220
void deleteSession(String sessionName, @Nullable Map<Option, ?> options) throws SpannerException;
222221

223-
ApiFuture<Empty> asyncDeleteSession(String sessionName, @Nullable Map<Option, ?> options)
224-
throws SpannerException;
225-
226222
Call read(
227223
ReadRequest request, ResultStreamConsumer consumer, @Nullable Map<Option, ?> options);
228224

Original file line numberDiff line numberDiff line change
@@ -23,10 +23,8 @@
2323
import static org.mockito.Mockito.spy;
2424
import static org.mockito.Mockito.when;
2525

26-
import com.google.api.core.ApiFutures;
2726
import com.google.cloud.grpc.GrpcTransportOptions.ExecutorFactory;
2827
import com.google.cloud.spanner.SessionPool.Clock;
29-
import com.google.protobuf.Empty;
3028
import java.util.concurrent.ScheduledExecutorService;
3129
import java.util.concurrent.ScheduledFuture;
3230
import java.util.concurrent.ScheduledThreadPoolExecutor;
@@ -63,7 +61,6 @@ SessionImpl mockSession() {
6361
when(session.getName())
6462
.thenReturn(
6563
"projects/dummy/instances/dummy/database/dummy/sessions/session" + sessionIndex);
66-
when(session.asyncClose()).thenReturn(ApiFutures.immediateFuture(Empty.getDefaultInstance()));
6764
sessionIndex++;
6865
return session;
6966
}
Original file line numberDiff line numberDiff line change
@@ -216,9 +216,8 @@ public static void startStaticServer() throws IOException {
216216
}
217217

218218
@AfterClass
219-
public static void stopServer() throws InterruptedException {
219+
public static void stopServer() {
220220
server.shutdown();
221-
server.awaitTermination();
222221
}
223222

224223
@Before
Original file line numberDiff line numberDiff line change
@@ -219,9 +219,8 @@ public static void startStaticServer() throws IOException {
219219
}
220220

221221
@AfterClass
222-
public static void stopServer() throws InterruptedException {
222+
public static void stopServer() {
223223
server.shutdown();
224-
server.awaitTermination();
225224
}
226225

227226
@Before
Original file line numberDiff line numberDiff line change
@@ -172,10 +172,9 @@ public static void startStaticServer() throws IOException {
172172
}
173173

174174
@AfterClass
175-
public static void stopServer() throws InterruptedException {
175+
public static void stopServer() {
176176
spannerClient.close();
177177
server.shutdown();
178-
server.awaitTermination();
179178
}
180179

181180
@Before
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import io.grpc.StatusRuntimeException;
3030
import io.grpc.inprocess.InProcessServerBuilder;
3131
import java.io.IOException;
32-
import java.util.concurrent.ScheduledThreadPoolExecutor;
3332
import org.junit.After;
3433
import org.junit.AfterClass;
3534
import org.junit.Before;
@@ -56,19 +55,13 @@ public static void startStaticServer() throws IOException {
5655
mockSpanner = new MockSpannerServiceImpl();
5756
mockSpanner.setAbortProbability(0.0D); // We don't want any unpredictable aborted transactions.
5857
String uniqueName = InProcessServerBuilder.generateName();
59-
server =
60-
InProcessServerBuilder.forName(uniqueName)
61-
.scheduledExecutorService(new ScheduledThreadPoolExecutor(1))
62-
.addService(mockSpanner)
63-
.build()
64-
.start();
58+
server = InProcessServerBuilder.forName(uniqueName).addService(mockSpanner).build().start();
6559
channelProvider = LocalChannelProvider.create(uniqueName);
6660
}
6761

6862
@AfterClass
69-
public static void stopServer() throws InterruptedException {
63+
public static void stopServer() {
7064
server.shutdown();
71-
server.awaitTermination();
7265
}
7366

7467
@Before
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,9 @@
2222
import static org.mockito.Mockito.mock;
2323
import static org.mockito.Mockito.when;
2424

25-
import com.google.api.core.ApiFuture;
26-
import com.google.api.core.ApiFutures;
2725
import com.google.cloud.spanner.SessionClient.SessionConsumer;
2826
import com.google.cloud.spanner.SessionPool.SessionConsumerImpl;
2927
import com.google.common.util.concurrent.Uninterruptibles;
30-
import com.google.protobuf.Empty;
3128
import java.util.ArrayList;
3229
import java.util.Collection;
3330
import java.util.HashMap;
@@ -155,15 +152,14 @@ public ResultSet answer(InvocationOnMock invocation) throws Throwable {
155152
});
156153
when(mockResult.next()).thenReturn(true);
157154
doAnswer(
158-
new Answer<ApiFuture<Empty>>() {
155+
new Answer<Void>() {
159156

160157
@Override
161-
public ApiFuture<Empty> answer(InvocationOnMock invocation) throws Throwable {
158+
public Void answer(InvocationOnMock invocation) throws Throwable {
162159
synchronized (lock) {
163160
if (expiredSessions.contains(session.getName())) {
164-
return ApiFutures.immediateFailedFuture(
165-
SpannerExceptionFactory.newSpannerException(
166-
ErrorCode.NOT_FOUND, "Session not found"));
161+
throw SpannerExceptionFactory.newSpannerException(
162+
ErrorCode.NOT_FOUND, "Session not found");
167163
}
168164
if (sessions.remove(session.getName()) == null) {
169165
setFailed(closedSessions.get(session.getName()));
@@ -173,11 +169,11 @@ public ApiFuture<Empty> answer(InvocationOnMock invocation) throws Throwable {
173169
minSessionsWhenSessionClosed = sessions.size();
174170
}
175171
}
176-
return ApiFutures.immediateFuture(Empty.getDefaultInstance());
172+
return null;
177173
}
178174
})
179175
.when(session)
180-
.asyncClose();
176+
.close();
181177

182178
doAnswer(
183179
new Answer<Void>() {
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@
3232
import static org.mockito.Mockito.when;
3333
import static org.mockito.MockitoAnnotations.initMocks;
3434

35-
import com.google.api.core.ApiFuture;
36-
import com.google.api.core.ApiFutures;
3735
import com.google.cloud.Timestamp;
3836
import com.google.cloud.spanner.ReadContext.QueryAnalyzeMode;
3937
import com.google.cloud.spanner.SessionClient.SessionConsumer;
@@ -47,7 +45,6 @@
4745
import com.google.common.util.concurrent.ListenableFuture;
4846
import com.google.common.util.concurrent.Uninterruptibles;
4947
import com.google.protobuf.ByteString;
50-
import com.google.protobuf.Empty;
5148
import com.google.spanner.v1.CommitRequest;
5249
import com.google.spanner.v1.ExecuteBatchDmlRequest;
5350
import com.google.spanner.v1.ExecuteSqlRequest;
@@ -220,8 +217,8 @@ public void run() {
220217
Session.clearException();
221218
session1.close();
222219
pool.closeAsync().get(5L, TimeUnit.SECONDS);
223-
verify(mockSession1).asyncClose();
224-
verify(mockSession2).asyncClose();
220+
verify(mockSession1).close();
221+
verify(mockSession2).close();
225222
}
226223

227224
@Test
@@ -877,16 +874,16 @@ public void run() {
877874
.asyncBatchCreateSessions(Mockito.eq(1), any(SessionConsumer.class));
878875
for (Session session : new Session[] {session1, session2, session3}) {
879876
doAnswer(
880-
new Answer<ApiFuture<Empty>>() {
877+
new Answer<Void>() {
881878

882879
@Override
883-
public ApiFuture<Empty> answer(InvocationOnMock invocation) throws Throwable {
880+
public Void answer(InvocationOnMock invocation) throws Throwable {
884881
numSessionClosed.incrementAndGet();
885-
return ApiFutures.immediateFuture(Empty.getDefaultInstance());
882+
return null;
886883
}
887884
})
888885
.when(session)
889-
.asyncClose();
886+
.close();
890887
}
891888
FakeClock clock = new FakeClock();
892889
clock.currentTimeMillis = System.currentTimeMillis();
@@ -1164,8 +1161,6 @@ public void testSessionNotFoundReadWriteTransaction() {
11641161
SpannerRpc.Call closedCall = mock(SpannerRpc.Call.class);
11651162
doThrow(sessionNotFound).when(closedCall).request(Mockito.anyInt());
11661163
SpannerRpc rpc = mock(SpannerRpc.class);
1167-
when(rpc.asyncDeleteSession(Mockito.anyString(), Mockito.anyMap()))
1168-
.thenReturn(ApiFutures.immediateFuture(Empty.getDefaultInstance()));
11691164
when(rpc.executeQuery(
11701165
any(ExecuteSqlRequest.class), any(ResultStreamConsumer.class), any(Map.class)))
11711166
.thenReturn(closedCall);
@@ -1182,17 +1177,13 @@ public void testSessionNotFoundReadWriteTransaction() {
11821177
hasPreparedTransaction ? ByteString.copyFromUtf8("test-txn") : null;
11831178
final TransactionContextImpl closedTransactionContext =
11841179
new TransactionContextImpl(closedSession, preparedTransactionId, rpc, 10);
1185-
when(closedSession.asyncClose())
1186-
.thenReturn(ApiFutures.immediateFuture(Empty.getDefaultInstance()));
11871180
when(closedSession.newTransaction()).thenReturn(closedTransactionContext);
11881181
when(closedSession.beginTransaction()).thenThrow(sessionNotFound);
11891182
TransactionRunnerImpl closedTransactionRunner =
11901183
new TransactionRunnerImpl(closedSession, rpc, 10);
11911184
when(closedSession.readWriteTransaction()).thenReturn(closedTransactionRunner);
11921185

11931186
final SessionImpl openSession = mock(SessionImpl.class);
1194-
when(openSession.asyncClose())
1195-
.thenReturn(ApiFutures.immediateFuture(Empty.getDefaultInstance()));
11961187
when(openSession.getName())
11971188
.thenReturn("projects/dummy/instances/dummy/database/dummy/sessions/session-open");
11981189
final TransactionContextImpl openTransactionContext = mock(TransactionContextImpl.class);

0 commit comments

Comments
 (0)