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 BigQuery NullPointerException when estimatedFields is empty #3984

Merged
merged 2 commits into from
Nov 19, 2018
Merged

Fix BigQuery NullPointerException when estimatedFields is empty #3984

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
62ac72f
BigQuery client throws NullPointerException when estimatedFields is e…
ajaaym Nov 16, 2018
f3b82bb
fix formatting
ajaaym Nov 17, 2018
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
15 changes: 10 additions & 5 deletions ...oogle-cloud-bigquery/src/main/java/com/google/cloud/bigquery/StandardTableDefinition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ public abstract class StandardTableDefinition extends TableDefinition {
public static class StreamingBuffer implements Serializable {

private static final long serialVersionUID = 822027055549277843L;
private final long estimatedRows;
private final long estimatedBytes;
private final Long estimatedRows;
private final Long estimatedBytes;
private final Long oldestEntryTime;

StreamingBuffer(long estimatedRows, long estimatedBytes, Long oldestEntryTime) {
StreamingBuffer(Long estimatedRows, Long estimatedBytes, Long oldestEntryTime) {
this.estimatedRows = estimatedRows;
this.estimatedBytes = estimatedBytes;
this.oldestEntryTime = oldestEntryTime;
Expand Down Expand Up @@ -113,8 +113,13 @@ static StreamingBuffer fromPb(Streamingbuffer streamingBufferPb) {
if (streamingBufferPb.getOldestEntryTime() != null) {
oldestEntryTime = streamingBufferPb.getOldestEntryTime().longValue();
}
return new StreamingBuffer(streamingBufferPb.getEstimatedRows().longValue(),
streamingBufferPb.getEstimatedBytes().longValue(),
return new StreamingBuffer(
streamingBufferPb.getEstimatedRows() != null
? streamingBufferPb.getEstimatedRows().longValue()
: null,
streamingBufferPb.getEstimatedBytes() != null
? streamingBufferPb.getEstimatedBytes().longValue()
: null,
oldestEntryTime);
}
}
Expand Down
7 changes: 7 additions & 0 deletions ...e-cloud-bigquery/src/test/java/com/google/cloud/bigquery/StandardTableDefinitionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;

import com.google.api.services.bigquery.model.Streamingbuffer;
import com.google.cloud.bigquery.StandardTableDefinition.StreamingBuffer;

import com.google.common.collect.ImmutableList;
Expand Down Expand Up @@ -117,6 +118,12 @@ public void testToAndFromPb() {
TableDefinition.<StandardTableDefinition>fromPb(definition.toPb()));
}

@Test
public void testFromPbWithNullEstimatedRowsAndBytes() {
StandardTableDefinition.fromPb(
TABLE_DEFINITION.toPb().setStreamingBuffer(new Streamingbuffer()));
}

private void compareStandardTableDefinition(StandardTableDefinition expected,
StandardTableDefinition value) {
assertEquals(expected, value);
Expand Down