Skip to content
This repository has been archived by the owner on Jun 28, 2022. It is now read-only.

py,go,java: remove send/recv msg size limit #2900

Merged
merged 6 commits into from
Aug 1, 2019
Merged

py,go,java: remove send/recv msg size limit #2900

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a1e5774
py,go,java: remove send/recv msg size limit
noahdietz Jul 31, 2019
8257e1e
java: remove unsupported maxOutboundMessageSize
noahdietz Jul 31, 2019
d3ffe35
Merge branch 'master' into issue-2895
Aug 1, 2019
5ecc769
go: remove unnecessary max send option
noahdietz Aug 1, 2019
a565f0d
Merge branch 'issue-2895' of https://github.com/noahdietz/gapic-gener…
noahdietz Aug 1, 2019
7609d0e
go: use math.MaxInt32 instead of -1
noahdietz Aug 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/main/resources/com/google/api/codegen/go/main.snip
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@
return []option.ClientOption{
option.WithEndpoint("{@view.serviceHostname}:{@view.servicePort}"),
option.WithScopes(DefaultAuthScopes()...),
option.WithGRPCDialOption(grpc.WithDefaultCallOptions(
grpc.MaxCallRecvMsgSize(-1),
grpc.MaxCallSendMsgSize(-1))),
}
}

Expand Down
7 changes: 6 additions & 1 deletion src/main/resources/com/google/api/codegen/java/stub_settings.snip
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,12 @@
@if xsettingsClass.hasDefaultServiceAddress
/** Returns a builder for the default ChannelProvider for this service. */
public static {@xsettingsClass.instantiatingChannelProvider}.Builder {@xsettingsClass.defaultTransportProviderBuilder}() {
return {@xsettingsClass.instantiatingChannelProvider}.newBuilder();
@if xsettingsClass.transportProtocol == "GRPC"
return {@xsettingsClass.instantiatingChannelProvider}.newBuilder()
.setMaxInboundMessageSize(Integer.MAX_VALUE);
@else
return {@xsettingsClass.instantiatingChannelProvider}.newBuilder();
@end
}

public static TransportChannelProvider defaultTransportChannelProvider() {
Expand Down
4 changes: 4 additions & 0 deletions src/main/resources/com/google/api/codegen/py/transport.snip
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@
channel = self.create_channel(
address=address,
credentials=credentials,
options={
'grpc.max_send_message_length': -1,
'grpc.max_receive_message_length': -1,
},
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line needs to have .items() tacked on (options is expected to be a sequence of two-tuples, not a dict).

)

self._channel = channel
Expand Down
6 changes: 6 additions & 0 deletions src/test/java/com/google/api/codegen/gapic/testdata/go/go_library.baseline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,9 @@ func defaultClientOptions() []option.ClientOption {
return []option.ClientOption{
option.WithEndpoint("library-example.googleapis.com:1234"),
option.WithScopes(DefaultAuthScopes()...),
option.WithGRPCDialOption(grpc.WithDefaultCallOptions(
grpc.MaxCallRecvMsgSize(-1),
grpc.MaxCallSendMsgSize(-1))),
}
}

Expand Down Expand Up @@ -4419,6 +4422,9 @@ func defaultMyProtoClientOptions() []option.ClientOption {
return []option.ClientOption{
option.WithEndpoint("library-example.googleapis.com:1234"),
option.WithScopes(DefaultAuthScopes()...),
option.WithGRPCDialOption(grpc.WithDefaultCallOptions(
grpc.MaxCallRecvMsgSize(-1),
grpc.MaxCallSendMsgSize(-1))),
}
}

Expand Down
6 changes: 4 additions & 2 deletions src/test/java/com/google/api/codegen/gapic/testdata/java/java_library.baseline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11579,7 +11579,8 @@ public class LibraryServiceStubSettings extends StubSettings<LibraryServiceStubS

/** Returns a builder for the default ChannelProvider for this service. */
public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
return InstantiatingGrpcChannelProvider.newBuilder();
return InstantiatingGrpcChannelProvider.newBuilder()
.setMaxInboundMessageSize(Integer.MAX_VALUE);
}

