Make TargetPatternParsing repository renaming aware so that platforms and toolchains get remapped

src/main/java/com/google/devtools/build/lib/cmdline/TargetPattern.java

@@ -152,6 +152,7 @@ public String getOffset() {
    *      {@code Type.TARGETS_BELOW_DIRECTORY}.
    */
   public abstract <T, E extends Exception> void eval(
+      RepositoryName repositoryName,
       TargetPatternResolver<T> resolver,
       ImmutableSet<PathFragment> blacklistedSubdirectories,
       ImmutableSet<PathFragment> excludedSubdirectories,
@@ -168,13 +169,14 @@ public abstract <T, E extends Exception> void eval(
    * {@link TargetParsingException} or the given {@code exceptionClass}.
    */
   public final <T, E extends Exception> ListenableFuture<Void> evalAdaptedForAsync(
+      RepositoryName repositoryName,
       TargetPatternResolver<T> resolver,
       ImmutableSet<PathFragment> blacklistedSubdirectories,
       ImmutableSet<PathFragment> excludedSubdirectories,
       ThreadSafeBatchCallback<T, E> callback,
       Class<E> exceptionClass) {
     try {
-      eval(resolver, blacklistedSubdirectories, excludedSubdirectories, callback, exceptionClass);
+      eval(repositoryName, resolver, blacklistedSubdirectories, excludedSubdirectories, callback, exceptionClass);
       return Futures.immediateFuture(null);
     } catch (TargetParsingException e) {
       return Futures.immediateFailedFuture(e);
@@ -197,14 +199,15 @@ public final <T, E extends Exception> ListenableFuture<Void> evalAdaptedForAsync
    * {@link TargetParsingException} or the given {@code exceptionClass}.
    */
   public <T, E extends Exception> ListenableFuture<Void> evalAsync(
+      RepositoryName repositoryName,
       TargetPatternResolver<T> resolver,
       ImmutableSet<PathFragment> blacklistedSubdirectories,
       ImmutableSet<PathFragment> excludedSubdirectories,
       ThreadSafeBatchCallback<T, E> callback,
       Class<E> exceptionClass,
       ListeningExecutorService executor) {
     return evalAdaptedForAsync(
-        resolver, blacklistedSubdirectories, excludedSubdirectories, callback, exceptionClass);
+        repositoryName, resolver, blacklistedSubdirectories, excludedSubdirectories, callback, exceptionClass);
   }
 
   /**
@@ -277,7 +280,7 @@ public PackageIdentifier getDirectoryForTargetsUnderDirectory() {
    * For patterns of type {@link Type#PATH_AS_TARGET}, returns the path in question.
    *
    * <p>The interpretation of this path, of course, depends on the existence of packages.
-   * See {@link InterpretPathAsTarget#eval}.
+   * See {@link TargetPattern#eval}.
    */
   public String getPathForPathAsTarget() {
     throw new IllegalStateException();
@@ -318,6 +321,7 @@ private SingleTarget(
 
     @Override
     public <T, E extends Exception> void eval(
+        RepositoryName repositoryName,
         TargetPatternResolver<T> resolver,
         ImmutableSet<PathFragment> blacklistedSubdirectories,
         ImmutableSet<PathFragment> excludedSubdirectories,
@@ -375,6 +379,7 @@ private InterpretPathAsTarget(String path, String originalPattern, String offset
 
     @Override
     public <T, E extends Exception> void eval(
+        RepositoryName repositoryName,
         TargetPatternResolver<T> resolver,
         ImmutableSet<PathFragment> blacklistedSubdirectories,
         ImmutableSet<PathFragment> excludedSubdirectories,
@@ -460,6 +465,7 @@ private TargetsInPackage(String originalPattern, String offset,
 
     @Override
     public <T, E extends Exception> void eval(
+        RepositoryName repositoryName,
         TargetPatternResolver<T> resolver,
         ImmutableSet<PathFragment> blacklistedSubdirectories,
         ImmutableSet<PathFragment> excludedSubdirectories,
@@ -569,6 +575,7 @@ private TargetsBelowDirectory(
 
     @Override
     public <T, E extends Exception> void eval(
+        RepositoryName repositoryName,
         TargetPatternResolver<T> resolver,
         ImmutableSet<PathFragment> blacklistedSubdirectories,
         ImmutableSet<PathFragment> excludedSubdirectories,
@@ -588,6 +595,7 @@ public <T, E extends Exception> void eval(
 
     @Override
     public <T, E extends Exception> ListenableFuture<Void> evalAsync(
+        RepositoryName repositoryName,
         TargetPatternResolver<T> resolver,
         ImmutableSet<PathFragment> blacklistedSubdirectories,
         ImmutableSet<PathFragment> excludedSubdirectories,

src/main/java/com/google/devtools/build/lib/packages/Package.java

@@ -42,6 +42,7 @@
 import com.google.devtools.build.lib.skyframe.serialization.SerializationContext;
 import com.google.devtools.build.lib.skyframe.serialization.SerializationException;
 import com.google.devtools.build.lib.syntax.StarlarkSemantics;
+import com.google.devtools.build.lib.util.Pair;
 import com.google.devtools.build.lib.util.SpellChecker;
 import com.google.devtools.build.lib.vfs.Path;
 import com.google.devtools.build.lib.vfs.PathFragment;
@@ -217,6 +218,8 @@ private NameConflictException(String message) {
 
   private ImmutableList<String> registeredExecutionPlatforms;
   private ImmutableList<String> registeredToolchains;
+  private ImmutableMap<RepositoryName, ImmutableList<String>> registeredToolchainsAndRepoName;
+  private ImmutableMap<RepositoryName, ImmutableList<String>> registeredExecutionPlatformsAndRepoName;
 
   /**
    * Package initialization, part 1 of 3: instantiates a new package with the
@@ -406,6 +409,20 @@ private void finishInit(Builder builder) {
     this.posts = ImmutableList.copyOf(builder.posts);
     this.registeredExecutionPlatforms = ImmutableList.copyOf(builder.registeredExecutionPlatforms);
     this.registeredToolchains = ImmutableList.copyOf(builder.registeredToolchains);
+
+    ImmutableMap.Builder<RepositoryName, ImmutableList<String>>
+        registeredToolchainsAndRepoNameBuilder = ImmutableMap.builder();
+    builder.registeredToolchainsAndRepoName.forEach((k, v) ->
+        registeredToolchainsAndRepoNameBuilder.put(k, ImmutableList.copyOf(v)));
+    this.registeredToolchainsAndRepoName = registeredToolchainsAndRepoNameBuilder.build();
+
+    ImmutableMap.Builder<RepositoryName, ImmutableList<String>>
+        registeredExecutionPlatformsAndRepoNameBuilder = ImmutableMap.builder();
+    builder.registeredExecutionPlatformsAndRepoName.forEach((k, v) ->
+        registeredExecutionPlatformsAndRepoNameBuilder.put(k, ImmutableList.copyOf(v)));
+    this.registeredExecutionPlatformsAndRepoName = registeredExecutionPlatformsAndRepoNameBuilder.build();
+
+
     this.repositoryMapping = Preconditions.checkNotNull(builder.repositoryMapping);
     ImmutableMap.Builder<RepositoryName, ImmutableMap<RepositoryName, RepositoryName>>
         repositoryMappingsBuilder = ImmutableMap.builder();
@@ -705,6 +722,14 @@ public ImmutableList<String> getRegisteredToolchains() {
     return registeredToolchains;
   }
 
+  public ImmutableMap<RepositoryName, ImmutableList<String>> getRegisteredToolchainsAndRepoName() {
+    return registeredToolchainsAndRepoName;
+  }
+
+  public ImmutableMap<RepositoryName, ImmutableList<String>> getRegisteredExecutionPlatformsAndRepoName() {
+    return registeredExecutionPlatformsAndRepoName;
+  }
+
   @Override
   public String toString() {
     return "Package(" + name + ")="
@@ -837,6 +862,8 @@ public void onLoadingComplete(
 
     private final List<String> registeredExecutionPlatforms = new ArrayList<>();
     private final List<String> registeredToolchains = new ArrayList<>();
+    private final Map<RepositoryName, List<String>> registeredToolchainsAndRepoName = new HashMap<>();
+    private final Map<RepositoryName, List<String>> registeredExecutionPlatformsAndRepoName = new HashMap<>();
 
     private ThirdPartyLicenseExistencePolicy thirdPartyLicenceExistencePolicy =
         ThirdPartyLicenseExistencePolicy.USER_CONTROLLABLE;
@@ -941,6 +968,22 @@ ImmutableMap<RepositoryName, RepositoryName> getRepositoryMapping() {
       return this.repositoryMapping;
     }
 
+    // /**
+    //  * Returns the repository mapping for the requested external repository.
+    //  *
+    //  * @throws UnsupportedOperationException if called from a package other than
+    //  *     the //external package
+    //  */
+    // public ImmutableMap<RepositoryName, RepositoryName> getRepositoryMapping(
+    //     RepositoryName repository) {
+    //   if (!isWorkspace()) {
+    //     throw new UnsupportedOperationException("Can only access the external package repository"
+    //         + "mappings from the //external package");
+    //   }
+    //   return ImmutableMap.copyOf(externalPackageRepositoryMappings.getOrDefault(repository, new HashMap<>()));
+    // }
+
+
     Interner<ImmutableList<?>> getListInterner() {
       return listInterner;
     }
@@ -1409,6 +1452,26 @@ void addRegisteredToolchains(List<String> toolchains) {
       this.registeredToolchains.addAll(toolchains);
     }
 
+    void addRegisteredToolchainsAndRepositoryName(List<String> toolchains, RepositoryName repositoryName) {
+      // The add needs to be additive. If a list already exists for a particular repository name,
+      // we must add to the list
+      if (this.registeredToolchainsAndRepoName.containsKey(repositoryName)) {
+        List<String> existingToolchains = this.registeredToolchainsAndRepoName.get(repositoryName);
+        toolchains.addAll(existingToolchains);
+      }
+      this.registeredToolchainsAndRepoName.put(repositoryName, toolchains);
+    }
+
+    void addRegisteredExecutionPlatformsAndRepositoryName(List<String> platforms, RepositoryName repositoryName) {
+      // The add needs to be additive. If a list already exists for a particular repository name,
+      // we must add to the list
+      if (this.registeredExecutionPlatformsAndRepoName.containsKey(repositoryName)) {
+        List<String> existingToolchains = this.registeredExecutionPlatformsAndRepoName.get(repositoryName);
+        platforms.addAll(existingToolchains);
+      }
+      this.registeredExecutionPlatformsAndRepoName.put(repositoryName, platforms);
+    }
+
     private Builder beforeBuild(boolean discoverAssumedInputFiles) throws NoSuchPackageException {
       Preconditions.checkNotNull(pkg);
       Preconditions.checkNotNull(filename);

src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactory.java

@@ -202,7 +202,7 @@ private void execute(
                 new BazelStarlarkContext(
                     /* toolsRepository= */ null,
                     /* fragmentNameToClass= */ null,
-                    ImmutableMap.of(),
+                    ImmutableMap.of(RepositoryName.createFromValidStrippedName("ALKSDF"), RepositoryName.createFromValidStrippedName("ALKA")),
                     new SymbolGenerator<>(workspaceFileKey)))
             .build();
     SkylarkUtils.setPhase(workspaceEnv, Phase.WORKSPACE);
@@ -423,8 +423,8 @@ public Object invoke(
 
               // Add to the package definition for later.
               Package.Builder builder = PackageFactory.getContext(env, location).pkgBuilder;
-              builder.addRegisteredExecutionPlatforms(
-                  platformLabels.getContents(String.class, "platform_labels"));
+              RepositoryName repositoryName = env.getGlobals().getLabel().getPackageIdentifier().getRepository();
+              builder.addRegisteredToolchainsAndRepositoryName(platformLabels.getContents(String.class, "platform_labels"), repositoryName);
 
               return NONE;
             }
@@ -460,8 +460,8 @@ public Object invoke(
 
               // Add to the package definition for later.
               Package.Builder builder = PackageFactory.getContext(env, location).pkgBuilder;
-              builder.addRegisteredToolchains(
-                  toolchainLabels.getContents(String.class, "toolchain_labels"));
+              RepositoryName repositoryName = env.getGlobals().getLabel().getPackageIdentifier().getRepository();
+              builder.addRegisteredToolchainsAndRepositoryName(toolchainLabels.getContents(String.class, "toolchain_labels"), repositoryName);
 
               return NONE;
             }

src/main/java/com/google/devtools/build/lib/query2/ActionGraphQueryEnvironment.java

@@ -45,6 +45,7 @@
 import com.google.devtools.build.lib.skyframe.ConfiguredTargetKey;
 import com.google.devtools.build.lib.skyframe.ConfiguredTargetValue;
 import com.google.devtools.build.lib.skyframe.SkyframeExecutor;
+import com.google.devtools.build.lib.skyframe.TargetPatternValue.TargetPatternKey;
 import com.google.devtools.build.skyframe.SkyKey;
 import com.google.devtools.build.skyframe.WalkableGraph;
 import java.io.OutputStream;
@@ -269,9 +270,11 @@ protected ConfiguredTargetKey getSkyKey(ConfiguredTargetValue configuredTargetVa
   @Override
   public QueryTaskFuture<Void> getTargetsMatchingPattern(
       QueryExpression owner, String pattern, Callback<ConfiguredTargetValue> callback) {
+    TargetPatternKey patternKey;
     TargetPattern patternToEval;
     try {
-      patternToEval = getPattern(pattern);
+      patternKey = getPatternKey(pattern);
+      patternToEval = patternKey.getParsedPattern();
     } catch (TargetParsingException tpe) {
       try {
         reportBuildFileError(owner, tpe.getMessage());
@@ -290,6 +293,7 @@ public QueryTaskFuture<Void> getTargetsMatchingPattern(
       return QueryTaskFutureImpl.ofDelegate(
           Futures.catchingAsync(
               patternToEval.evalAdaptedForAsync(
+                  patternKey.getRepositoryName(),
                   resolver,
                   getBlacklistedPackagePrefixesPathFragments(),
                   /* excludedSubdirectories= */ ImmutableSet.of(),

src/main/java/com/google/devtools/build/lib/query2/ConfiguredTargetQueryEnvironment.java

@@ -43,6 +43,7 @@
 import com.google.devtools.build.lib.skyframe.ConfiguredTargetKey;
 import com.google.devtools.build.lib.skyframe.ConfiguredTargetValue;
 import com.google.devtools.build.lib.skyframe.SkyframeExecutor;
+import com.google.devtools.build.lib.skyframe.TargetPatternValue.TargetPatternKey;
 import com.google.devtools.build.skyframe.SkyKey;
 import com.google.devtools.build.skyframe.WalkableGraph;
 import java.io.OutputStream;
@@ -210,8 +211,10 @@ public ConfiguredTargetAccessor getAccessor() {
   public QueryTaskFuture<Void> getTargetsMatchingPattern(
       QueryExpression owner, String pattern, Callback<ConfiguredTarget> callback) {
     TargetPattern patternToEval;
+    TargetPatternKey patternKey;
     try {
-      patternToEval = getPattern(pattern);
+      patternKey = getPatternKey(pattern);
+      patternToEval = patternKey.getParsedPattern();
     } catch (TargetParsingException tpe) {
       try {
         reportBuildFileError(owner, tpe.getMessage());
@@ -230,6 +233,7 @@ public QueryTaskFuture<Void> getTargetsMatchingPattern(
       return QueryTaskFutureImpl.ofDelegate(
           Futures.catchingAsync(
               patternToEval.evalAdaptedForAsync(
+                  patternKey.getRepositoryName(),
                   resolver,
                   getBlacklistedPackagePrefixesPathFragments(),
                   /* excludedSubdirectories= */ ImmutableSet.of(),

src/main/java/com/google/devtools/build/lib/query2/PostAnalysisQueryEnvironment.java

@@ -25,6 +25,7 @@
 import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
 import com.google.devtools.build.lib.analysis.configuredtargets.RuleConfiguredTarget;
 import com.google.devtools.build.lib.cmdline.Label;
+import com.google.devtools.build.lib.cmdline.RepositoryName;
 import com.google.devtools.build.lib.cmdline.TargetParsingException;
 import com.google.devtools.build.lib.cmdline.TargetPattern;
 import com.google.devtools.build.lib.collect.compacthashset.CompactHashSet;
@@ -113,7 +114,8 @@ public abstract class PostAnalysisQueryEnvironment<T> extends AbstractBlazeQuery
     ALL_PATTERNS =
         ImmutableList.of(
             new TargetPatternKey(
-                targetPattern, FilteringPolicies.NO_FILTER, false, "", ImmutableSet.of()));
+                // TODO: FIGURE OUT WHAT THE REPO SHOULD BE!!!!
+                targetPattern, FilteringPolicies.NO_FILTER, false, "", ImmutableSet.of(), RepositoryName.MAIN));
   }
 
   protected RecursivePackageProviderBackedTargetPatternResolver resolver;
@@ -238,13 +240,13 @@ ImmutableSet<PathFragment> getBlacklistedPackagePrefixesPathFragments()
   @Nullable
   protected abstract T getValueFromKey(SkyKey key) throws InterruptedException;
 
-  protected TargetPattern getPattern(String pattern) throws TargetParsingException {
+  protected TargetPatternKey getPatternKey(String pattern) throws TargetParsingException {
     TargetPatternKey targetPatternKey =
         ((TargetPatternKey)
             TargetPatternValue.key(
                     pattern, TargetPatternEvaluator.DEFAULT_FILTERING_POLICY, parserPrefix)
                 .argument());
-    return targetPatternKey.getParsedPattern();
+    return targetPatternKey;
   }
 
   ThreadSafeMutableSet<T> getFwdDeps(Iterable<T> targets) throws InterruptedException {

src/main/java/com/google/devtools/build/lib/query2/SkyQueryEnvironment.java

@@ -738,6 +738,7 @@ public QueryTaskFuture<Void> evalTargetPatternKey(
     }
     ListenableFuture<Void> evalFuture =
         patternToEval.evalAsync(
+            targetPatternKey.getRepositoryName(),
             resolver,
             blacklistedSubdirectoriesToExclude,
             additionalSubdirectoriesToExclude,

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

@@ -101,11 +101,11 @@ public SkyValue compute(SkyKey key, Environment env)
 
     try {
       parsedPattern.eval(
+          patternKey.getRepositoryName(),
           preparer,
           blacklistedSubdirectories,
           excludedSubdirectories,
-          NullCallback.<Void>instance(),
-          RuntimeException.class);
+          NullCallback.<Void>instance(), RuntimeException.class);
     } catch (TargetParsingException e) {
       throw new PrepareDepsOfPatternFunctionException(e);
     } catch (MissingDepException e) {

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

@@ -14,7 +14,9 @@
 package com.google.devtools.build.lib.skyframe;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Interner;
+import com.google.devtools.build.lib.cmdline.RepositoryName;
 import com.google.devtools.build.lib.cmdline.TargetParsingException;
 import com.google.devtools.build.lib.cmdline.TargetPattern;
 import com.google.devtools.build.lib.cmdline.TargetPattern.Type;
@@ -91,8 +93,10 @@ public static PrepareDepsOfPatternSkyKeysAndExceptions keys(
         ImmutableList.builder();
     ImmutableList.Builder<PrepareDepsOfPatternSkyKeyException> resultExceptionsBuilder =
         ImmutableList.builder();
+    // TODO aaahhhhh???
+    ImmutableMap<RepositoryName, ImmutableList<String>> patternsMap = ImmutableMap.of(RepositoryName.MAIN, ImmutableList.copyOf(patterns));
     Iterable<TargetPatternSkyKeyOrException> keysMaybe =
-        TargetPatternValue.keys(patterns, FilteringPolicies.NO_FILTER, offset);
+        TargetPatternValue.keys(patternsMap, FilteringPolicies.NO_FILTER, offset);
     ImmutableList.Builder<TargetPatternKey> targetPatternKeysBuilder = ImmutableList.builder();
     for (TargetPatternSkyKeyOrException keyMaybe : keysMaybe) {
       try {