Remove unused methods

bazelbuild · Sep 17, 2024 · a962ffa · a962ffa
1 parent 9d7d8ec
commit a962ffa
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 41 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/actions/ActionExecutionContext.java b/src/main/java/com/google/devtools/build/lib/actions/ActionExecutionContext.java
@@ -95,11 +95,6 @@ public NestedSet<Artifact> getArtifactsAtCanonicalLocationsForLogging() {
       return wrapped.getArtifactsAtCanonicalLocationsForLogging();
     }
 
-    @Override
-    public Map<PathFragment, Artifact> getAllSymlinksForLogging() {
-      return wrapped.getAllSymlinksForLogging();
-    }
-
     @Override
     public Iterable<PathFragment> getEmptyFilenamesForLogging() {
       return wrapped.getEmptyFilenamesForLogging();

diff --git a/src/main/java/com/google/devtools/build/lib/actions/RunfilesTree.java b/src/main/java/com/google/devtools/build/lib/actions/RunfilesTree.java
@@ -55,12 +55,6 @@ public interface RunfilesTree {
    */
   NestedSet<Artifact> getArtifactsAtCanonicalLocationsForLogging();
 
-  /**
-   * Returns the mapping from the location in the runfiles tree to the artifact that's there for
-   * symlinks and root symlinks.
-   */
-  Map<PathFragment, Artifact> getAllSymlinksForLogging();
-
   /**
    * Returns the set of names of implicit empty files to materialize.
    *
@@ -69,10 +63,13 @@ public interface RunfilesTree {
    */
   Iterable<PathFragment> getEmptyFilenamesForLogging();
 
+  /** Returns the set of custom symlink entries. */
   NestedSet<SymlinkEntry> getSymlinksForLogging();
 
+  /** Returns the set of root symlinks. */
   NestedSet<SymlinkEntry> getRootSymlinksForLogging();
 
+  /** Returns the repo mapping manifest if it exists. */
   @Nullable
   Artifact getRepoMappingManifestForLogging();
 

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/Runfiles.java b/src/main/java/com/google/devtools/build/lib/analysis/Runfiles.java
@@ -385,21 +385,6 @@ public Map<PathFragment, Artifact> getRunfilesInputs(
     return builder.build();
   }
 
-  public Map<PathFragment, Artifact> getAllSymlinksForLogging(
-      @Nullable Artifact repoMappingManifest) {
-    ManifestBuilder builder = new ManifestBuilder(suffix, legacyExternalRunfiles);
-    // Avoid creating the empty <workspace>/.runfile file as the workspace runfiles directory may
-    // be implicitly created by non-symlink runfiles.
-    builder.sawWorkspaceName = true;
-    ConflictChecker checker = ConflictChecker.IGNORE_CHECKER;
-    builder.addUnderWorkspace(getSymlinksAsMap(checker), checker);
-    builder.add(getRootSymlinksAsMap(checker), checker);
-    if (repoMappingManifest != null) {
-      checker.put(builder.manifest, REPO_MAPPING_MANIFEST_PATH, repoMappingManifest);
-    }
-    return builder.build();
-  }
-
   public boolean isLegacyExternalRunfiles() {
     return legacyExternalRunfiles;
   }

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/RunfilesSupport.java b/src/main/java/com/google/devtools/build/lib/analysis/RunfilesSupport.java
@@ -180,11 +180,6 @@ public NestedSet<Artifact> getArtifactsAtCanonicalLocationsForLogging() {
       return runfiles.getArtifacts();
     }
 
-    @Override
-    public Map<PathFragment, Artifact> getAllSymlinksForLogging() {
-      return runfiles.getAllSymlinksForLogging(repoMappingManifest);
-    }
-
     @Override
     public Iterable<PathFragment> getEmptyFilenamesForLogging() {
       return runfiles.getEmptyFilenames();

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/FakeRunfilesTree.java b/src/test/java/com/google/devtools/build/lib/analysis/util/FakeRunfilesTree.java
@@ -97,11 +97,6 @@ public NestedSet<Artifact> getArtifactsAtCanonicalLocationsForLogging() {
     return runfiles.getArtifacts();
   }
 
-  @Override
-  public Map<PathFragment, Artifact> getAllSymlinksForLogging() {
-    return runfiles.getAllSymlinksForLogging(repoMappingManifest);
-  }
-
   @Override
   public Iterable<PathFragment> getEmptyFilenamesForLogging() {
     return runfiles.getEmptyFilenames();

diff --git a/src/test/java/com/google/devtools/build/lib/remote/RemoteExecutionServiceTest.java b/src/test/java/com/google/devtools/build/lib/remote/RemoteExecutionServiceTest.java
@@ -2574,11 +2574,6 @@ public NestedSet<Artifact> getArtifactsAtCanonicalLocationsForLogging() {
         return NestedSetBuilder.wrap(Order.STABLE_ORDER, artifacts);
       }
 
-      @Override
-      public Map<PathFragment, Artifact> getAllSymlinksForLogging() {
-        return Map.of();
-      }
-
       @Override
       public Iterable<PathFragment> getEmptyFilenamesForLogging() {
         return ImmutableList.of();