Remove BasicFilesystemDirtinessChecker in favor of UnionDirtinessChecker.

PiperOrigin-RevId: 529817592
Change-Id: I89f2e4293388fce72c7f9a91a4fdcc08e6c5eb69

Author: Googler

src/main/java/com/google/devtools/build/lib/skyframe/DirtinessCheckerUtils.java

@@ -79,49 +79,39 @@ public SkyValue createNewValue(
     }
   }
 
-  /** Checks dirtiness of filesystem keys in the graph. */
-  public static class BasicFilesystemDirtinessChecker extends SkyValueDirtinessChecker {
-    private final FileDirtinessChecker fdc = new FileDirtinessChecker();
-    private final DirectoryDirtinessChecker ddc = new DirectoryDirtinessChecker();
-    private final UnionDirtinessChecker checker =
-        new UnionDirtinessChecker(ImmutableList.of(fdc, ddc));
-
-    @Override
-    public boolean applies(SkyKey skyKey) {
-      return fdc.applies(skyKey) || ddc.applies(skyKey);
-    }
-
-    @Override
-    @Nullable
-    public SkyValue createNewValue(
-        SkyKey key, SyscallCache syscallCache, @Nullable TimestampGranularityMonitor tsgm) {
-      return checker.createNewValue(key, syscallCache, tsgm);
-    }
-  }
-
-  static final class MissingDiffDirtinessChecker extends BasicFilesystemDirtinessChecker {
+  static final class MissingDiffDirtinessChecker extends SkyValueDirtinessChecker {
     private final Set<Root> missingDiffPackageRoots;
+    private final UnionDirtinessChecker checker = createBasicFilesystemDirtinessChecker();
 
     MissingDiffDirtinessChecker(Set<Root> missingDiffPackageRoots) {
       this.missingDiffPackageRoots = missingDiffPackageRoots;
     }
 
     @Override
     public boolean applies(SkyKey key) {
-      return super.applies(key)
+      return checker.applies(key)
           && missingDiffPackageRoots.contains(((RootedPath) key.argument()).getRoot());
     }
+
+    @Nullable
+    @Override
+    public SkyValue createNewValue(
+        SkyKey key, SyscallCache syscallCache, @Nullable TimestampGranularityMonitor tsgm) {
+      return checker.createNewValue(key, syscallCache, tsgm);
+    }
   }
 
   /**
    * Serves for tracking whether there are external and output files {@see ExternalFilesKnowledge}.
    * Filtering of files, for which the new values should not be injected into evaluator, is done in
    * SequencedSkyframeExecutor.handleChangedFiles().
    */
-  static final class ExternalDirtinessChecker extends BasicFilesystemDirtinessChecker {
+  static final class ExternalDirtinessChecker extends SkyValueDirtinessChecker {
     private final ExternalFilesHelper externalFilesHelper;
     private final EnumSet<FileType> fileTypesToCheck;
 
+    private final UnionDirtinessChecker checker = createBasicFilesystemDirtinessChecker();
+
     ExternalDirtinessChecker(ExternalFilesHelper externalFilesHelper,
         EnumSet<FileType> fileTypesToCheck) {
       this.externalFilesHelper = externalFilesHelper;
@@ -130,7 +120,7 @@ static final class ExternalDirtinessChecker extends BasicFilesystemDirtinessChec
 
     @Override
     public boolean applies(SkyKey key) {
-      if (!super.applies(key)) {
+      if (!checker.applies(key)) {
         return false;
       }
       FileType fileType = externalFilesHelper.getAndNoteFileType((RootedPath) key.argument());
@@ -153,7 +143,7 @@ public SkyValueDirtinessChecker.DirtyResult check(
       FileType fileType = externalFilesHelper.getAndNoteFileType((RootedPath) skyKey.argument());
       boolean cacheable = isCacheableType(fileType);
       SkyValue newValue =
-          super.createNewValue(skyKey, cacheable ? syscallCache : SyscallCache.NO_CACHE, tsgm);
+          checker.createNewValue(skyKey, cacheable ? syscallCache : SyscallCache.NO_CACHE, tsgm);
       if (Objects.equal(newValue, oldValue)) {
         return SkyValueDirtinessChecker.DirtyResult.notDirty();
       }
@@ -180,6 +170,11 @@ private static boolean isCacheableType(FileType fileType) {
     }
   }
 
+  static UnionDirtinessChecker createBasicFilesystemDirtinessChecker() {
+    return new UnionDirtinessChecker(
+        ImmutableList.of(new FileDirtinessChecker(), new DirectoryDirtinessChecker()));
+  }
+
   /** {@link SkyValueDirtinessChecker} that encompasses a union of other dirtiness checkers. */
   public static final class UnionDirtinessChecker extends SkyValueDirtinessChecker {
     private final Iterable<SkyValueDirtinessChecker> dirtinessCheckers;

src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java

@@ -183,7 +183,6 @@
 import com.google.devtools.build.lib.skyframe.BuildDriverFunction.ActionLookupValuesCollectionResult;
 import com.google.devtools.build.lib.skyframe.BuildDriverFunction.TransitiveActionLookupValuesHelper;
 import com.google.devtools.build.lib.skyframe.DiffAwarenessManager.ProcessableModifiedFileSet;
-import com.google.devtools.build.lib.skyframe.DirtinessCheckerUtils.BasicFilesystemDirtinessChecker;
 import com.google.devtools.build.lib.skyframe.DirtinessCheckerUtils.ExternalDirtinessChecker;
 import com.google.devtools.build.lib.skyframe.DirtinessCheckerUtils.MissingDiffDirtinessChecker;
 import com.google.devtools.build.lib.skyframe.DirtinessCheckerUtils.UnionDirtinessChecker;
@@ -2246,7 +2245,9 @@ protected void invalidateFilesUnderPathForTestingImpl(
     if (modifiedFileSet.treatEverythingAsModified()) {
       diff =
           new FilesystemValueChecker(tsgm, syscallCache, /* numThreads= */ 200)
-              .getDirtyKeys(memoizingEvaluator.getValues(), new BasicFilesystemDirtinessChecker());
+              .getDirtyKeys(
+                  memoizingEvaluator.getValues(),
+                  DirtinessCheckerUtils.createBasicFilesystemDirtinessChecker());
     } else {
       diff = getDiff(tsgm, modifiedFileSet, pathEntry, /* fsvcThreads= */ 200);
     }

src/test/java/com/google/devtools/build/lib/skyframe/FilesystemValueCheckerTest.java

@@ -55,7 +55,6 @@
 import com.google.devtools.build.lib.io.FileSymlinkInfiniteExpansionUniquenessFunction;
 import com.google.devtools.build.lib.packages.WorkspaceFileValue;
 import com.google.devtools.build.lib.pkgcache.PathPackageLocator;
-import com.google.devtools.build.lib.skyframe.DirtinessCheckerUtils.BasicFilesystemDirtinessChecker;
 import com.google.devtools.build.lib.skyframe.ExternalFilesHelper.ExternalFileAction;
 import com.google.devtools.build.lib.skyframe.FilesystemValueChecker.ModifiedOutputsReceiver;
 import com.google.devtools.build.lib.skyframe.PackageFunction.GlobbingStrategy;
@@ -1759,6 +1758,7 @@ public long getNodeId() throws IOException {
 
   private static Diff getDirtyFilesystemKeys(
       MemoizingEvaluator evaluator, FilesystemValueChecker checker) throws InterruptedException {
-    return checker.getDirtyKeys(evaluator.getValues(), new BasicFilesystemDirtinessChecker());
+    return checker.getDirtyKeys(
+        evaluator.getValues(), DirtinessCheckerUtils.createBasicFilesystemDirtinessChecker());
   }
 }

src/test/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutorTest.java

@@ -108,7 +108,6 @@
 import com.google.devtools.build.lib.server.FailureDetails.FailureDetail;
 import com.google.devtools.build.lib.server.FailureDetails.Spawn;
 import com.google.devtools.build.lib.server.FailureDetails.Spawn.Code;
-import com.google.devtools.build.lib.skyframe.DirtinessCheckerUtils.BasicFilesystemDirtinessChecker;
 import com.google.devtools.build.lib.skyframe.SkyframeActionExecutor.ActionCompletedReceiver;
 import com.google.devtools.build.lib.skyframe.SkyframeActionExecutor.ProgressSupplier;
 import com.google.devtools.build.lib.skyframe.TopLevelStatusEvents.TopLevelTargetBuiltEvent;
@@ -647,7 +646,8 @@ private ImmutableList<SkyKey> dirtyValues() throws InterruptedException {
                 SyscallCache.NO_CACHE,
                 /* numThreads= */ 20)
             .getDirtyKeys(
-                skyframeExecutor.getEvaluator().getValues(), new BasicFilesystemDirtinessChecker());
+                skyframeExecutor.getEvaluator().getValues(),
+                DirtinessCheckerUtils.createBasicFilesystemDirtinessChecker());
     return ImmutableList.<SkyKey>builder()
         .addAll(diff.changedKeysWithoutNewValues())
         .addAll(diff.changedKeysWithNewValues().keySet())