Skip to content

Commit 0b440ed

Browse files
authored
---
yaml --- r: 33997 b: refs/heads/autosynth-spanner c: 8d7b28f h: refs/heads/master i: 33995: b793c99
1 parent c1edc0c commit 0b440ed

6 files changed

Lines changed: 1789 additions & 10 deletions

File tree

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ refs/heads/autosynth-language: 6130869312f99a1e7d3aa0485759172a23333cc5
137137
refs/heads/autosynth-os-login: 49028d40ac477fca5f948cc5a3ce7422729fdb67
138138
refs/heads/autosynth-redis: 2b698ebe7faaa0b93246576a88941682e0888e57
139139
refs/heads/autosynth-scheduler: a3de6480746d1cd586ca8b9d75c55a636f371539
140-
refs/heads/autosynth-spanner: de02ca32edea133b68b51052e325359a3704b5d2
140+
refs/heads/autosynth-spanner: 8d7b28f4ba1a80d67f511f11df9731d9a85e7cb7
141141
refs/heads/autosynth-speech: 64692f6db11364f663921be02c08072b966b6e7b
142142
refs/heads/autosynth-tasks: eb03eeab747e925175890db923945384d89b273a
143143
refs/heads/autosynth-texttospeech: 2c442fe0b7f089fbab266edfe4dd83c532e82dd0

branches/autosynth-spanner/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import com.google.api.core.NanoClock;
2323
import com.google.api.gax.core.CredentialsProvider;
2424
import com.google.api.gax.core.GaxProperties;
25-
import com.google.api.gax.core.InstantiatingExecutorProvider;
2625
import com.google.api.gax.grpc.GaxGrpcProperties;
2726
import com.google.api.gax.grpc.GrpcCallContext;
2827
import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
@@ -115,7 +114,6 @@
115114

116115
/** Implementation of Cloud Spanner remote calls using Gapic libraries. */
117116
public class GapicSpannerRpc implements SpannerRpc {
118-
119117
private static final PathTemplate PROJECT_NAME_TEMPLATE =
120118
PathTemplate.create("projects/{project}");
121119
private static final PathTemplate OPERATION_NAME_TEMPLATE =
@@ -190,7 +188,6 @@ public GapicSpannerRpc(SpannerOptions options) {
190188
options.getInterceptorProvider(),
191189
SpannerInterceptorProvider.createDefault()))
192190
.setHeaderProvider(mergedHeaderProvider)
193-
.setExecutorProvider(InstantiatingExecutorProvider.newBuilder().build())
194191
.build());
195192

196193
CredentialsProvider credentialsProvider =
@@ -582,6 +579,7 @@ private GrpcCallContext newCallContext(@Nullable Map<Option, ?> options, String
582579
return context.withStreamWaitTimeout(waitTimeout).withStreamIdleTimeout(idleTimeout);
583580
}
584581

582+
@Override
585583
public void shutdown() {
586584
this.spannerStub.close();
587585
this.instanceAdminStub.close();

branches/autosynth-spanner/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/stub/SpannerStubSettings.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,9 @@ public static class Builder extends StubSettings.Builder<SpannerStubSettings, Bu
368368
ImmutableMap.builder();
369369
definitions.put(
370370
"idempotent",
371-
ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList(StatusCode.Code.UNAVAILABLE)));
371+
ImmutableSet.copyOf(
372+
Lists.<StatusCode.Code>newArrayList(
373+
StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE)));
372374
definitions.put("non_idempotent", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
373375
definitions.put(
374376
"long_running",

0 commit comments

Comments
 (0)