Refactor QueryableGraph and ThinNodeQueryableGraph to be independent interfaces, in preparation for further changes. -- MOS_MIGRATED_REVID=126924789
diff --git a/src/main/java/com/google/devtools/build/skyframe/EagerInvalidator.java b/src/main/java/com/google/devtools/build/skyframe/EagerInvalidator.java index bb6d2b2..b7c1ee9 100644 --- a/src/main/java/com/google/devtools/build/skyframe/EagerInvalidator.java +++ b/src/main/java/com/google/devtools/build/skyframe/EagerInvalidator.java
@@ -43,9 +43,14 @@ * long as the full upward transitive closure of the nodes is specified for deletion, the graph * remains consistent. */ - public static void delete(DirtiableGraph graph, Iterable<SkyKey> diff, - EvaluationProgressReceiver invalidationReceiver, InvalidationState state, - boolean traverseGraph, DirtyKeyTracker dirtyKeyTracker) throws InterruptedException { + public static void delete( + InMemoryGraph graph, + Iterable<SkyKey> diff, + EvaluationProgressReceiver invalidationReceiver, + InvalidationState state, + boolean traverseGraph, + DirtyKeyTracker dirtyKeyTracker) + throws InterruptedException { DeletingNodeVisitor visitor = createDeletingVisitorIfNeeded( graph, diff, invalidationReceiver, state, traverseGraph, dirtyKeyTracker); @@ -56,7 +61,7 @@ @Nullable static DeletingNodeVisitor createDeletingVisitorIfNeeded( - DirtiableGraph graph, + InMemoryGraph graph, Iterable<SkyKey> diff, EvaluationProgressReceiver invalidationReceiver, InvalidationState state, @@ -70,7 +75,7 @@ @Nullable static DirtyingNodeVisitor createInvalidatingVisitorIfNeeded( - ThinNodeQueryableGraph graph, + InvalidatableGraph graph, Iterable<SkyKey> diff, EvaluationProgressReceiver invalidationReceiver, InvalidationState state, @@ -84,7 +89,7 @@ @Nullable private static DirtyingNodeVisitor createInvalidatingVisitorIfNeeded( - ThinNodeQueryableGraph graph, + InvalidatableGraph graph, Iterable<SkyKey> diff, EvaluationProgressReceiver invalidationReceiver, InvalidationState state, @@ -110,7 +115,7 @@ * an executor constructed with the provided factory. */ public static void invalidate( - ThinNodeQueryableGraph graph, + InvalidatableGraph graph, Iterable<SkyKey> diff, EvaluationProgressReceiver invalidationReceiver, InvalidationState state, @@ -130,7 +135,7 @@ * the provided {@link ForkJoinPool}. */ public static void invalidate( - ThinNodeQueryableGraph graph, + InvalidatableGraph graph, Iterable<SkyKey> diff, EvaluationProgressReceiver invalidationReceiver, InvalidationState state, @@ -154,11 +159,9 @@ } } - /** - * Invalidates given values and their upward transitive closure in the graph. - */ + /** Invalidates given values and their upward transitive closure in the graph. */ public static void invalidate( - DirtiableGraph graph, + InvalidatableGraph graph, Iterable<SkyKey> diff, EvaluationProgressReceiver invalidationReceiver, InvalidationState state,