perf: further improve performance of precompute

triceo · triceo · commit b2760e94424b · 2025-12-20T08:28:02.000+01:00
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/RecordAndReplayPropagator.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/RecordAndReplayPropagator.java
@@ -42,6 +42,7 @@ public final class RecordAndReplayPropagator<Tuple_ extends AbstractTuple>
     private final Supplier<BavetPrecomputeBuildHelper<Tuple_>> precomputeBuildHelperSupplier;
     private final UnaryOperator<Tuple_> internalTupleToOutputTupleMapper;
     private final Map<Object, List<Tuple_>> objectToOutputTuplesMap;
+    private final Set<Object> alreadyUpdatingMap = Collections.newSetFromMap(new IdentityHashMap<>());
     private final Map<Class<?>, Boolean> objectClassToIsEntitySourceClass;
 
     private final StaticPropagationQueue<Tuple_> propagationQueue;
@@ -77,14 +78,18 @@ public void insert(Object object) {
     }
 
     public void update(Object object) {
+        if (!alreadyUpdatingMap.add(object)) {
+            // The list was already sent to the propagation queue.
+            // Don't iterate over it again, even though the queue would deduplicate its contents.
+            return;
+        }
         // Updates happen very frequently, so we optimize by avoiding the update queue
         // and going straight to the propagation queue.
         // The propagation queue deduplicates updates internally.
         var outTupleList = objectToOutputTuplesMap.get(object);
-        if (outTupleList == null) {
-            return;
+        if (outTupleList != null) {
+            outTupleList.forEach(propagationQueue::update);
         }
-        outTupleList.forEach(propagationQueue::update);
     }
 
     public void retract(Object object) {
@@ -158,6 +163,7 @@ private static <A> List<BavetRootNode<A>> getRootNodes(Object object, NodeNetwor
     @Override
     public void propagateUpdates() {
         propagationQueue.propagateUpdates();
+        alreadyUpdatingMap.clear();
     }
 
     @Override
@@ -207,7 +213,7 @@ private void recalculateTuples(NodeNetwork internalNodeNetwork,
                 internalNodeNetwork.settle();
             }
             if (mappedTuples.isEmpty()) {
-                objectToOutputTuplesMap.put(invalidated, Collections.emptyList());
+                objectToOutputTuplesMap.remove(invalidated);
             } else {
                 objectToOutputTuplesMap.put(invalidated, mappedTuples);
             }
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/BiCompositeKey.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/BiCompositeKey.java
@@ -27,10 +27,7 @@ public <Key_> Key_ get(int id) {
 
     @Override
     public int hashCode() {
-        var hash = 7;
-        hash = 31 * hash + Objects.hashCode(propertyA);
-        hash = 31 * hash + Objects.hashCode(propertyB);
-        return hash;
+        return 31 * Objects.hashCode(propertyA) + Objects.hashCode(propertyB);
     }
 
 }
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/domain/valuerange/buildin/bigdecimal/BigDecimalValueRange.java b/core/src/main/java/ai/timefold/solver/core/impl/domain/valuerange/buildin/bigdecimal/BigDecimalValueRange.java
@@ -158,11 +158,9 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-        var hash = 7;
-        hash = 31 * hash + Objects.hashCode(from);
+        var hash = Objects.hashCode(from);
         hash = 31 * hash + Objects.hashCode(to);
-        hash = 31 * hash + Objects.hashCode(incrementUnit);
-        return hash;
+        return 31 * hash + Objects.hashCode(incrementUnit);
     }
 
     @Override
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/domain/valuerange/buildin/biginteger/BigIntegerValueRange.java b/core/src/main/java/ai/timefold/solver/core/impl/domain/valuerange/buildin/biginteger/BigIntegerValueRange.java
@@ -141,11 +141,9 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-        var hash = 7;
-        hash = 31 * hash + Objects.hashCode(from);
+        var hash = Objects.hashCode(from);
         hash = 31 * hash + Objects.hashCode(to);
-        hash = 31 * hash + Objects.hashCode(incrementUnit);
-        return hash;
+        return 31 * hash + Objects.hashCode(incrementUnit);
     }
 
     @Override
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/domain/valuerange/buildin/collection/ListValueRange.java b/core/src/main/java/ai/timefold/solver/core/impl/domain/valuerange/buildin/collection/ListValueRange.java
@@ -88,10 +88,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-        var hash = 7;
-        hash = 31 * hash + Boolean.hashCode(isValueImmutable);
-        hash = 31 * hash + Objects.hashCode(list);
-        return hash;
+        return 31 * Boolean.hashCode(isValueImmutable) + Objects.hashCode(list);
     }
 
     @Override
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/domain/valuerange/buildin/collection/SetValueRange.java b/core/src/main/java/ai/timefold/solver/core/impl/domain/valuerange/buildin/collection/SetValueRange.java
@@ -89,10 +89,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-        var hash = 7;
-        hash = 31 * hash + Boolean.hashCode(isValueImmutable);
-        hash = 31 * hash + Objects.hashCode(set);
-        return hash;
+        return 31 * Boolean.hashCode(isValueImmutable) + Objects.hashCode(set);
     }
 
     @Override
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/domain/valuerange/buildin/composite/CompositeCountableValueRange.java b/core/src/main/java/ai/timefold/solver/core/impl/domain/valuerange/buildin/composite/CompositeCountableValueRange.java
@@ -102,9 +102,6 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-        var hash = 7;
-        hash = 31 * hash + Boolean.hashCode(isValueImmutable);
-        hash = 31 * hash + Objects.hashCode(valueRangeList);
-        return hash;
+        return 31 * Boolean.hashCode(isValueImmutable) + Objects.hashCode(valueRangeList);
     }
 }
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/domain/valuerange/buildin/primdouble/DoubleValueRange.java b/core/src/main/java/ai/timefold/solver/core/impl/domain/valuerange/buildin/primdouble/DoubleValueRange.java
@@ -97,10 +97,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-        var hash = 7;
-        hash = 31 * hash + Double.hashCode(from);
-        hash = 31 * hash + Double.hashCode(to);
-        return hash;
+        return 31 * Double.hashCode(from) + Double.hashCode(to);
     }
 
     @Override
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/domain/valuerange/buildin/primint/IntValueRange.java b/core/src/main/java/ai/timefold/solver/core/impl/domain/valuerange/buildin/primint/IntValueRange.java
@@ -141,11 +141,9 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-        var hash = 7;
-        hash = 31 * hash + Integer.hashCode(from);
+        var hash = Integer.hashCode(from);
         hash = 31 * hash + Integer.hashCode(to);
