Skip to content

Regenerate spanner client #4076

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

Closed
yoshi-automation wants to merge 1 commit into from
Closed

Regenerate spanner client #4076

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
4 changes: 3 additions & 1 deletion .../main/java/com/google/cloud/spanner/admin/database/v1/stub/DatabaseAdminStubSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,9 @@ public String extractNextToken(ListDatabasesResponse payload) {

@Override
public Iterable<Database> extractResources(ListDatabasesResponse payload) {
return payload.getDatabasesList();
return payload.getDatabasesList() != null
? payload.getDatabasesList()
: ImmutableList.<Database>of();
}
};

Expand Down
8 changes: 6 additions & 2 deletions .../main/java/com/google/cloud/spanner/admin/instance/v1/stub/InstanceAdminStubSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,9 @@ public String extractNextToken(ListInstanceConfigsResponse payload) {

@Override
public Iterable<InstanceConfig> extractResources(ListInstanceConfigsResponse payload) {
return payload.getInstanceConfigsList();
return payload.getInstanceConfigsList() != null
? payload.getInstanceConfigsList()
: ImmutableList.<InstanceConfig>of();
}
};

Expand Down Expand Up @@ -348,7 +350,9 @@ public String extractNextToken(ListInstancesResponse payload) {

@Override
public Iterable<Instance> extractResources(ListInstancesResponse payload) {
return payload.getInstancesList();
return payload.getInstancesList() != null
? payload.getInstancesList()
: ImmutableList.<Instance>of();
}
};

Expand Down
19 changes: 16 additions & 3 deletions ...gle-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/stub/SpannerStubSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,9 @@ public String extractNextToken(ListSessionsResponse payload) {

@Override
public Iterable<Session> extractResources(ListSessionsResponse payload) {
return payload.getSessionsList();
return payload.getSessionsList() != null
? payload.getSessionsList()
: ImmutableList.<Session>of();
}
};

Expand Down Expand Up @@ -380,6 +382,17 @@ public static class Builder extends StubSettings.Builder<SpannerStubSettings, Bu
.setTotalTimeout(Duration.ofMillis(600000L))
.build();
definitions.put("default", settings);
settings =
RetrySettings.newBuilder()
.setInitialRetryDelay(Duration.ofMillis(1000L))
.setRetryDelayMultiplier(1.3)
.setMaxRetryDelay(Duration.ofMillis(32000L))
.setInitialRpcTimeout(Duration.ofMillis(120000L))
.setRpcTimeoutMultiplier(1.0)
.setMaxRpcTimeout(Duration.ofMillis(120000L))
.setTotalTimeout(Duration.ofMillis(1200000L))
.build();
definitions.put("streaming", settings);
settings =
RetrySettings.newBuilder()
.setInitialRetryDelay(Duration.ofMillis(1000L))
Expand Down Expand Up @@ -483,7 +496,7 @@ private static Builder initDefaults(Builder builder) {
builder
.executeStreamingSqlSettings()
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("streaming"));

builder
.readSettings()
Expand All @@ -493,7 +506,7 @@ private static Builder initDefaults(Builder builder) {
builder
.streamingReadSettings()
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("streaming"));

builder
.beginTransactionSettings()
Expand Down