---

charlesliqlogic · chingor13 · commit 0bc7a0115316 · 2019-01-02T09:51:26.000-08:00
yaml --- r: 15779 b: refs/heads/autosynth-dialogflow c: 6e2c2dd h: refs/heads/master i: 15777: c7084fb 15775: 1e7e5c4
diff --git a/[refs] b/[refs]
@@ -130,7 +130,7 @@ refs/heads/autosynth-bigtable: 2fbcb15847e0e89e79d6dc07420e28d7dfcea894
 refs/heads/autosynth-bigtable-admin: 6379a2bc712f2736c83de0e009b4d26da4fa82ca
 refs/heads/autosynth-containeranalysis: 039ca5b8db725c76c16a965ff26b2774322b8ef8
 refs/heads/autosynth-datastore: 9acd400b484d6691a080c9152a331d88d24fefc1
-refs/heads/autosynth-dialogflow: fb2b690c57acdd37c2ac957788155606b28d5d9f
+refs/heads/autosynth-dialogflow: 6e2c2dd890fe445cc896f0ddcb30309213759ee2
 refs/heads/autosynth-errorreporting: 3d0566d6bebcc187f148bbed463b5a8e75b1edf6
 refs/heads/autosynth-firestore: 92b27fbc8855c9902168695abb0a8f1f433b750b
 refs/heads/autosynth-iot: 9d732be07d99843d8cb53d34ec0837328a807fce
diff --git a/branches/autosynth-dialogflow/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/AckReplyConsumer.java b/branches/autosynth-dialogflow/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/AckReplyConsumer.java
@@ -29,4 +29,6 @@ public interface AckReplyConsumer {
    * message.
    */
   void nack();
+
+  void abandon();
 }
diff --git a/branches/autosynth-dialogflow/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/MessageDispatcher.java b/branches/autosynth-dialogflow/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/MessageDispatcher.java
@@ -133,6 +133,7 @@ private class AckHandler implements ApiFutureCallback<AckReply> {
     private final int outstandingBytes;
     private final long receivedTimeMillis;
     private final Instant totalExpiration;
+    private boolean extending = true;
 
     AckHandler(String ackId, int outstandingBytes, Instant totalExpiration) {
       this.ackId = ackId;
@@ -151,6 +152,7 @@ private void forget() {
          */
         return;
       }
+      extending = false;
       flowController.release(1, outstandingBytes);
       messagesWaiter.incrementPendingMessages(-1);
       processOutstandingBatches();
@@ -417,6 +419,11 @@ public void ack() {
             public void nack() {
               response.set(AckReply.NACK);
             }
+
+            @Override
+            public void abandon() {
+              ackHandler.forget();
+            }
           };
       ApiFutures.addCallback(response, ackHandler, MoreExecutors.directExecutor());
       executor.execute(
@@ -471,6 +478,9 @@ void extendDeadlines() {
     Instant extendTo = now.plusSeconds(extendSeconds);
 
     for (Map.Entry<String, AckHandler> entry : pendingMessages.entrySet()) {
+      if (!entry.getValue().extending) {
+        continue;
+      }
       String ackId = entry.getKey();
       Instant totalExpiration = entry.getValue().totalExpiration;
       if (totalExpiration.isAfter(extendTo)) {
diff --git a/branches/autosynth-dialogflow/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MessageDispatcherTest.java b/branches/autosynth-dialogflow/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MessageDispatcherTest.java
@@ -148,6 +148,14 @@ public void testNack() throws Exception {
     assertThat(sentModAcks).contains(ModAckItem.of(TEST_MESSAGE.getAckId(), 0));
   }
 
+  @Test
+  public void testAbandon() throws Exception {
+    dispatcher.processReceivedMessages(Collections.singletonList(TEST_MESSAGE), NOOP_RUNNABLE);
+    consumers.take().abandon();
+    dispatcher.extendDeadlines();
+    assertThat(sentModAcks).doesNotContain(TEST_MESSAGE.getAckId());
+  }
+
   @Test
   public void testExtension() throws Exception {
     dispatcher.processReceivedMessages(Collections.singletonList(TEST_MESSAGE), NOOP_RUNNABLE);

Original file line number	Diff line number	Diff line change
`@@ -29,4 +29,6 @@ public interface AckReplyConsumer {`
`29`	`29`	`* message.`
`30`	`30`	`*/`
`31`	`31`	`void nack();`
	`32`	`+`
	`33`	`+ void abandon();`
`32`	`34`	`}`