Remove least important argument to 5+ arg Preconditions#checkState/checkNotNull.
This change prepares a move to Guava's preconditions. Guava only has vararg-avoiding overloads up to 4 args.
PiperOrigin-RevId: 175015502
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ArtifactFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/ArtifactFunction.java
index e7b1f3b..e35f5c7 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ArtifactFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ArtifactFunction.java
@@ -173,12 +173,11 @@
(ActionExecutionValue)
Preconditions.checkNotNull(
expandedActionValueMap.get(expandedActionExecutionKeys.get(i)),
- "Missing tree value: %s %s %s %s %s",
+ "Missing tree value: %s %s %s %s",
treeArtifact,
actionTemplate,
expansionValue,
- expandedActionValueMap,
- expandedActionExecutionKeys);
+ expandedActionValueMap);
Iterable<TreeFileArtifact> treeFileArtifacts =
Iterables.transform(
Iterables.filter(
diff --git a/src/main/java/com/google/devtools/build/skyframe/AbstractParallelEvaluator.java b/src/main/java/com/google/devtools/build/skyframe/AbstractParallelEvaluator.java
index 7098612..5de87d5 100644
--- a/src/main/java/com/google/devtools/build/skyframe/AbstractParallelEvaluator.java
+++ b/src/main/java/com/google/devtools/build/skyframe/AbstractParallelEvaluator.java
@@ -267,12 +267,11 @@
graph.getBatch(skyKey, Reason.ENQUEUING_CHILD, unknownStatusDeps);
Preconditions.checkState(
oldChildren.size() == unknownStatusDeps.size(),
- "Not all old children were present: %s %s %s %s %s",
+ "Not all old children were present: %s %s %s %s",
skyKey,
state,
unknownStatusDeps,
- oldChildren,
- directDepsToCheck);
+ oldChildren);
for (Map.Entry<SkyKey, ? extends NodeEntry> e : oldChildren.entrySet()) {
SkyKey directDep = e.getKey();
NodeEntry directDepEntry = e.getValue();
diff --git a/src/main/java/com/google/devtools/build/skyframe/ParallelEvaluator.java b/src/main/java/com/google/devtools/build/skyframe/ParallelEvaluator.java
index 54b0d02..9a38148 100644
--- a/src/main/java/com/google/devtools/build/skyframe/ParallelEvaluator.java
+++ b/src/main/java/com/google/devtools/build/skyframe/ParallelEvaluator.java
@@ -345,7 +345,7 @@
if (errorEntry.isDone()) {
Preconditions.checkState(
firstIteration,
- "Non-leaf done node reached: %s %s %s %s %s",
+ "Non-leaf done node reached: %s %s %s %s %s",
errorKey,
leafFailure,
roots,
diff --git a/src/main/java/com/google/devtools/build/skyframe/ReverseDepsUtility.java b/src/main/java/com/google/devtools/build/skyframe/ReverseDepsUtility.java
index bcd7bfd..7760ca8 100644
--- a/src/main/java/com/google/devtools/build/skyframe/ReverseDepsUtility.java
+++ b/src/main/java/com/google/devtools/build/skyframe/ReverseDepsUtility.java
@@ -212,72 +212,64 @@
case CHECK:
Preconditions.checkState(
reverseDepsAsSet.contains(key),
- "Reverse dep not present: %s %s %s %s %s",
+ "Reverse dep not present: %s %s %s %s",
keyToConsolidate,
reverseDepsAsSet,
- newData,
dataToConsolidate,
entry);
Preconditions.checkState(
newData.add(key),
- "Duplicate new reverse dep: %s %s %s %s %s",
+ "Duplicate new reverse dep: %s %s %s %s",
keyToConsolidate,
reverseDepsAsSet,
- newData,
dataToConsolidate,
entry);
break;
case REMOVE:
Preconditions.checkState(
reverseDepsAsSet.remove(key),
- "Reverse dep to be removed not present: %s %s %s %s %s",
+ "Reverse dep to be removed not present: %s %s %s %s",
keyToConsolidate,
reverseDepsAsSet,
- newData,
dataToConsolidate,
entry);
Preconditions.checkState(
newData.remove(key),
- "Reverse dep to be removed not present: %s %s %s %s %s",
+ "Reverse dep to be removed not present: %s %s %s %s",
keyToConsolidate,
reverseDepsAsSet,
- newData,
dataToConsolidate,
entry);
break;
case REMOVE_OLD:
Preconditions.checkState(
reverseDepsAsSet.remove(key),
- "Reverse dep to be removed not present: %s %s %s %s %s",
+ "Reverse dep to be removed not present: %s %s %s %s",
keyToConsolidate,
reverseDepsAsSet,
- newData,
dataToConsolidate,
entry);
Preconditions.checkState(
!newData.contains(key),
- "Reverse dep shouldn't have been added to new: %s %s %s %s %s",
+ "Reverse dep shouldn't have been added to new: %s %s %s %s",
keyToConsolidate,
reverseDepsAsSet,
- newData,
dataToConsolidate,
entry);
break;
case ADD:
Preconditions.checkState(
reverseDepsAsSet.add(key),
- "Duplicate reverse deps: %s %s %s %s %s",
+ "Duplicate reverse deps: %s %s %s %s",
keyToConsolidate,
reverseDeps,
- newData,
dataToConsolidate,
entry);
Preconditions.checkState(
newData.add(key),
- "Duplicate new reverse deps: %s %s %s %s %s",
+ "Duplicate new reverse deps: %s %s %s %s",
keyToConsolidate,
reverseDeps,
- newData,
dataToConsolidate,
entry);
break;
diff --git a/src/main/java/com/google/devtools/build/skyframe/SimpleCycleDetector.java b/src/main/java/com/google/devtools/build/skyframe/SimpleCycleDetector.java
index b62a1d0..a9e33f4 100644
--- a/src/main/java/com/google/devtools/build/skyframe/SimpleCycleDetector.java
+++ b/src/main/java/com/google/devtools/build/skyframe/SimpleCycleDetector.java
@@ -394,13 +394,7 @@
if (cycleLength == 1) {
// Remove the direct children remaining to visit of the cycle node.
Preconditions.checkState(
- unvisitedDeps.contains(descendant),
- "%s %s %s %s %s",
- key,
- descendant,
- cycleChild,
- unvisitedDeps,
- entry);
+ unvisitedDeps.contains(descendant), "%s %s %s %s", key, descendant, cycleChild, entry);
it.remove();
}
}
