Remove unused uploadBlob() method

buchgr · copybara-github · commit d40933d479df · 2019-07-31T06:41:22.000-07:00
Closes #9021. PiperOrigin-RevId: 260915945
diff --git a/src/main/java/com/google/devtools/build/lib/remote/GrpcRemoteCache.java b/src/main/java/com/google/devtools/build/lib/remote/GrpcRemoteCache.java
@@ -477,19 +477,7 @@ private Digest uploadFileContents(Path file) throws IOException, InterruptedExce
     }
     return digest;
   }
-
-  Digest uploadBlob(byte[] blob) throws IOException, InterruptedException {
-    Digest digest = digestUtil.compute(blob);
-    ImmutableSet<Digest> missing = getMissingDigests(ImmutableList.of(digest));
-    if (!missing.isEmpty()) {
-      uploader.uploadBlob(
-          HashCode.fromString(digest.getHash()),
-          Chunker.builder().setInput(blob).build(),
-          /* forceUpload=*/ true);
-    }
-    return digest;
-  }
-
+  
   // Execution Cache API
 
   @Override
diff --git a/src/test/java/com/google/devtools/build/lib/remote/GrpcRemoteCacheTest.java b/src/test/java/com/google/devtools/build/lib/remote/GrpcRemoteCacheTest.java
@@ -443,73 +443,6 @@ public void testDownloadDirectoryNested() throws Exception {
     assertThat(execRoot.getRelative("a/bar/wobble/qux").isExecutable()).isFalse();
   }
 
-  @Test
-  public void testUploadBlobCacheHitWithRetries() throws Exception {
-    final GrpcRemoteCache client = newClient();
-    final Digest digest = DIGEST_UTIL.computeAsUtf8("abcdefg");
-    serviceRegistry.addService(
-        new ContentAddressableStorageImplBase() {
-          private int numErrors = 4;
-
-          @Override
-          public void findMissingBlobs(
-              FindMissingBlobsRequest request,
-              StreamObserver<FindMissingBlobsResponse> responseObserver) {
-            if (numErrors-- <= 0) {
-              responseObserver.onNext(FindMissingBlobsResponse.getDefaultInstance());
-              responseObserver.onCompleted();
-            } else {
-              responseObserver.onError(Status.UNAVAILABLE.asRuntimeException());
-            }
-          }
-        });
-    assertThat(client.uploadBlob("abcdefg".getBytes(UTF_8))).isEqualTo(digest);
-  }
-
-  @Test
-  public void testUploadBlobSingleChunk() throws Exception {
-    final GrpcRemoteCache client = newClient();
-    final Digest digest = DIGEST_UTIL.computeAsUtf8("abcdefg");
-    serviceRegistry.addService(
-        new ContentAddressableStorageImplBase() {
-          @Override
-          public void findMissingBlobs(
-              FindMissingBlobsRequest request,
-              StreamObserver<FindMissingBlobsResponse> responseObserver) {
-            responseObserver.onNext(
-                FindMissingBlobsResponse.newBuilder().addMissingBlobDigests(digest).build());
-            responseObserver.onCompleted();
-          }
-        });
-    serviceRegistry.addService(
-        new ByteStreamImplBase() {
-          @Override
-          public StreamObserver<WriteRequest> write(
-              final StreamObserver<WriteResponse> responseObserver) {
-            return new StreamObserver<WriteRequest>() {
-              @Override
-              public void onNext(WriteRequest request) {
-                assertThat(request.getResourceName()).contains(digest.getHash());
-                assertThat(request.getFinishWrite()).isTrue();
-                assertThat(request.getData().toStringUtf8()).isEqualTo("abcdefg");
-              }
-
-              @Override
-              public void onCompleted() {
-                responseObserver.onNext(WriteResponse.newBuilder().setCommittedSize(7).build());
-                responseObserver.onCompleted();
-              }
-
-              @Override
-              public void onError(Throwable t) {
-                fail("An error occurred: " + t);
-              }
-            };
-          }
-        });
-    assertThat(client.uploadBlob("abcdefg".getBytes(UTF_8))).isEqualTo(digest);
-  }
-
   static class TestChunkedRequestObserver implements StreamObserver<WriteRequest> {
     private final StreamObserver<WriteResponse> responseObserver;
     private final String contents;
@@ -559,46 +492,6 @@ public void onError(Throwable t) {
     }
   }
 
-  private Answer<StreamObserver<WriteRequest>> blobChunkedWriteAnswer(
-      final String contents, final int chunkSize) {
-    return new Answer<StreamObserver<WriteRequest>>() {
-      @Override
-      @SuppressWarnings("unchecked")
-      public StreamObserver<WriteRequest> answer(InvocationOnMock invocation) {
-        return new TestChunkedRequestObserver(
-            (StreamObserver<WriteResponse>) invocation.getArguments()[0], contents, chunkSize);
-      }
-    };
-  }
-
-  @Test
-  public void testUploadBlobMultipleChunks() throws Exception {
-    final Digest digest = DIGEST_UTIL.computeAsUtf8("abcdef");
-    serviceRegistry.addService(
-        new ContentAddressableStorageImplBase() {
-          @Override
-          public void findMissingBlobs(
-              FindMissingBlobsRequest request,
-              StreamObserver<FindMissingBlobsResponse> responseObserver) {
-            responseObserver.onNext(
-                FindMissingBlobsResponse.newBuilder().addMissingBlobDigests(digest).build());
-            responseObserver.onCompleted();
-          }
-        });
-
-    ByteStreamImplBase mockByteStreamImpl = Mockito.mock(ByteStreamImplBase.class);
-    serviceRegistry.addService(mockByteStreamImpl);
-    for (int chunkSize = 1; chunkSize <= 6; ++chunkSize) {
-      GrpcRemoteCache client = newClient();
-      Chunker.setDefaultChunkSizeForTesting(chunkSize);
-      when(mockByteStreamImpl.write(ArgumentMatchers.<StreamObserver<WriteResponse>>any()))
-          .thenAnswer(blobChunkedWriteAnswer("abcdef", chunkSize));
-      assertThat(client.uploadBlob("abcdef".getBytes(UTF_8))).isEqualTo(digest);
-    }
-    Mockito.verify(mockByteStreamImpl, Mockito.times(6))
-        .write(ArgumentMatchers.<StreamObserver<WriteResponse>>any());
-  }
-
   @Test
   public void testUploadDirectory() throws Exception {
     final GrpcRemoteCache client = newClient();