public static TransportChannelProvider defaultTransportChannelProvider() {
Expand Down Expand Up @@ -12812,7 +12813,8 @@ public class MyProtoStubSettings extends StubSettings<MyProtoStubSettings> {

/** Returns a builder for the default ChannelProvider for this service. */
public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
return InstantiatingGrpcChannelProvider.newBuilder();
return InstantiatingGrpcChannelProvider.newBuilder()
.setMaxInboundMessageSize(Integer.MAX_VALUE);
}

public static TransportChannelProvider defaultTransportChannelProvider() {
Expand Down
3 changes: 2 additions & 1 deletion src/test/java/com/google/api/codegen/gapic/testdata/java/java_my_streaming_proto.baseline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -996,7 +996,8 @@ public class MyStreamingServiceStubSettings extends StubSettings<MyStreamingServ

/** Returns a builder for the default ChannelProvider for this service. */
public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
return InstantiatingGrpcChannelProvider.newBuilder();
return InstantiatingGrpcChannelProvider.newBuilder()
.setMaxInboundMessageSize(Integer.MAX_VALUE);
}

public static TransportChannelProvider defaultTransportChannelProvider() {
Expand Down
6 changes: 4 additions & 2 deletions ...m/google/api/codegen/gapic/testdata/java/java_samplegen_config_migration_library.baseline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9450,7 +9450,8 @@ public class LibraryServiceStubSettings extends StubSettings<LibraryServiceStubS

/** Returns a builder for the default ChannelProvider for this service. */
public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
return InstantiatingGrpcChannelProvider.newBuilder();
return InstantiatingGrpcChannelProvider.newBuilder()
.setMaxInboundMessageSize(Integer.MAX_VALUE);
}

public static TransportChannelProvider defaultTransportChannelProvider() {
Expand Down Expand Up @@ -10683,7 +10684,8 @@ public class MyProtoStubSettings extends StubSettings<MyProtoStubSettings> {

/** Returns a builder for the default ChannelProvider for this service. */
public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
return InstantiatingGrpcChannelProvider.newBuilder();
return InstantiatingGrpcChannelProvider.newBuilder()
.setMaxInboundMessageSize(Integer.MAX_VALUE);
}

public static TransportChannelProvider defaultTransportChannelProvider() {
Expand Down
8 changes: 8 additions & 0 deletions src/test/java/com/google/api/codegen/gapic/testdata/py/python_library.baseline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4276,6 +4276,10 @@ class LibraryServiceGrpcTransport(object):
channel = self.create_channel(
address=address,
credentials=credentials,
options={
'grpc.max_send_message_length': -1,
'grpc.max_receive_message_length': -1,
},
)

self._channel = channel
Expand Down Expand Up @@ -4776,6 +4780,10 @@ class MyProtoGrpcTransport(object):
channel = self.create_channel(
address=address,
credentials=credentials,
options={
'grpc.max_send_message_length': -1,
'grpc.max_receive_message_length': -1,
},
)

self._channel = channel
Expand Down
8 changes: 8 additions & 0 deletions src/test/java/com/google/api/codegen/gapic/testdata/py/python_multiple_services.baseline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1429,6 +1429,10 @@ class DecrementerServiceGrpcTransport(object):
channel = self.create_channel(
address=address,
credentials=credentials,
options={
'grpc.max_send_message_length': -1,
'grpc.max_receive_message_length': -1,
},
)

self._channel = channel
Expand Down Expand Up @@ -1553,6 +1557,10 @@ class IncrementerServiceGrpcTransport(object):
channel = self.create_channel(
address=address,
credentials=credentials,
options={
'grpc.max_send_message_length': -1,
'grpc.max_receive_message_length': -1,
},
)

self._channel = channel
Expand Down
4 changes: 4 additions & 0 deletions src/test/java/com/google/api/codegen/gapic/testdata/py/python_no_path_templates.baseline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1118,6 +1118,10 @@ class NoTemplatesApiServiceGrpcTransport(object):
channel = self.create_channel(
address=address,
credentials=credentials,
options={
'grpc.max_send_message_length': -1,
'grpc.max_receive_message_length': -1,
},
)

self._channel = channel
Expand Down
8 changes: 8 additions & 0 deletions ...m/google/api/codegen/gapic/testdata/py/python_samplegen_config_migration_library.baseline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4267,6 +4267,10 @@ class LibraryServiceGrpcTransport(object):
channel = self.create_channel(
address=address,
credentials=credentials,
options={
'grpc.max_send_message_length': -1,
'grpc.max_receive_message_length': -1,
},
)

self._channel = channel
Expand Down Expand Up @@ -4767,6 +4771,10 @@ class MyProtoGrpcTransport(object):
channel = self.create_channel(
address=address,
credentials=credentials,
options={
'grpc.max_send_message_length': -1,
'grpc.max_receive_message_length': -1,
},
)

self._channel = channel
Expand Down
6 changes: 6 additions & 0 deletions src/test/java/com/google/api/codegen/protoannotations/testdata/go_library.baseline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,9 @@ func defaultClientOptions() []option.ClientOption {
return []option.ClientOption{
option.WithEndpoint("library-example.googleapis.com:1234"),
option.WithScopes(DefaultAuthScopes()...),
option.WithGRPCDialOption(grpc.WithDefaultCallOptions(
grpc.MaxCallRecvMsgSize(-1),
grpc.MaxCallSendMsgSize(-1))),
}
}

Expand Down Expand Up @@ -4425,6 +4428,9 @@ func defaultMyProtoClientOptions() []option.ClientOption {
return []option.ClientOption{
option.WithEndpoint("library-example.googleapis.com:1234"),
option.WithScopes(DefaultAuthScopes()...),
option.WithGRPCDialOption(grpc.WithDefaultCallOptions(
grpc.MaxCallRecvMsgSize(-1),
grpc.MaxCallSendMsgSize(-1))),
}
}

Expand Down
6 changes: 4 additions & 2 deletions src/test/java/com/google/api/codegen/protoannotations/testdata/java_library.baseline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11572,7 +11572,8 @@ public class LibraryServiceStubSettings extends StubSettings<LibraryServiceStubS

/** Returns a builder for the default ChannelProvider for this service. */
public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
return InstantiatingGrpcChannelProvider.newBuilder();
return InstantiatingGrpcChannelProvider.newBuilder()
.setMaxInboundMessageSize(Integer.MAX_VALUE);
}

public static TransportChannelProvider defaultTransportChannelProvider() {
Expand Down Expand Up @@ -12805,7 +12806,8 @@ public class MyProtoStubSettings extends StubSettings<MyProtoStubSettings> {

/** Returns a builder for the default ChannelProvider for this service. */
public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
return InstantiatingGrpcChannelProvider.newBuilder();
return InstantiatingGrpcChannelProvider.newBuilder()
.setMaxInboundMessageSize(Integer.MAX_VALUE);
}

public static TransportChannelProvider defaultTransportChannelProvider() {
Expand Down
6 changes: 4 additions & 2 deletions ...va/com/google/api/codegen/protoannotations/testdata/java_library_no_gapic_config.baseline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7172,7 +7172,8 @@ public class LibraryServiceStubSettings extends StubSettings<LibraryServiceStubS

/** Returns a builder for the default ChannelProvider for this service. */
public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
return InstantiatingGrpcChannelProvider.newBuilder();
return InstantiatingGrpcChannelProvider.newBuilder()
.setMaxInboundMessageSize(Integer.MAX_VALUE);
}

public static TransportChannelProvider defaultTransportChannelProvider() {
Expand Down Expand Up @@ -8214,7 +8215,8 @@ public class MyProtoStubSettings extends StubSettings<MyProtoStubSettings> {

/** Returns a builder for the default ChannelProvider for this service. */
public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
return InstantiatingGrpcChannelProvider.newBuilder();
return InstantiatingGrpcChannelProvider.newBuilder()
.setMaxInboundMessageSize(Integer.MAX_VALUE);
}

public static TransportChannelProvider defaultTransportChannelProvider() {
Expand Down
8 changes: 8 additions & 0 deletions src/test/java/com/google/api/codegen/protoannotations/testdata/python_library.baseline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4269,6 +4269,10 @@ class LibraryServiceGrpcTransport(object):
channel = self.create_channel(
address=address,
credentials=credentials,
options={
'grpc.max_send_message_length': -1,
'grpc.max_receive_message_length': -1,
},
)

self._channel = channel
Expand Down Expand Up @@ -4769,6 +4773,10 @@ class MyProtoGrpcTransport(object):
channel = self.create_channel(
address=address,
credentials=credentials,
options={
'grpc.max_send_message_length': -1,
'grpc.max_receive_message_length': -1,
},
)

self._channel = channel
Expand Down
8 changes: 8 additions & 0 deletions .../com/google/api/codegen/protoannotations/testdata/python_library_no_gapic_config.baseline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3778,6 +3778,10 @@ class LibraryServiceGrpcTransport(object):
channel = self.create_channel(
address=address,
credentials=credentials,
options={
'grpc.max_send_message_length': -1,
'grpc.max_receive_message_length': -1,
},
)

self._channel = channel
Expand Down Expand Up @@ -4273,6 +4277,10 @@ class MyProtoGrpcTransport(object):
channel = self.create_channel(
address=address,
credentials=credentials,
options={
'grpc.max_send_message_length': -1,
'grpc.max_receive_message_length': -1,
},
)

self._channel = channel
Expand Down