Replace MemoizingEvaluator#getGraphMap with #getGraphEntries to accommodate implementations that may not have access to a map.
PiperOrigin-RevId: 234316546
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
index a94ea91..69193b3 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
@@ -936,7 +936,7 @@
try (AutoProfiler p = AutoProfiler.logged("discarding analysis cache", logger)) {
lastAnalysisDiscarded = true;
Iterator<? extends Map.Entry<SkyKey, ? extends NodeEntry>> it =
- memoizingEvaluator.getGraphMap().entrySet().iterator();
+ memoizingEvaluator.getGraphEntries().iterator();
while (it.hasNext()) {
Map.Entry<SkyKey, ? extends NodeEntry> keyAndEntry = it.next();
NodeEntry entry = keyAndEntry.getValue();
diff --git a/src/main/java/com/google/devtools/build/skyframe/InMemoryMemoizingEvaluator.java b/src/main/java/com/google/devtools/build/skyframe/InMemoryMemoizingEvaluator.java
index 4c05231..2616646 100644
--- a/src/main/java/com/google/devtools/build/skyframe/InMemoryMemoizingEvaluator.java
+++ b/src/main/java/com/google/devtools/build/skyframe/InMemoryMemoizingEvaluator.java
@@ -295,8 +295,8 @@
}
@Override
- public Map<SkyKey, ? extends NodeEntry> getGraphMap() {
- return graph.getAllValuesMutable();
+ public Iterable<? extends Map.Entry<SkyKey, ? extends NodeEntry>> getGraphEntries() {
+ return graph.getAllValuesMutable().entrySet();
}
@Override
diff --git a/src/main/java/com/google/devtools/build/skyframe/MemoizingEvaluator.java b/src/main/java/com/google/devtools/build/skyframe/MemoizingEvaluator.java
index 21a1032..28bb150 100644
--- a/src/main/java/com/google/devtools/build/skyframe/MemoizingEvaluator.java
+++ b/src/main/java/com/google/devtools/build/skyframe/MemoizingEvaluator.java
@@ -88,10 +88,10 @@
/**
* Returns the node entries in the graph. Should only be called between evaluations. The returned
- * map is mutable, but do not mutate it unless you know what you are doing! Naively deleting an
- * entry will break graph invariants and cause a crash.
+ * iterable is mutable, but do not mutate it unless you know what you are doing! Naively deleting
+ * an entry will break graph invariants and cause a crash.
*/
- Map<SkyKey, ? extends NodeEntry> getGraphMap();
+ Iterable<? extends Map.Entry<SkyKey, ? extends NodeEntry>> getGraphEntries();
/**
* Informs the evaluator that a sequence of evaluations at the same version has finished.
