commit 33faf91356e0b9d0326f5d0330c2cf7189cf4da1
author Nathan Harmata <nharmata@google.com> Wed Aug 10 19:15:15 2016 +0000
committer Yue Gan <yueg@google.com> Thu Aug 11 09:14:33 2016 +0000
tree 4557d47ca3d098343acc2b94d63f5c48c56cdedc
parent 8a07a959e10040642cdf2e6fa21edcd6a1e9212b

Get rid of InvalidatableGraph. This explicit concept is no longer needed.

--
MOS_MIGRATED_REVID=129895423

src/test/java/com/google/devtools/build/skyframe/NotifyingHelper.java

diff --git a/src/test/java/com/google/devtools/build/skyframe/NotifyingHelper.java b/src/test/java/com/google/devtools/build/skyframe/NotifyingHelper.java
index 655b7f8..ad9a591 100644
--- a/src/test/java/com/google/devtools/build/skyframe/NotifyingHelper.java
+++ b/src/test/java/com/google/devtools/build/skyframe/NotifyingHelper.java
@@ -40,8 +40,8 @@
       }
 
       @Override
-      public InvalidatableGraph transform(InvalidatableGraph graph) {
-        return new NotifyingInvalidatableGraph(graph, listener);
+      public QueryableGraph transform(QueryableGraph graph) {
+        return new NotifyingQueryableGraph(graph, listener);
       }
 
       @Override
@@ -72,39 +72,47 @@
     return entry == null ? null : new NotifyingNodeEntry(key, entry);
   }
 
-  static class NotifyingInvalidatableGraph implements InvalidatableGraph {
-    private final InvalidatableGraph delegate;
-    private final NotifyingHelper notifyingHelper;
+  static class NotifyingQueryableGraph implements QueryableGraph {
+    private final QueryableGraph delegate;
+    protected final NotifyingHelper notifyingHelper;
 
-    NotifyingInvalidatableGraph(InvalidatableGraph delegate, Listener graphListener) {
+    NotifyingQueryableGraph(QueryableGraph delegate, Listener graphListener) {
       this.notifyingHelper = new NotifyingHelper(graphListener);
       this.delegate = delegate;
     }
 
-    NotifyingInvalidatableGraph(InvalidatableGraph delegate, NotifyingHelper helper) {
+    NotifyingQueryableGraph(QueryableGraph delegate, NotifyingHelper helper) {
       this.notifyingHelper = helper;
       this.delegate = delegate;
     }
 
     @Override
-    public Map<SkyKey, NodeEntry> getBatchForInvalidation(Iterable<SkyKey> keys) {
+    public Map<SkyKey, NodeEntry> getBatch(
+        @Nullable SkyKey requestor,
+        Reason reason,
+        Iterable<SkyKey> keys) {
       return Maps.transformEntries(
-          delegate.getBatchForInvalidation(keys),
+          delegate.getBatch(requestor, reason, keys),
           notifyingHelper.wrapEntry);
     }
+
+    @Nullable
+    @Override
+    public NodeEntry get(@Nullable SkyKey requestor, Reason reason, SkyKey key) {
+      return notifyingHelper.wrapEntry(key, delegate.get(requestor, reason, key));
+    }
   }
 
-  static class NotifyingProcessableGraph implements ProcessableGraph {
+  static class NotifyingProcessableGraph
+      extends NotifyingQueryableGraph implements ProcessableGraph {
     protected final ProcessableGraph delegate;
-    protected final NotifyingHelper notifyingHelper;
 
     NotifyingProcessableGraph(ProcessableGraph delegate, Listener graphListener) {
-      this.notifyingHelper = new NotifyingHelper(graphListener);
-      this.delegate = delegate;
+      this(delegate, new NotifyingHelper(graphListener));
     }
 
     NotifyingProcessableGraph(ProcessableGraph delegate, NotifyingHelper helper) {
-      this.notifyingHelper = helper;
+      super(delegate, helper);
       this.delegate = delegate;
     }
 
@@ -123,22 +131,6 @@
           delegate.createIfAbsentBatch(requestor, reason, keys),
           notifyingHelper.wrapEntry);
     }
-
-    @Override
-    public Map<SkyKey, NodeEntry> getBatch(
-        @Nullable SkyKey requestor,
-        Reason reason,
-        Iterable<SkyKey> keys) {
-      return Maps.transformEntries(
-          delegate.getBatch(requestor, reason, keys),
-          notifyingHelper.wrapEntry);
-    }
-
-    @Nullable
-    @Override
-    public NodeEntry get(@Nullable SkyKey requestor, Reason reason, SkyKey key) {
-      return notifyingHelper.wrapEntry(key, delegate.get(requestor, reason, key));
-    }
   }
 
   /**