Skip to content
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

fix: add extra JsonWriterTest to show that the LimitBehavior addition is not breaking #1643

Merged
merged 11 commits into from
May 8, 2022
Merged

fix: add extra JsonWriterTest to show that the LimitBehavior addition is not breaking #1643

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
88df061
fix[1539]
yirutang May 6, 2022
922d744
.
yirutang May 6, 2022
da75685
.
yirutang May 6, 2022
080e385
fix: Add an extra jsonWriterTest for Limit Behavior
yirutang May 6, 2022
32f48ee
.
yirutang May 6, 2022
87c8991
.
yirutang May 6, 2022
4a6a1d1
.
yirutang May 6, 2022
cf744ff
.
yirutang May 6, 2022
52c69bb
fix an issue that we should reject request before it is added to the …
yirutang May 6, 2022
0c42073
.
yirutang May 6, 2022
0de5593
.
yirutang May 6, 2022
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: 0 additions & 4 deletions ...-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/JsonStreamWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,6 @@ private JsonStreamWriter(Builder builder)
this.protoSchema = ProtoSchemaConverter.convert(this.descriptor);
this.totalMessageSize = protoSchema.getSerializedSize();
streamWriterBuilder.setWriterSchema(protoSchema);
if (builder.flowControlSettings != null) {
GaoleMeng marked this conversation as resolved.
Show resolved Hide resolved
streamWriterBuilder.setLimitExceededBehavior(
builder.flowControlSettings.getLimitExceededBehavior());
}
setStreamWriterSettings(
builder.channelProvider,
builder.credentialsProvider,
Expand Down
22 changes: 22 additions & 0 deletions ...querystorage/src/test/java/com/google/cloud/bigquery/storage/v1/JsonStreamWriterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,6 +560,7 @@ public void testFlowControlSetting() throws Exception {
.setMaxOutstandingRequestBytes(1L)
.build())
.build()) {
testBigQueryWrite.addResponse(AppendRowsResponse.newBuilder().build());
JSONObject foo = new JSONObject();
foo.put("test_int", 10);
JSONArray jsonArr = new JSONArray();
Expand All @@ -581,4 +582,25 @@ public void run() throws Throwable {
"Exceeds client side inflight buffer, consider add more buffer or open more connections"));
}
}

@Test
public void testFlowControlSettingNoLimitBehavior() throws Exception {
yirutang marked this conversation as resolved.
Show resolved Hide resolved
TableSchema tableSchema = TableSchema.newBuilder().addFields(0, TEST_INT).build();
try (JsonStreamWriter writer =
JsonStreamWriter.newBuilder(TEST_STREAM, tableSchema)
.setChannelProvider(channelProvider)
.setCredentialsProvider(NoCredentialsProvider.create())
.setFlowControlSettings(
FlowControlSettings.newBuilder()
.setMaxOutstandingRequestBytes(1L)
.build())
.build()) {
JSONObject foo = new JSONObject();
foo.put("test_int", 10);
JSONArray jsonArr = new JSONArray();
jsonArr.put(foo);
ApiFuture<AppendRowsResponse> appendFuture = writer.append(jsonArr);
appendFuture.get();
}
}
}