From e18be0b36ddd5aff3befdb6bd231752c30a1023a Mon Sep 17 00:00:00 2001 From: tomlu Date: Fri, 3 Aug 2018 11:34:23 -0700 Subject: Pass digest to Chunker construction when available. * Refactor Chunker constructor to a builder to reduce constructor overload. * Pass digest into this where we have it * Redo ensureInputsPresent to not lose the missing digests during processing so we can pass them to the Chunker constructor. RELNOTES: None PiperOrigin-RevId: 207297915 --- .../com/google/devtools/build/remote/worker/ByteStreamServer.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/tools') diff --git a/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/ByteStreamServer.java b/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/ByteStreamServer.java index 066d93cf7c..08c4163621 100644 --- a/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/ByteStreamServer.java +++ b/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/ByteStreamServer.java @@ -81,7 +81,10 @@ final class ByteStreamServer extends ByteStreamImplBase { try { // This still relies on the blob size to be small enough to fit in memory. // TODO(olaola): refactor to fix this if the need arises. - Chunker c = new Chunker(getFromFuture(cache.downloadBlob(digest)), digestUtil); + Chunker c = + Chunker.builder(digestUtil) + .setInput(digest, getFromFuture(cache.downloadBlob(digest))) + .build(); while (c.hasNext()) { responseObserver.onNext( ReadResponse.newBuilder().setData(c.next().getData()).build()); -- cgit v1.2.3