Change getBatch signature from Set to Iterable since Iterable is all that's needed. Also clean up some lint warnings/unresolved references.

--
MOS_MIGRATED_REVID=92380618

5 files changed, 8 insertions, 14 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/concurrent/BatchedKeyedLocker.java b/src/main/java/com/google/devtools/build/lib/concurrent/BatchedKeyedLocker.java
index d65b3c165d..748262a6fe 100644
--- a/src/main/java/com/google/devtools/build/lib/concurrent/BatchedKeyedLocker.java
+++ b/src/main/java/com/google/devtools/build/lib/concurrent/BatchedKeyedLocker.java
@@ -13,10 +13,7 @@
 // limitations under the License.
 package com.google.devtools.build.lib.concurrent;
 
-import com.google.devtools.build.lib.concurrent.KeyedLocker.AutoUnlocker;
-
 import java.util.Comparator;
-import java.util.Set;
 
 /** A {@link KeyedLocker} that additionally offers batched locking functionality. */
 public interface BatchedKeyedLocker<K> extends KeyedLocker<K> {
@@ -42,5 +39,5 @@ public interface BatchedKeyedLocker<K> extends KeyedLocker<K> {
    *
    * <p>Note that use of this method avoids the concerns described in {@link #lock}.
    */
-  AutoUnlocker lockBatch(Set<K> keys);
+  AutoUnlocker lockBatch(Iterable<K> keys);
 }
diff --git a/src/main/java/com/google/devtools/build/lib/concurrent/RefCountedMultisetKeyedLocker.java b/src/main/java/com/google/devtools/build/lib/concurrent/RefCountedMultisetKeyedLocker.java
index 5cab307e4e..a2e089f6e2 100644
--- a/src/main/java/com/google/devtools/build/lib/concurrent/RefCountedMultisetKeyedLocker.java
+++ b/src/main/java/com/google/devtools/build/lib/concurrent/RefCountedMultisetKeyedLocker.java
@@ -21,7 +21,6 @@ import com.google.common.util.concurrent.Striped;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
-import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -156,7 +155,7 @@ public class RefCountedMultisetKeyedLocker<K> implements BatchedKeyedLocker<K> {
   }
 
   @Override
-  public AutoUnlocker lockBatch(Set<K> keys) {
+  public AutoUnlocker lockBatch(Iterable<K> keys) {
     // This indicates the client did some unsafe casting - not our problem.
     Preconditions.checkNotNull(comparator);
     // We acquire locks in a consistent order. This prevents a deadlock that would otherwise occur
diff --git a/src/main/java/com/google/devtools/build/skyframe/BuildingState.java b/src/main/java/com/google/devtools/build/skyframe/BuildingState.java
index d501c31818..94d37bee5d 100644
--- a/src/main/java/com/google/devtools/build/skyframe/BuildingState.java
+++ b/src/main/java/com/google/devtools/build/skyframe/BuildingState.java
@@ -268,10 +268,10 @@ final class BuildingState {
    * finished is equal to the number of known children.
    *
    * <p>If the node is dirty and checking its deps for changes, this also updates {@link
-   * #dirtyState} as needed -- {@link DirtyState#REBUILDING} if the child has changed,
-   * and {@link DirtyState#VERIFIED_CLEAN} if the child has not changed and this was the last
-   * child to be checked (as determined by {@link #dirtyDirectDepIterator} == null, isReady(), and
-   * a flag set in {@link #getNextDirtyDirectDeps}).
+   * #dirtyState} as needed -- {@link NodeEntry.DirtyState#REBUILDING} if the child has changed,
+   * and {@link NodeEntry.DirtyState#VERIFIED_CLEAN} if the child has not changed and this was the
+   * last child to be checked (as determined by {@link #dirtyDirectDepIterator} == null, isReady(),
+   * and a flag set in {@link #getNextDirtyDirectDeps}).
    *
    * @see NodeEntry#signalDep(Version)
    */
diff --git a/src/main/java/com/google/devtools/build/skyframe/InMemoryGraph.java b/src/main/java/com/google/devtools/build/skyframe/InMemoryGraph.java
index 4f617b1c6f..cabf61ab63 100644
--- a/src/main/java/com/google/devtools/build/skyframe/InMemoryGraph.java
+++ b/src/main/java/com/google/devtools/build/skyframe/InMemoryGraph.java
@@ -23,7 +23,6 @@ import com.google.common.collect.Maps;
 
 import java.util.Collections;
 import java.util.Map;
-import java.util.Set;
 import java.util.concurrent.ConcurrentMap;
 
 import javax.annotation.Nullable;
@@ -59,7 +58,7 @@ public class InMemoryGraph implements ProcessableGraph {
   }
 
   @Override
-  public Map<SkyKey, NodeEntry> getBatch(Set<SkyKey> keys) {
+  public Map<SkyKey, NodeEntry> getBatch(Iterable<SkyKey> keys) {
     ImmutableMap.Builder<SkyKey, NodeEntry> builder = ImmutableMap.builder();
     for (SkyKey key : keys) {
       NodeEntry entry = get(key);
diff --git a/src/main/java/com/google/devtools/build/skyframe/QueryableGraph.java b/src/main/java/com/google/devtools/build/skyframe/QueryableGraph.java
index 83a225db41..6979f425b0 100644
--- a/src/main/java/com/google/devtools/build/skyframe/QueryableGraph.java
+++ b/src/main/java/com/google/devtools/build/skyframe/QueryableGraph.java
@@ -16,7 +16,6 @@ package com.google.devtools.build.skyframe;
 import com.google.devtools.build.lib.concurrent.ThreadSafety.ThreadSafe;
 
 import java.util.Map;
-import java.util.Set;
 
 import javax.annotation.Nullable;
 
@@ -35,5 +34,5 @@ public interface QueryableGraph {
    * Fetches all the given nodes. Returns a map {@code m} such that {@code m.get(k).equals(e)} for
    * all {@code k} such that {@code get(k) == e} and {@code e != null}.
    */
-  Map<SkyKey, NodeEntry> getBatch(Set<SkyKey> keys);
+  Map<SkyKey, NodeEntry> getBatch(Iterable<SkyKey> keys);
 }