Skip to content

Migrate Pub/Sub client to ApiFutures. #3700

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 19, 2018
Merged

Migrate Pub/Sub client to ApiFutures. #3700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions ...ients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/MessageDispatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@
package com.google.cloud.pubsub.v1;

import com.google.api.core.ApiClock;
import com.google.api.core.ApiFutureCallback;
import com.google.api.core.ApiFutures;
import com.google.api.core.InternalApi;
import com.google.api.core.SettableApiFuture;
import com.google.api.gax.batching.FlowController;
import com.google.api.gax.batching.FlowController.FlowControlException;
import com.google.api.gax.core.Distribution;
import com.google.cloud.pubsub.v1.MessageDispatcher.OutstandingMessageBatch.OutstandingMessage;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.primitives.Ints;
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.SettableFuture;
import com.google.common.util.concurrent.MoreExecutors;
import com.google.pubsub.v1.PubsubMessage;
import com.google.pubsub.v1.ReceivedMessage;
import java.util.ArrayList;
Expand Down Expand Up @@ -129,7 +129,7 @@ public enum AckReply {
}

/** Handles callbacks for acking/nacking messages from the {@link MessageReceiver}. */
private class AckHandler implements FutureCallback<AckReply> {
private class AckHandler implements ApiFutureCallback<AckReply> {
private final String ackId;
private final int outstandingBytes;
private final long receivedTimeMillis;
Expand Down Expand Up @@ -379,7 +379,7 @@ public void processOutstandingBatches() {

final PubsubMessage message = outstandingMessage.receivedMessage().getMessage();
final AckHandler ackHandler = outstandingMessage.ackHandler();
final SettableFuture<AckReply> response = SettableFuture.create();
final SettableApiFuture<AckReply> response = SettableApiFuture.create();
final AckReplyConsumer consumer =
new AckReplyConsumer() {
@Override
Expand All @@ -392,7 +392,7 @@ public void nack() {
response.set(AckReply.NACK);
}
};
Futures.addCallback(response, ackHandler);
ApiFutures.addCallback(response, ackHandler, MoreExecutors.directExecutor());
executor.execute(
new Runnable() {
@Override
Expand Down
20 changes: 11 additions & 9 deletions ...-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/StreamingSubscriberConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@

import com.google.api.core.AbstractApiService;
import com.google.api.core.ApiClock;
import com.google.api.core.ApiFutureCallback;
import com.google.api.core.ApiFutures;
import com.google.api.core.InternalApi;
import com.google.api.core.SettableApiFuture;
import com.google.api.gax.batching.FlowController;
import com.google.api.gax.core.Distribution;
import com.google.api.gax.grpc.GrpcStatusCode;
Expand All @@ -27,9 +30,7 @@
import com.google.cloud.pubsub.v1.MessageDispatcher.AckProcessor;
import com.google.cloud.pubsub.v1.MessageDispatcher.PendingModifyAckDeadline;
import com.google.common.collect.Lists;
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.SettableFuture;
import com.google.common.util.concurrent.MoreExecutors;
import com.google.protobuf.Empty;
import com.google.pubsub.v1.AcknowledgeRequest;
import com.google.pubsub.v1.ModifyAckDeadlineRequest;
Expand Down Expand Up @@ -127,7 +128,7 @@ protected void doStop() {
private class StreamingPullResponseObserver
implements ClientResponseObserver<StreamingPullRequest, StreamingPullResponse> {

final SettableFuture<Void> errorFuture;
final SettableApiFuture<Void> errorFuture;

/**
* When a batch finsihes processing, we want to request one more batch from the server. But by
Expand All @@ -138,7 +139,7 @@ private class StreamingPullResponseObserver
*/
ClientCallStreamObserver<StreamingPullRequest> thisRequestObserver;

StreamingPullResponseObserver(SettableFuture<Void> errorFuture) {
StreamingPullResponseObserver(SettableApiFuture<Void> errorFuture) {
this.errorFuture = errorFuture;
}

Expand Down Expand Up @@ -186,7 +187,7 @@ public void onCompleted() {
}

private void initialize() {
final SettableFuture<Void> errorFuture = SettableFuture.create();
final SettableApiFuture<Void> errorFuture = SettableApiFuture.create();
final ClientResponseObserver<StreamingPullRequest, StreamingPullResponse> responseObserver =
new StreamingPullResponseObserver(errorFuture);
final ClientCallStreamObserver<StreamingPullRequest> requestObserver =
Expand Down Expand Up @@ -215,9 +216,9 @@ private void initialize() {
lock.unlock();
}

Futures.addCallback(
ApiFutures.addCallback(
errorFuture,
new FutureCallback<Void>() {
new ApiFutureCallback<Void>() {
@Override
public void onSuccess(@Nullable Void result) {
if (!isAlive()) {
Expand Down Expand Up @@ -260,7 +261,8 @@ public void run() {
backoffMillis,
TimeUnit.MILLISECONDS);
}
});
},
MoreExecutors.directExecutor());
}

private boolean isAlive() {
Expand Down