---

nktaushanov · sduskis · commit cd2251396e30 · 2018-12-28T13:26:44.000-05:00
yaml --- r: 12969 b: refs/heads/autosynth-scheduler c: 31971fb h: refs/heads/master i: 12967: d6df3b4
diff --git a/[refs] b/[refs]
@@ -138,7 +138,7 @@ refs/heads/autosynth-kms: dcc6e15d68759010c8735cc868135bd7e6c1cc5f
 refs/heads/autosynth-language: 8972866b016473559702424205ce5569de47b34d
 refs/heads/autosynth-os-login: daa910328b954bbe87068f684a3088ed910f1ddf
 refs/heads/autosynth-redis: 4c68cb0fbc599124e717ab3f24bd8a8a5d085ca9
-refs/heads/autosynth-scheduler: 9bf5b350fa4634c436e60dc6dffd525085410590
+refs/heads/autosynth-scheduler: 31971fbd56a025bdb9c55ac226e2eaad6a7e7562
 refs/heads/autosynth-securitycenter: 80dc94847b954c97a641519177c98dc8e9e9fbe1
 refs/heads/autosynth-spanner: 1804eb46dd34a05b47163758d376a7fac49188f1
 refs/heads/autosynth-speech: 631df42a628621fe42eb4974c9eb725b2fe8e473
diff --git a/branches/autosynth-scheduler/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/StandardTableDefinition.java b/branches/autosynth-scheduler/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-scheduler/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/StandardTableDefinitionTest.java b/branches/autosynth-scheduler/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);
