Skip to content

Commit 13ff2db

Browse files
add autoclosable for asyncresultset
1 parent f72a36a commit 13ff2db

File tree

2 files changed

+21
-20
lines changed

2 files changed

+21
-20
lines changed

google-cloud-spanner/src/main/java/com/google/cloud/spanner/AsyncResultSetImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -489,8 +489,8 @@ public ApiFuture<Void> setCallback(Executor exec, ReadyCallback cb) {
489489
// Start to fetch data and buffer these.
490490
this.result = SettableApiFuture.create();
491491
this.state = State.STREAMING_INITIALIZED;
492-
initiateProduceRows();
493-
// this.service.execute(new InitiateStreamingRunnable());
492+
this.service.execute(new InitiateStreamingRunnable());
493+
// initiateProduceRows();
494494
this.executor = MoreExecutors.newSequentialExecutor(Preconditions.checkNotNull(exec));
495495
this.callback = Preconditions.checkNotNull(cb);
496496
pausedLatch.countDown();

google-cloud-spanner/src/test/java/com/google/cloud/spanner/RetryOnInvalidatedSessionTest.java

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1593,25 +1593,26 @@ private void asyncTransactionManager_readAsync(
15931593
AsyncTransactionStep<Void, Long> count =
15941594
context.then(
15951595
(transaction, ignored) -> {
1596-
AsyncResultSet rs = fn.apply(transaction);
1597-
ApiFuture<Void> fut =
1598-
rs.setCallback(
1599-
queryExecutor,
1600-
resultSet -> {
1601-
while (true) {
1602-
switch (resultSet.tryNext()) {
1603-
case OK:
1604-
counter.incrementAndGet();
1605-
break;
1606-
case DONE:
1607-
return CallbackResponse.DONE;
1608-
case NOT_READY:
1609-
return CallbackResponse.CONTINUE;
1596+
try(AsyncResultSet rs = fn.apply(transaction)) {
1597+
ApiFuture<Void> fut =
1598+
rs.setCallback(
1599+
queryExecutor,
1600+
resultSet -> {
1601+
while (true) {
1602+
switch (resultSet.tryNext()) {
1603+
case OK:
1604+
counter.incrementAndGet();
1605+
break;
1606+
case DONE:
1607+
return CallbackResponse.DONE;
1608+
case NOT_READY:
1609+
return CallbackResponse.CONTINUE;
1610+
}
16101611
}
1611-
}
1612-
});
1613-
return ApiFutures.transform(
1614-
fut, input -> counter.get(), MoreExecutors.directExecutor());
1612+
});
1613+
return ApiFutures.transform(
1614+
fut, input -> counter.get(), MoreExecutors.directExecutor());
1615+
}
16151616
},
16161617
executor);
16171618
CommitTimestampFuture ts = count.commitAsync();

0 commit comments

Comments
 (0)