-
Notifications
You must be signed in to change notification settings - Fork 1.2k
feat(gax): implement baseline Callable and Future for resumable uploads #14241
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.
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
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| /* | ||
| * Copyright 2026 Google LLC | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions are | ||
| * met: | ||
| * | ||
| * * Redistributions of source code must retain the above copyright | ||
| * notice, this list of conditions and the following disclaimer. | ||
| * * Redistributions in binary form must reproduce the above | ||
| * copyright notice, this list of conditions and the following disclaimer | ||
| * in the documentation and/or other materials provided with the | ||
| * distribution. | ||
| * * Neither the name of Google LLC nor the names of its | ||
| * contributors may be used to endorse or promote products derived from | ||
| * this software without specific prior written permission. | ||
| * | ||
| * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
| * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
| * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | ||
| * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | ||
| * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
| * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
| * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
| * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
| * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
| * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| */ | ||
| package com.google.api.gax.rpc; | ||
|
|
||
| import static com.google.common.base.Preconditions.checkNotNull; | ||
|
|
||
| import com.google.api.core.ApiFuture; | ||
| import com.google.api.core.ApiFutures; | ||
| import com.google.api.core.BetaApi; | ||
| import com.google.api.core.InternalApi; | ||
| import com.google.api.gax.resumable.ResumableUploadClient; | ||
| import com.google.api.gax.resumable.ResumableUploadSession; | ||
| import java.io.InputStream; | ||
| import org.jspecify.annotations.NullMarked; | ||
| import org.jspecify.annotations.Nullable; | ||
|
|
||
| /** | ||
| * Concrete implementation of {@link ResumableUploadCallable} that delegates the end-to-end | ||
| * management of a resumable upload session to {@link ResumableUploadFutureImpl}. | ||
| * | ||
| * @param <RequestT> the type of the initial request message that initiates the upload session | ||
| * @param <ResponseT> the type of the final response message returned once the upload completes | ||
| */ | ||
| @BetaApi | ||
| @InternalApi | ||
| @NullMarked | ||
| public class ResumableUploadCallableImpl<RequestT, ResponseT> | ||
|
Check warning on line 54 in sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/rpc/ResumableUploadCallableImpl.java
|
||
| extends ResumableUploadCallable<RequestT, ResponseT> { | ||
|
|
||
| private final ResumableUploadClient<RequestT, ResponseT> client; | ||
| private final ResumableUploadCallSettings defaultCallSettings; | ||
| private final ClientContext clientContext; | ||
|
|
||
| public ResumableUploadCallableImpl( | ||
| ResumableUploadClient<RequestT, ResponseT> client, | ||
| ResumableUploadCallSettings defaultCallSettings, | ||
| ClientContext clientContext) { | ||
| this.client = checkNotNull(client, "client must not be null"); | ||
| this.defaultCallSettings = | ||
| checkNotNull(defaultCallSettings, "defaultCallSettings must not be null"); | ||
| this.clientContext = checkNotNull(clientContext, "clientContext must not be null"); | ||
| } | ||
|
|
||
| @Override | ||
| public ResumableUploadFuture<ResponseT> futureCall( | ||
| RequestT request, InputStream payload, @Nullable ResumableUploadCallSettings settings) { | ||
| checkNotNull(request, "request must not be null"); | ||
| checkNotNull(payload, "payload must not be null"); | ||
| ResumableUploadCallSettings effectiveSettings = defaultCallSettings.merge(settings); | ||
|
|
||
| ApiFuture<ResumableUploadSession> startFuture; | ||
| try { | ||
| startFuture = | ||
| client.startUploadCallable().futureCall(request, clientContext.getDefaultCallContext()); | ||
| } catch (Throwable t) { | ||
|
Check warning on line 82 in sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/rpc/ResumableUploadCallableImpl.java
|
||
| startFuture = ApiFutures.immediateFailedFuture(t); | ||
| } | ||
|
|
||
| return ResumableUploadFutureImpl.create( | ||
| startFuture, | ||
| client.uploadChunkCallable(), | ||
| payload, | ||
| effectiveSettings, | ||
| clientContext.getDefaultCallContext()); | ||
| } | ||
|
|
||
| @Override | ||
| public ResumableUploadFuture<ResponseT> resumeCall( | ||
| String sessionUrl, InputStream payload, @Nullable ResumableUploadCallSettings settings) { | ||
| throw new UnsupportedOperationException("Session resumption is not yet implemented."); | ||
| } | ||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,165 @@ | ||
| /* | ||
| * Copyright 2026 Google LLC | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions are | ||
| * met: | ||
| * | ||
| * * Redistributions of source code must retain the above copyright | ||
| * notice, this list of conditions and the following disclaimer. | ||
| * * Redistributions in binary form must reproduce the above | ||
| * copyright notice, this list of conditions and the following disclaimer | ||
| * in the documentation and/or other materials provided with the | ||
| * distribution. | ||
| * * Neither the name of Google LLC nor the names of its | ||
| * contributors may be used to endorse or promote products derived from | ||
| * this software without specific prior written permission. | ||
| * | ||
| * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
| * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
| * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | ||
| * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | ||
| * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
| * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
| * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
| * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
| * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
| * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| */ | ||
| package com.google.api.gax.rpc; | ||
|
|
||
| import static com.google.common.base.Preconditions.checkNotNull; | ||
|
|
||
| import com.google.api.core.ApiFuture; | ||
| import com.google.api.core.ApiFutureCallback; | ||
| import com.google.api.core.ApiFutures; | ||
| import com.google.api.core.InternalApi; | ||
| import com.google.api.gax.resumable.ChunkUploadRequest; | ||
| import com.google.api.gax.resumable.ChunkUploadResponse; | ||
| import com.google.common.io.ByteStreams; | ||
| import com.google.common.util.concurrent.MoreExecutors; | ||
| import java.io.IOException; | ||
| import java.io.InputStream; | ||
| import java.util.Arrays; | ||
| import java.util.concurrent.CancellationException; | ||
| import org.jspecify.annotations.NullMarked; | ||
|
|
||
| /** | ||
| * Coordinates chunk transmission steps of a resumable upload session. | ||
| * | ||
| * @param <ResponseT> the type of the final response message returned once the upload completes | ||
| */ | ||
| @InternalApi | ||
| @NullMarked | ||
| final class ResumableUploadChunkCoordinator<ResponseT> { | ||
|
Check warning on line 55 in sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/rpc/ResumableUploadChunkCoordinator.java
|
||
|
|
||
| private static final byte[] EMPTY_PAYLOAD = new byte[0]; | ||
|
|
||
| private final UnaryCallable<ChunkUploadRequest, ChunkUploadResponse<ResponseT>> | ||
| uploadChunkCallable; | ||
| private final String uploadUrl; | ||
| private final InputStream payload; | ||
| private final byte[] buffer; | ||
| private final int chunkSize; | ||
| private final ApiCallContext callContext; | ||
| private final ResumableUploadFutureImpl<ResponseT> sessionFuture; | ||
|
|
||
| ResumableUploadChunkCoordinator( | ||
| UnaryCallable<ChunkUploadRequest, ChunkUploadResponse<ResponseT>> uploadChunkCallable, | ||
| String uploadUrl, | ||
| InputStream payload, | ||
| int chunkSize, | ||
| ApiCallContext callContext, | ||
| ResumableUploadFutureImpl<ResponseT> sessionFuture) { | ||
| this.uploadChunkCallable = | ||
| checkNotNull(uploadChunkCallable, "uploadChunkCallable must not be null"); | ||
| this.uploadUrl = checkNotNull(uploadUrl, "uploadUrl must not be null"); | ||
| this.payload = checkNotNull(payload, "payload must not be null"); | ||
| this.chunkSize = chunkSize; | ||
| this.callContext = checkNotNull(callContext, "callContext must not be null"); | ||
| this.sessionFuture = checkNotNull(sessionFuture, "sessionFuture must not be null"); | ||
| this.buffer = new byte[chunkSize]; | ||
| } | ||
|
|
||
| void start() { | ||
| transmitChunk(0L); | ||
| } | ||
|
|
||
| private void transmitChunk(long currentOffset) { | ||
| // Abort if the session was already completed or canceled. | ||
| if (sessionFuture.isDone()) { | ||
| return; | ||
| } | ||
|
|
||
| // Read the next chunk slice from the payload stream. | ||
| int bytesRead; | ||
| try { | ||
| bytesRead = ByteStreams.read(payload, buffer, 0, chunkSize); | ||
| } catch (IOException e) { | ||
| sessionFuture.fail(e); | ||
| return; | ||
| } | ||
|
|
||
| // Determine if this is the final chunk and build the chunk request. | ||
| boolean isFinal = bytesRead < chunkSize; | ||
| byte[] chunkPayload; | ||
| if (bytesRead == chunkSize) { | ||
| chunkPayload = buffer; | ||
| } else if (bytesRead == 0) { | ||
| chunkPayload = EMPTY_PAYLOAD; | ||
| } else { | ||
| chunkPayload = Arrays.copyOf(buffer, bytesRead); | ||
| } | ||
|
|
||
| ChunkUploadRequest chunkRequest = | ||
| ChunkUploadRequest.newBuilder() | ||
| .setUploadUrl(uploadUrl) | ||
| .setPayload(chunkPayload) | ||
| .setOffset(currentOffset) | ||
| .setFinal(isFinal) | ||
| .build(); | ||
|
|
||
| // Dispatch the chunk upload call and register the in-flight future for cancellation. | ||
| long chunkLength = chunkPayload.length; | ||
| try { | ||
| ApiFuture<ChunkUploadResponse<ResponseT>> chunkFuture = | ||
| uploadChunkCallable.futureCall(chunkRequest, callContext); | ||
| sessionFuture.setInFlightFuture(chunkFuture); | ||
|
|
||
| // Asynchronously handle the response: complete, fail, or chain the next chunk. | ||
| ApiFutures.addCallback( | ||
| chunkFuture, | ||
| new ApiFutureCallback<ChunkUploadResponse<ResponseT>>() { | ||
| @Override | ||
| public void onSuccess(ChunkUploadResponse<ResponseT> response) { | ||
| if (sessionFuture.isDone()) { | ||
| return; | ||
| } | ||
| long nextOffset = currentOffset + chunkLength; | ||
| if (response.isComplete()) { | ||
| sessionFuture.succeed(response.getResponse()); | ||
| } else if (isFinal) { | ||
| sessionFuture.fail( | ||
| new IllegalStateException( | ||
| "Upload stream ended and final chunk was transmitted, but server returned" | ||
| + " incomplete status")); | ||
| } else { | ||
| transmitChunk(nextOffset); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void onFailure(Throwable t) { | ||
| if (t instanceof CancellationException || sessionFuture.isDone()) { | ||
| return; | ||
| } | ||
| sessionFuture.fail(t); | ||
| } | ||
| }, | ||
| MoreExecutors.directExecutor()); | ||
| } catch (Throwable t) { | ||
|
Check warning on line 161 in sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/rpc/ResumableUploadChunkCoordinator.java
|
||
| sessionFuture.fail(t); | ||
| } | ||
| } | ||
| } | ||
Uh oh!
There was an error while loading. Please reload this page.