Use a non-side-effectful PackageLookupValue#packageExists implementation for //external package lookups, but keep the current (incorrect) semantics for unsuccessful //external package lookups.

Refactor some users of the old WorkspacePackageLookupValue.

--
MOS_MIGRATED_REVID=123034174

1 files changed, 0 insertions, 30 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/PackageLookupValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/PackageLookupValue.java
index e9d5bf5100..ce006cc3c5 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/PackageLookupValue.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/PackageLookupValue.java
@@ -56,18 +56,10 @@ public abstract class PackageLookupValue implements SkyValue {
     return new SuccessfulPackageLookupValue(root);
   }
 
-  public static PackageLookupValue workspace(Path root) {
-    return new WorkspacePackageLookupValue(root);
-  }
-
   public static PackageLookupValue invalidPackageName(String errorMsg) {
     return new InvalidNamePackageLookupValue(errorMsg);
   }
 
-  public boolean isExternalPackage() {
-    return false;
-  }
-
   /**
    * For a successful package lookup, returns the root (package path entry) that the package
    * resides in.
@@ -145,28 +137,6 @@ public abstract class PackageLookupValue implements SkyValue {
     }
   }
 
-  // TODO(kchodorow): fix these semantics.  This class should not exist, WORKSPACE lookup should
-  // just return success/failure like a "normal" package.
-  /** Successful workspace package lookup value. */
-  public static class WorkspacePackageLookupValue extends SuccessfulPackageLookupValue {
-
-    private WorkspacePackageLookupValue(Path root) {
-      super(root);
-    }
-
-    // TODO(kchodorow): get rid of this, the semantics are wrong (successful package lookup should
-    // mean the package exists).
-    @Override
-    public boolean packageExists() {
-      return getRoot().exists();
-    }
-
-    @Override
-    public boolean isExternalPackage() {
-      return true;
-    }
-  }
-
   private abstract static class UnsuccessfulPackageLookupValue extends PackageLookupValue {
 
     @Override