---

nktaushanov · sduskis · commit c1516a7d11d7 · 2018-12-28T13:26:44.000-05:00
yaml --- r: 17731 b: refs/heads/autosynth-trace c: 31971fb h: refs/heads/master i: 17729: 7c6d4c2 17727: 72228bd
diff --git a/[refs] b/[refs]
@@ -144,7 +144,7 @@ refs/heads/autosynth-spanner: 9bff86d057df31e04c76d72865e8e073ac5794fb
 refs/heads/autosynth-speech: 75d6c62a9d07d3a3642980502a25d07fbde0f232
 refs/heads/autosynth-tasks: b0cdb991f3f75345151a3f68db1aab273dfc069b
 refs/heads/autosynth-texttospeech: 2dcc5dc22be0f456caa1b6a8a4bcdace2641239c
-refs/heads/autosynth-trace: 9bf5b350fa4634c436e60dc6dffd525085410590
+refs/heads/autosynth-trace: 31971fbd56a025bdb9c55ac226e2eaad6a7e7562
 refs/heads/autosynth-websecurityscanner: d4febbffb6c648b74faec62fe90e20adadc9a7d3
 refs/heads/bigquerystorage: 06db74d123d7f8a3ef48755c2fcabed09faf8e64
 refs/heads/elharo-patch-1: ce159ef828d3c545991ff78e7b6e0d912a9453e9
diff --git a/branches/autosynth-trace/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/StandardTableDefinition.java b/branches/autosynth-trace/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/StandardTableDefinition.java
@@ -57,12 +57,12 @@ public static class StreamingBuffer implements Serializable {
     }
 
     /** Returns a lower-bound estimate of the number of rows currently in the streaming buffer. */
-    public long getEstimatedRows() {
+    public Long getEstimatedRows() {
       return estimatedRows;
     }
 
     /** Returns a lower-bound estimate of the number of bytes currently in the streaming buffer. */
-    public long getEstimatedBytes() {
+    public Long getEstimatedBytes() {
       return estimatedBytes;
     }
 
@@ -95,10 +95,17 @@ public boolean equals(Object obj) {
     }
 
     Streamingbuffer toPb() {
-      return new Streamingbuffer()
-          .setEstimatedBytes(BigInteger.valueOf(estimatedBytes))
-          .setEstimatedRows(BigInteger.valueOf(estimatedRows))
-          .setOldestEntryTime(BigInteger.valueOf(oldestEntryTime));
+      Streamingbuffer buffer = new Streamingbuffer();
+      if (estimatedBytes != null) {
+        buffer.setEstimatedBytes(BigInteger.valueOf(estimatedBytes));
+      }
+      if (estimatedRows != null) {
+        buffer.setEstimatedRows(BigInteger.valueOf(estimatedRows));
+      }
+      if (oldestEntryTime != null) {
+        buffer.setOldestEntryTime(BigInteger.valueOf(oldestEntryTime));
+      }
+      return buffer;
     }
 
     static StreamingBuffer fromPb(Streamingbuffer streamingBufferPb) {
diff --git a/branches/autosynth-trace/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/StandardTableDefinitionTest.java b/branches/autosynth-trace/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/StandardTableDefinitionTest.java
@@ -120,6 +120,11 @@ public void testFromPbWithNullEstimatedRowsAndBytes() {
         TABLE_DEFINITION.toPb().setStreamingBuffer(new Streamingbuffer()));
   }
 
+  @Test
+  public void testStreamingBufferWithNullFieldsToPb() {
+    new StreamingBuffer(null, null, null).toPb();
+  }
+
   private void compareStandardTableDefinition(
       StandardTableDefinition expected, StandardTableDefinition value) {
     assertEquals(expected, value);