-        hash = 31 * hash + Integer.hashCode(incrementUnit);
-        return hash;
+        return 31 * hash + Integer.hashCode(incrementUnit);
     }
 
     @Override
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/domain/valuerange/buildin/primlong/LongValueRange.java b/core/src/main/java/ai/timefold/solver/core/impl/domain/valuerange/buildin/primlong/LongValueRange.java
@@ -146,11 +146,9 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-        var hash = 7;
-        hash = 31 * hash + Long.hashCode(from);
+        var hash = Long.hashCode(from);
         hash = 31 * hash + Long.hashCode(to);
-        hash = 31 * hash + Long.hashCode(incrementUnit);
-        return hash;
+        return 31 * hash + Long.hashCode(incrementUnit);
     }
 
     @Override
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/domain/valuerange/buildin/temporal/TemporalValueRange.java b/core/src/main/java/ai/timefold/solver/core/impl/domain/valuerange/buildin/temporal/TemporalValueRange.java
@@ -195,12 +195,10 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-        var hash = 7;
-        hash = 31 * hash + Long.hashCode(incrementUnitAmount);
+        var hash = Long.hashCode(incrementUnitAmount);
         hash = 31 * hash + Objects.hashCode(incrementUnitType);
         hash = 31 * hash + Objects.hashCode(from);
