Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

import static com.google.common.collect.ImmutableList.toImmutableList;
import static com.google.common.collect.ImmutableSortedMap.toImmutableSortedMap;
import static com.google.devtools.build.lib.actions.ActionKeyContext.describeNestedSetFingerprint;
import static java.nio.charset.StandardCharsets.ISO_8859_1;
import static java.util.Comparator.comparing;

Expand All @@ -31,7 +32,7 @@
import com.google.devtools.build.lib.actions.Artifact;
import com.google.devtools.build.lib.actions.ArtifactExpander;
import com.google.devtools.build.lib.actions.CommandLineExpansionException;
import com.google.devtools.build.lib.actions.CommandLineItem.MapFn;
import com.google.devtools.build.lib.actions.CommandLineItem;
import com.google.devtools.build.lib.analysis.actions.AbstractFileWriteAction;
import com.google.devtools.build.lib.analysis.actions.DeterministicWriter;
import com.google.devtools.build.lib.cmdline.Label;
Expand Down Expand Up @@ -77,19 +78,20 @@ public final class RepoMappingManifestAction extends AbstractFileWriteAction

// Uses MapFn's args parameter just like Fingerprint#addString to compute a cacheable fingerprint
// of just the repo name and mapping of a given Package.
private static final MapFn<Package> REPO_AND_MAPPING_DIGEST_FN =
(pkg, args) -> {
args.accept(pkg.getPackageIdentifier().getRepository().getName());
args.accept(repoMappingFingerprintCache.get(pkg.getRepositoryMapping().entries()));
};
private static final CommandLineItem.ExceptionlessMapFn<Package>
REPO_AND_MAPPING_DIGEST_FN =
(pkg, args) -> {
args.accept(pkg.getPackageIdentifier().getRepository().getName());
args.accept(repoMappingFingerprintCache.get(pkg.getRepositoryMapping().entries()));
};

private static final MapFn<Artifact> OWNER_REPO_FN =
private static final CommandLineItem.ExceptionlessMapFn<Artifact> OWNER_REPO_FN =
(artifact, args) -> {
args.accept(
artifact.getOwner() != null ? artifact.getOwner().getRepository().getName() : "");
};

private static final MapFn<SymlinkEntry> FIRST_SEGMENT_FN =
private static final CommandLineItem.ExceptionlessMapFn<SymlinkEntry> FIRST_SEGMENT_FN =
(symlink, args) -> args.accept(symlink.getPath().getSegment(0));

private final NestedSet<Package> transitivePackages;
Expand Down Expand Up @@ -142,6 +144,27 @@ protected void computeKey(
fp.addBoolean(emitCompactRepoMapping);
}

@Override
public String describeKey() {
return """
GUID: %s
transitivePackages: %s
runfilesArtifacts: %s
hasRunfilesSymlinks: %s
runfilesRootSymlinks: %s
workspaceName: %s
emitCompactRepoMapping: %s\
"""
.formatted(
MY_UUID,
describeNestedSetFingerprint(REPO_AND_MAPPING_DIGEST_FN, transitivePackages),
describeNestedSetFingerprint(OWNER_REPO_FN, runfilesArtifacts),
hasRunfilesSymlinks,
describeNestedSetFingerprint(FIRST_SEGMENT_FN, runfilesRootSymlinks),
workspaceName,
emitCompactRepoMapping);
}

/**
* Get the contents of a file internally using an in memory output stream.
*
Expand Down
Loading