Remove dep fingerprinting, part 2 of 2.
Removes SkyValue#getValueFingerprint and Version#getFingerprint. This should also free a little bit of memory that was used in configured target values.
getValueFingerprint is kept in two SkyValue subclasses (FileStateValue and FileArtifactValue) where it is actually used for another purpose. However, the method is removed from the SkyValue interface and other classes where it is not being used.
PiperOrigin-RevId: 286601483
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java
index c11a748..cb3cc28 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java
@@ -74,11 +74,9 @@
import com.google.devtools.build.skyframe.SkyKey;
import com.google.devtools.build.skyframe.SkyValue;
import com.google.devtools.build.skyframe.ValueOrException;
-import java.math.BigInteger;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
-import java.util.function.Supplier;
import javax.annotation.Nullable;
/**
@@ -111,22 +109,18 @@
*/
private final boolean storeTransitivePackagesForPackageRootResolution;
- private final Supplier<BigInteger> nonceVersion;
-
AspectFunction(
BuildViewProvider buildViewProvider,
RuleClassProvider ruleClassProvider,
@Nullable SkylarkImportLookupFunction skylarkImportLookupFunctionForInlining,
boolean storeTransitivePackagesForPackageRootResolution,
- BuildOptions defaultBuildOptions,
- Supplier<BigInteger> nonceVersion) {
+ BuildOptions defaultBuildOptions) {
this.buildViewProvider = buildViewProvider;
this.ruleClassProvider = ruleClassProvider;
this.skylarkImportLookupFunctionForInlining = skylarkImportLookupFunctionForInlining;
this.storeTransitivePackagesForPackageRootResolution =
storeTransitivePackagesForPackageRootResolution;
this.defaultBuildOptions = defaultBuildOptions;
- this.nonceVersion = nonceVersion;
}
/**
@@ -616,8 +610,7 @@
originalTarget.getLabel(),
originalTarget.getLocation(),
ConfiguredAspect.forAlias(real.getConfiguredAspect()),
- transitivePackagesForPackageRootResolution,
- nonceVersion.get());
+ transitivePackagesForPackageRootResolution);
}
@Nullable
@@ -703,8 +696,7 @@
configuredAspect,
transitivePackagesForPackageRootResolution == null
? null
- : transitivePackagesForPackageRootResolution.build(),
- nonceVersion.get());
+ : transitivePackagesForPackageRootResolution.build());
}
@Override