Have split deps sort by mnemonic, then config checksum.
The mnemonic is something like "k8-fastbuild", which almost every configuration has in common. This causes sorting to be more deterministic.
Part of work on toolchain transitions, #10523.
PiperOrigin-RevId: 313803864
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/ConfigurationResolver.java b/src/main/java/com/google/devtools/build/lib/analysis/config/ConfigurationResolver.java
index 13ea05f..dc27ad9 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/ConfigurationResolver.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/ConfigurationResolver.java
@@ -15,6 +15,7 @@
package com.google.devtools.build.lib.analysis.config;
import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Functions;
import com.google.common.base.Joiner;
import com.google.common.base.Verify;
import com.google.common.base.VerifyException;
@@ -675,17 +676,15 @@
}
/**
- * Determines the output ordering of each <attribute, depLabel> ->
- * [dep<config1>, dep<config2>, ...] collection produced by a split transition.
+ * Determines the output ordering of each {@code <attribute, depLabel> -> [dep<config1>,
+ * dep<config2>, ...]} collection produced by a split transition.
*/
@VisibleForTesting
public static final Comparator<Dependency> SPLIT_DEP_ORDERING =
- new Comparator<Dependency>() {
- @Override
- public int compare(Dependency d1, Dependency d2) {
- return d1.getConfiguration().getMnemonic().compareTo(d2.getConfiguration().getMnemonic());
- }
- };
+ Comparator.comparing(
+ Functions.compose(BuildConfiguration::getMnemonic, Dependency::getConfiguration))
+ .thenComparing(
+ Functions.compose(BuildConfiguration::checksum, Dependency::getConfiguration));
/**
* Returns a copy of the output deps using the same key and value ordering as the input deps.
