Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Remove some custom settings in BQ storage client. #6519

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
shollyman merged 2 commits into from
Oct 21, 2019
Merged

Remove some custom settings in BQ storage client. #6519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f16ca0
Remove some custom settings in BQ storage client.
kmjung Oct 16, 2019
49dbd32
Run mvn com.coveo:fmt-maven-plugin:format
kmjung Oct 21, 2019
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
25 changes: 2 additions & 23 deletions ...a/com/google/cloud/bigquery/storage/v1beta1/stub/EnhancedBigQueryStorageStubSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import com.google.api.gax.core.GoogleCredentialsProvider;
import com.google.api.gax.core.InstantiatingExecutorProvider;
import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
import com.google.api.gax.retrying.RetrySettings;
import com.google.api.gax.rpc.ApiClientHeaderProvider;
import com.google.api.gax.rpc.ClientContext;
import com.google.api.gax.rpc.ServerStreamingCallSettings;
Expand All @@ -40,7 +39,6 @@
import com.google.common.collect.ImmutableList;
import com.google.protobuf.Empty;
import java.util.List;
import org.threeten.bp.Duration;

/**
* Settings class to configure an instance of {@link EnhancedBigQueryStorageStub}.
Expand All @@ -65,9 +63,6 @@
public class EnhancedBigQueryStorageStubSettings
extends StubSettings<EnhancedBigQueryStorageStubSettings> {

// The largest possible inbound message is a ReadRowsResponse with a single 10mb Row object.
private static final int MAX_INBOUND_MESSAGE_SIZE = 1024 * 1024 * 11;

private final UnaryCallSettings<CreateReadSessionRequest, ReadSession> createReadSessionSettings;
private final ServerStreamingCallSettings<ReadRowsRequest, ReadRowsResponse> readRowsSettings;
private final UnaryCallSettings<
Expand Down Expand Up @@ -127,9 +122,7 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde

/** Returns a builder for the default ChannelProvider for this service. */
public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
return BigQueryStorageStubSettings.defaultGrpcTransportProviderBuilder()
.setChannelsPerCpu(2.0)
.setMaxInboundMessageSize(MAX_INBOUND_MESSAGE_SIZE);
return BigQueryStorageStubSettings.defaultGrpcTransportProviderBuilder();
}

public static TransportChannelProvider defaultTransportChannelProvider() {
Expand Down Expand Up @@ -171,17 +164,6 @@ protected EnhancedBigQueryStorageStubSettings(Builder settingsBuilder) {
public static class Builder
extends StubSettings.Builder<EnhancedBigQueryStorageStubSettings, Builder> {

private static final RetrySettings READ_ROWS_RETRY_SETTINGS =
RetrySettings.newBuilder()
.setInitialRetryDelay(Duration.ofMillis(100L))
.setRetryDelayMultiplier(1.3)
.setMaxRetryDelay(Duration.ofMinutes(1L))
.setInitialRpcTimeout(Duration.ofDays(1L))
.setRpcTimeoutMultiplier(1.0)
.setMaxRpcTimeout(Duration.ofDays(1L))
.setTotalTimeout(Duration.ofDays(1L))
.build();

private final ImmutableList<UnaryCallSettings.Builder<?, ?>> unaryMethodSettingsBuilders;

private final UnaryCallSettings.Builder<CreateReadSessionRequest, ReadSession>
Expand Down Expand Up @@ -218,10 +200,7 @@ protected Builder(ClientContext clientContext) {

// Per-method settings using override values for defaults.
readRowsSettings =
baseDefaults
.readRowsSettings()
.setRetrySettings(READ_ROWS_RETRY_SETTINGS)
.setResumptionStrategy(new ReadRowsResumptionStrategy());
baseDefaults.readRowsSettings().setResumptionStrategy(new ReadRowsResumptionStrategy());

unaryMethodSettingsBuilders =
ImmutableList.<UnaryCallSettings.Builder<?, ?>>of(
Expand Down
10 changes: 2 additions & 8 deletions ...m/google/cloud/bigquery/storage/v1beta1/stub/EnhancedBigQueryStorageStubSettingsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,6 @@
@RunWith(JUnit4.class)
public class EnhancedBigQueryStorageStubSettingsTest {

private static final int MAX_INBOUND_MESSAGE_SIZE = 1024 * 1024 * 11;

@Test
public void testSettingsArePreserved() {
String endpoint = "some.other.host:123";
Expand Down Expand Up @@ -86,9 +84,7 @@ private void verifyBuilder(

InstantiatingGrpcChannelProvider channelProvider =
(InstantiatingGrpcChannelProvider) builder.getTransportChannelProvider();
assertThat(channelProvider.toBuilder().getMaxInboundMessageSize())
.isEqualTo(MAX_INBOUND_MESSAGE_SIZE);
assertThat(channelProvider.toBuilder().getPoolSize()).isGreaterThan(1);
assertThat(channelProvider.toBuilder().getMaxInboundMessageSize()).isEqualTo(Integer.MAX_VALUE);
}

private void verifySettings(
Expand All @@ -104,9 +100,7 @@ private void verifySettings(

InstantiatingGrpcChannelProvider channelProvider =
(InstantiatingGrpcChannelProvider) settings.getTransportChannelProvider();
assertThat(channelProvider.toBuilder().getMaxInboundMessageSize())
.isEqualTo(MAX_INBOUND_MESSAGE_SIZE);
assertThat(channelProvider.toBuilder().getPoolSize()).isGreaterThan(1);
assertThat(channelProvider.toBuilder().getMaxInboundMessageSize()).isEqualTo(Integer.MAX_VALUE);
}

@Test
Expand Down