---

pongad · web-flow · commit 59a68f4f7312 · 2018-03-03T00:11:17.000+11:00
yaml --- r: 9145 b: refs/heads/batching-expr c: 186b72b h: refs/heads/master i: 9143: 2b24c3f
diff --git a/[refs] b/[refs]
@@ -84,7 +84,7 @@ refs/tags/v0.27.0: 015e56421f67042037ed276353d3c0852483d570
 refs/tags/v0.28.0: 0d4c4daeda94e17ab70577334ae4a228b8774742
 refs/tags/v0.29.0: d702b33b70f2e81853a142b4158227c5a88c8781
 refs/tags/v0.30.0: 9ea3a32084835d0499934e7c070af9f120747e88
-refs/heads/batching-expr: 5d55feb8960a0b884355f923b0eac5776a9dee5d
+refs/heads/batching-expr: 186b72b9ad58fad554cf66c24ae3f1f3cfa19319
 "refs/heads/datastore_orderby_tostring": 24a5a107969714ebb69a5a098f47658f7b1e8689
 "refs/heads/mrschmidt-__name___": effe27458f7d31b1d5ae1af6a5a228ce89c33462
 refs/heads/mrschmidt-emptymerge: 447dbddebbcb8b88fe5dc480d16c0c7697712d11
diff --git a/branches/batching-expr/google-cloud-core/src/main/java/com/google/cloud/batchingexperimental/RequestAccumulator.java b/branches/batching-expr/google-cloud-core/src/main/java/com/google/cloud/batchingexperimental/RequestAccumulator.java
@@ -130,6 +130,11 @@ public List<SettableApiFuture<ResponseT>> futureBatch() {
     return futures;
   }
 
+  /** Returns the combined size of items in {@link #batch()}. */
+  public long bytes() {
+    return curBytes - oversizedBytes;
+  }
+
   /** Consumes the current batch. */
   public void next() {
     batch().clear();
diff --git a/branches/batching-expr/google-cloud-core/src/test/java/com/google/cloud/batchingexperimental/RequestAccumulatorTest.java b/branches/batching-expr/google-cloud-core/src/test/java/com/google/cloud/batchingexperimental/RequestAccumulatorTest.java
@@ -32,6 +32,7 @@ public void testCount() {
     acc.add("b", 1, null);
     assertThat(acc.hasBatch()).isTrue();
     assertThat(acc.batch()).containsExactly("a", "b");
+    assertThat(acc.bytes()).isEqualTo(2);
 
     acc.next();
     assertThat(acc.hasBatch()).isFalse();
@@ -42,6 +43,7 @@ public void testCount() {
     acc.add("d", 1, null);
     assertThat(acc.hasBatch()).isTrue();
     assertThat(acc.batch()).containsExactly("c", "d");
+    assertThat(acc.bytes()).isEqualTo(2);
 
     acc.next();
     assertThat(acc.hasBatch()).isFalse();
@@ -58,6 +60,7 @@ public void testSize() {
     acc.add("bc", 2, null);
     assertThat(acc.hasBatch()).isTrue();
     assertThat(acc.batch()).containsExactly("a", "bc");
+    assertThat(acc.bytes()).isEqualTo(3);
 
     acc.next();
     assertThat(acc.hasBatch()).isFalse();
@@ -68,6 +71,7 @@ public void testSize() {
     acc.add("fg", 2, null);
     assertThat(acc.hasBatch()).isTrue();
     assertThat(acc.batch()).containsExactly("de", "fg");
+    assertThat(acc.bytes()).isEqualTo(4);
 
     acc.next();
     assertThat(acc.hasBatch()).isFalse();
@@ -79,6 +83,7 @@ public void testOversizeAlone() {
     acc.add("abc", 3, null);
     assertThat(acc.hasBatch()).isTrue();
     assertThat(acc.batch()).containsExactly("abc");
+    assertThat(acc.bytes()).isEqualTo(3);
   }
 
   @Test
@@ -90,10 +95,12 @@ public void testOversize() {
     acc.add("xyz", 3, null);
     assertThat(acc.hasBatch()).isTrue();
     assertThat(acc.batch()).containsExactly("a");
+    assertThat(acc.bytes()).isEqualTo(1);
 
     acc.next();
     assertThat(acc.hasBatch()).isTrue();
     assertThat(acc.batch()).containsExactly("xyz");
+    assertThat(acc.bytes()).isEqualTo(3);
 
     acc.next();
     assertThat(acc.hasBatch()).isFalse();
