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

Jump to bottom

fix: Disable Breaking change related code site #731

Merged
merged 17 commits into from Dec 15, 2020
Merged

fix: Disable Breaking change related code site #731

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
487d5b2
fix: a race condition in test
yirutang Dec 10, 2020
a6a5682
.
yirutang Dec 10, 2020
1e97dc7
Merge remote-tracking branch 'upstream/master'
yirutang Dec 10, 2020
147c5c4
Merge remote-tracking branch 'upstream/master'
yirutang Dec 10, 2020
bc8de1b
.
yirutang Dec 11, 2020
5ee27ac
Merge branch 'master' into breaking-change
stephaniewang526 Dec 11, 2020
cc23c54
.
yirutang Dec 11, 2020
79912a2
.
yirutang Dec 14, 2020
528a57a
.
yirutang Dec 14, 2020
b1354c6
.
yirutang Dec 14, 2020
b54a46e
.
yirutang Dec 14, 2020
d9a9a5e
.
yirutang Dec 14, 2020
d822094
.
yirutang Dec 14, 2020
110543f
.
yirutang Dec 14, 2020
984c0a3
Merge branch 'master' into breaking-change
stephaniewang526 Dec 14, 2020
a0c9c86
.
yirutang Dec 15, 2020
d3518aa
.
yirutang Dec 15, 2020
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
21 changes: 11 additions & 10 deletions ...bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1beta2/StreamWriter.java
View file
Open in desktop
Expand Up @@ -485,16 +485,17 @@ private void onFailure(Throwable t) {
private void onSuccess(AppendRowsResponse response) {
for (int i = 0; i < inflightRequests.size(); i++) {
AppendRowsResponse.Builder singleResponse = response.toBuilder();
if (offsetList.get(i) > 0) {
// singleResponse.setOffset(offsetList.get(i));
} else {
long actualOffset = response.getOffset();
for (int j = 0; j < i; j++) {
actualOffset +=
inflightRequests.get(j).message.getProtoRows().getRows().getSerializedRowsCount();
}
// singleResponse.setOffset(actualOffset);
}
// if (offsetList.get(i) > 0) {
// singleResponse.setOffset(offsetList.get(i));
// } else {
// long actualOffset = response.getOffset();
// for (int j = 0; j < i; j++) {
// actualOffset +=
//
// inflightRequests.get(j).message.getProtoRows().getRows().getSerializedRowsCount();
// }
// singleResponse.setOffset(actualOffset);
// }
inflightRequests.get(i).appendResult.set(singleResponse.build());
}
}
Expand Down
1 change: 1 addition & 0 deletions ...st/java/com/google/cloud/bigquery/storage/v1beta2/it/ITBigQueryWriteManualClientTest.java
View file
Open in desktop
Expand Up @@ -257,6 +257,7 @@ public void testJsonStreamWriterBatchWriteWithCommittedStream()

ApiFuture<AppendRowsResponse> response =
jsonStreamWriter.append(row, -1, /* allowUnknownFields */ false);

Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change

// Temp for Breaking Change.
response.get();
// assertEquals(0, response.get().getOffset());
Expand Down