From be9ecf97375a93b28d192b904345884da4c864c0 Mon Sep 17 00:00:00 2001
From: olaola <olaola@google.com>
Date: Wed, 20 Sep 2017 21:29:07 +0200
Subject: Removing deprecated field total_input_file_count.

See API Revisions design doc: https://docs.google.com/document/d/12c3oAPgedckLpue2yj0xGgJTEOyUm4mXWWBJ157J-8I/edit#heading=h.llz6ymkp07b1

The BuildInfo is now sent via RequestMetadata.

TESTED=we never used this field
PiperOrigin-RevId: 169432884
---
 .../build/lib/remote/RemoteSpawnRunner.java         | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnRunner.java b/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnRunner.java
index f4babd76a1..6fcce64ad0 100644
--- a/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnRunner.java
+++ b/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnRunner.java
@@ -173,7 +173,13 @@ class RemoteSpawnRunner implements SpawnRunner {
 
       final ActionResult result;
       try {
-        result = executeRemotely(action, inputMap.size(), acceptCachedResult);
+        ExecuteRequest.Builder request =
+            ExecuteRequest.newBuilder()
+                .setInstanceName(options.remoteInstanceName)
+                .setAction(action)
+                .setSkipCacheLookup(!acceptCachedResult);
+        ExecuteResponse reply = remoteExecutor.executeRemotely(request.build());
+        result = reply.getResult();
       } catch (IOException e) {
         return execLocallyOrFail(spawn, policy, inputMap, actionKey, uploadLocalResults, e);
       }
@@ -202,19 +208,6 @@ class RemoteSpawnRunner implements SpawnRunner {
         .build();
   }
 
-  private ActionResult executeRemotely(Action action, int numInputFiles, boolean acceptCachedResult)
-      throws IOException, InterruptedException {
-    // TODO(olaola): set BuildInfo and input total bytes as well.
-    ExecuteRequest.Builder request =
-        ExecuteRequest.newBuilder()
-            .setInstanceName(options.remoteInstanceName)
-            .setAction(action)
-            .setTotalInputFileCount(numInputFiles)
-            .setSkipCacheLookup(!acceptCachedResult);
-    ExecuteResponse reply = remoteExecutor.executeRemotely(request.build());
-    return reply.getResult();
-  }
-
   private SpawnResult execLocallyOrFail(
       Spawn spawn,
       SpawnExecutionPolicy policy,
-- 
cgit v1.2.3