remote: Rewrite Chunker

- Remove the Chunker.Builder and use the Chunker constructors instead.

- Fix a correctness bug, where the chunker would ignore the return value
of InputStream.read(byte[]).

- Have Chunk.getData() return a ByteString as opposed to a byte[]. All
callsides need ByteString objects and this change makes the subsequent
change possible.

- Have the Chunker use a preallocated byte[] in order to avoid
allocating a new one on every call to next().

RELNOTES: None.
PiperOrigin-RevId: 161637158

1 files changed, 2 insertions, 3 deletions

diff --git a/src/tools/remote_worker/src/main/java/com/google/devtools/build/remote/ByteStreamServer.java b/src/tools/remote_worker/src/main/java/com/google/devtools/build/remote/ByteStreamServer.java
index 2c6a1fb343..acc6685bf2 100644
--- a/src/tools/remote_worker/src/main/java/com/google/devtools/build/remote/ByteStreamServer.java
+++ b/src/tools/remote_worker/src/main/java/com/google/devtools/build/remote/ByteStreamServer.java
@@ -29,7 +29,6 @@ import com.google.devtools.build.lib.remote.SimpleBlobStoreActionCache;
 import com.google.devtools.build.lib.vfs.FileSystemUtils;
 import com.google.devtools.build.lib.vfs.Path;
 import com.google.devtools.remoteexecution.v1test.Digest;
-import com.google.protobuf.ByteString;
 import com.google.rpc.Code;
 import com.google.rpc.Status;
 import io.grpc.protobuf.StatusProto;
@@ -80,10 +79,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.Builder().addInput(cache.downloadBlob(digest)).build();
+      Chunker c = new Chunker(cache.downloadBlob(digest));
       while (c.hasNext()) {
         responseObserver.onNext(
-            ReadResponse.newBuilder().setData(ByteString.copyFrom(c.next().getData())).build());
+            ReadResponse.newBuilder().setData(c.next().getData()).build());
       }
       responseObserver.onCompleted();
     } catch (CacheNotFoundException e) {