-        hash = 31 * hash + Objects.hashCode(to);
-        return hash;
+        return 31 * hash + Objects.hashCode(to);
     }
 
     @Override
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/util/Pair.java b/core/src/main/java/ai/timefold/solver/core/impl/util/Pair.java
@@ -14,17 +14,17 @@ public record Pair<Key_, Value_>(Key_ key, Value_ value) {
 
     @Override
     public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
         return o instanceof Pair<?, ?> other
                 && Objects.equals(key, other.key)
                 && Objects.equals(value, other.value);
     }
 
     @Override
     public int hashCode() { // Often used in hash-based collections; the JDK-generated default is too slow.
-        var hash = 7;
-        hash = 31 * hash + Objects.hashCode(key);
-        hash = 31 * hash + Objects.hashCode(value);
-        return hash;
+        return 31 * Objects.hashCode(key) + Objects.hashCode(value);
     }
 
 }
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/util/Quadruple.java b/core/src/main/java/ai/timefold/solver/core/impl/util/Quadruple.java
@@ -16,6 +16,9 @@ public record Quadruple<A, B, C, D>(A a, B b, C c, D d) {
 
     @Override
     public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
         return o instanceof Quadruple<?, ?, ?, ?> other
                 && Objects.equals(a, other.a)
                 && Objects.equals(b, other.b)
@@ -25,12 +28,10 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() { // Often used in hash-based collections; the JDK-generated default is too slow.
-        var hash = 7;
-        hash = 31 * hash + Objects.hashCode(a);
+        var hash = Objects.hashCode(a);
         hash = 31 * hash + Objects.hashCode(b);
         hash = 31 * hash + Objects.hashCode(c);
-        hash = 31 * hash + Objects.hashCode(d);
-        return hash;
+        return 31 * hash + Objects.hashCode(d);
     }
 
 }
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/util/Triple.java b/core/src/main/java/ai/timefold/solver/core/impl/util/Triple.java
@@ -15,6 +15,9 @@ public record Triple<A, B, C>(A a, B b, C c) {
 
     @Override
     public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
         return o instanceof Triple<?, ?, ?> other
                 && Objects.equals(a, other.a)
                 && Objects.equals(b, other.b)
@@ -23,11 +26,9 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() { // Often used in hash-based collections; the JDK-generated default is too slow.
-        var hash = 7;
-        hash = 31 * hash + Objects.hashCode(a);
+        var hash = Objects.hashCode(a);
         hash = 31 * hash + Objects.hashCode(b);
-        hash = 31 * hash + Objects.hashCode(c);
-        return hash;
+        return 31 * hash + Objects.hashCode(c);
     }
 
 }
diff --git a/core/src/test/java/ai/timefold/solver/core/testdomain/clone/lookup/TestdataObjectEquals.java b/core/src/test/java/ai/timefold/solver/core/testdomain/clone/lookup/TestdataObjectEquals.java
@@ -12,9 +12,7 @@ public TestdataObjectEquals(Integer id) {
 
     @Override
     public int hashCode() {
-        int hash = 5;
-        hash = 37 * hash + Objects.hashCode(this.id);
-        return hash;
+        return Objects.hashCode(this.id);
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -27,10 +27,7 @@ public <Key_> Key_ get(int id) {`
`27`	`27`
`28`	`28`	`@Override`
`29`	`29`	`public int hashCode() {`
`30`		`- var hash = 7;`
`31`		`- hash = 31 * hash + Objects.hashCode(propertyA);`
`32`		`- hash = 31 * hash + Objects.hashCode(propertyB);`
`33`		`- return hash;`
	`30`	`+ return 31 * Objects.hashCode(propertyA) + Objects.hashCode(propertyB);`
`34`	`31`	`}`
`35`	`32`
`36`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -102,9 +102,6 @@ public boolean equals(Object o) {`
`102`	`102`
`103`	`103`	`@Override`
`104`	`104`	`public int hashCode() {`
`105`		`- var hash = 7;`
`106`		`- hash = 31 * hash + Boolean.hashCode(isValueImmutable);`
`107`		`- hash = 31 * hash + Objects.hashCode(valueRangeList);`
`108`		`- return hash;`
	`105`	`+ return 31 * Boolean.hashCode(isValueImmutable) + Objects.hashCode(valueRangeList);`
`109`	`106`	`}`
`110`	`107`	`}`