---

sduskis · web-flow · commit d761553155b6 · 2019-04-25T11:03:56.000-04:00
yaml --- r: 30715 b: refs/heads/autosynth-bigquerydatatransfer c: 909b0e8 h: refs/heads/master i: 30713: 5858c06 30711: 55b6038
diff --git a/[refs] b/[refs]
@@ -122,7 +122,7 @@ refs/tags/v0.68.0: 9cc799fcf68c82ab431d425fefa58ef615ce8e5b
 refs/tags/v0.69.0: 78f67a29e8b9c46ba01de566a2eae0fd1c03edea
 refs/heads/autosynth-asset: bdb45634a0fe8f7a510692b56b31f5312e25f453
 refs/heads/autosynth-automl: 22f9dd5b6f5df8dbfa7da0126864d565229519b2
-refs/heads/autosynth-bigquerydatatransfer: e67fd018a79de01181f1806a4597055d5d2104bb
+refs/heads/autosynth-bigquerydatatransfer: 909b0e8ef2d87a5d75da3ebfb595868a94645aae
 refs/heads/autosynth-bigquerystorage: d2c53da3b012e38c662e4df0738042435f19365f
 refs/heads/autosynth-bigtable: 9e5429f45cf9face9fed585d0233534993e36b58
 refs/heads/autosynth-bigtable-admin: 6379a2bc712f2736c83de0e009b4d26da4fa82ca
diff --git a/branches/autosynth-bigquerydatatransfer/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Publisher.java b/branches/autosynth-bigquerydatatransfer/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Publisher.java
@@ -197,23 +197,22 @@ public ApiFuture<String> publish(PubsubMessage message) {
     }
 
     message = messageTransform.apply(message);
-    final int messageSize = message.getSerializedSize();
     OutstandingBatch batchToSend = null;
-    SettableApiFuture<String> publishResult = SettableApiFuture.<String>create();
-    final OutstandingPublish outstandingPublish = new OutstandingPublish(publishResult, message);
+    final OutstandingPublish outstandingPublish = new OutstandingPublish(message);
     messagesBatchLock.lock();
     try {
       // Check if the next message makes the current batch exceed the max batch byte size.
       if (!messagesBatch.isEmpty()
           && hasBatchingBytes()
-          && messagesBatch.getBatchedBytes() + messageSize >= getMaxBatchBytes()) {
+          && messagesBatch.getBatchedBytes() + outstandingPublish.messageSize
+              >= getMaxBatchBytes()) {
         batchToSend = messagesBatch.popOutstandingBatch();
       }
 
       // Border case if the message to send is greater or equals to the max batch size then can't
       // be included in the current batch and instead sent immediately.
-      if (!hasBatchingBytes() || messageSize < getMaxBatchBytes()) {
-        messagesBatch.addMessage(outstandingPublish, messageSize);
+      if (!hasBatchingBytes() || outstandingPublish.messageSize < getMaxBatchBytes()) {
+        messagesBatch.addMessage(outstandingPublish, outstandingPublish.messageSize);
 
         // If after adding the message we have reached the batch max messages then we have a batch
         // to send.
@@ -243,20 +242,21 @@ public void run() {
 
     // If the message is over the size limit, it was not added to the pending messages and it will
     // be sent in its own batch immediately.
-    if (hasBatchingBytes() && messageSize >= getMaxBatchBytes()) {
+    if (hasBatchingBytes() && outstandingPublish.messageSize >= getMaxBatchBytes()) {
       logger.log(
           Level.FINER, "Message exceeds the max batch bytes, scheduling it for immediate send.");
       executor.execute(
           new Runnable() {
             @Override
             public void run() {
               publishOutstandingBatch(
-                  new OutstandingBatch(ImmutableList.of(outstandingPublish), messageSize));
+                  new OutstandingBatch(
+                      ImmutableList.of(outstandingPublish), outstandingPublish.messageSize));
             }
           });
     }
 
-    return publishResult;
+    return outstandingPublish.publishResult;
   }
 
   private void setupAlarm() {
@@ -382,12 +382,14 @@ public int size() {
   }
 
   private static final class OutstandingPublish {
-    SettableApiFuture<String> publishResult;
-    PubsubMessage message;
+    final SettableApiFuture<String> publishResult;
+    final PubsubMessage message;
+    final int messageSize;
 
-    OutstandingPublish(SettableApiFuture<String> publishResult, PubsubMessage message) {
-      this.publishResult = publishResult;
+    OutstandingPublish(PubsubMessage message) {
+      this.publishResult = SettableApiFuture.create();
       this.message = message;
+      this.messageSize = message.getSerializedSize();
     }
   }
 
