Do the same for joins

Author: triceo

core/src/main/java/ai/timefold/solver/core/impl/bavet/common/AbstractIndexedJoinNode.java

@@ -84,7 +84,7 @@ public final void updateLeft(LeftTuple_ leftTuple) {
         } else {
             indexerLeft.remove(oldIndexKeys, leftTuple);
             IndexedSet<OutTuple_> outTupleSetLeft = leftTuple.getStore(inputStoreIndexLeftOutTupleSet);
-            outTupleSetLeft.forEach(this::retractOutTuple);
+            outTupleSetLeft.clear(this::retractOutTupleByLeft);
             // outTupleSetLeft is now empty, no need for leftTuple.setStore(...);
             indexAndPropagateLeft(leftTuple, newIndexKeys);
         }
@@ -105,7 +105,7 @@ public final void retractLeft(LeftTuple_ leftTuple) {
         }
         IndexedSet<OutTuple_> outTupleSetLeft = leftTuple.removeStore(inputStoreIndexLeftOutTupleSet);
         indexerLeft.remove(indexKeys, leftTuple);
-        outTupleSetLeft.forEach(this::retractOutTuple);
+        outTupleSetLeft.clear(this::retractOutTupleByLeft);
     }
 
     @Override
@@ -137,7 +137,7 @@ public final void updateRight(UniTuple<Right_> rightTuple) {
         } else {
             IndexedSet<OutTuple_> outTupleSetRight = rightTuple.getStore(inputStoreIndexRightOutTupleSet);
             indexerRight.remove(oldIndexKeys, rightTuple);
-            outTupleSetRight.forEach(this::retractOutTuple);
+            outTupleSetRight.clear(this::retractOutTupleByRight);
             // outTupleSetRight is now empty, no need for rightTuple.setStore(...);
             indexAndPropagateRight(rightTuple, newIndexKeys);
         }
@@ -158,7 +158,7 @@ public final void retractRight(UniTuple<Right_> rightTuple) {
         }
         IndexedSet<OutTuple_> outTupleSetRight = rightTuple.removeStore(inputStoreIndexRightOutTupleSet);
         indexerRight.remove(indexKeys, rightTuple);
-        outTupleSetRight.forEach(this::retractOutTuple);
+        outTupleSetRight.clear(this::retractOutTupleByRight);
     }
 
 }

core/src/main/java/ai/timefold/solver/core/impl/bavet/common/AbstractJoinNode.java

@@ -184,11 +184,14 @@ protected final void innerUpdateRight(UniTuple<Right_> rightTuple, Consumer<Cons
         }
     }
 
-    protected final void retractOutTuple(OutTuple_ outTuple) {
-        IndexedSet<OutTuple_> outSetLeft = outTuple.removeStore(outputStoreIndexLeftOutSet);
-        outSetLeft.remove(outTuple);
+    protected final void retractOutTupleByLeft(OutTuple_ outTuple) {
+        outTuple.removeStore(outputStoreIndexLeftOutSet);
         IndexedSet<OutTuple_> outSetRight = outTuple.removeStore(outputStoreIndexRightOutSet);
         outSetRight.remove(outTuple);
+        retractOutTuple(outTuple);
+    }
+
+    private void retractOutTuple(OutTuple_ outTuple) {
         var state = outTuple.state;
         if (!state.isActive()) { // Impossible because they shouldn't linger in the indexes.
             throw new IllegalStateException("Impossible state: The tuple (%s) in node (%s) is in an unexpected state (%s)."
@@ -197,6 +200,13 @@ protected final void retractOutTuple(OutTuple_ outTuple) {
         propagationQueue.retract(outTuple, state == TupleState.CREATING ? TupleState.ABORTING : TupleState.DYING);
     }
 
+    protected final void retractOutTupleByRight(OutTuple_ outTuple) {
+        IndexedSet<OutTuple_> outSetLeft = outTuple.removeStore(outputStoreIndexLeftOutSet);
+        outSetLeft.remove(outTuple);
+        outTuple.removeStore(outputStoreIndexRightOutSet);
+        retractOutTuple(outTuple);
+    }
+
     @Override
     public Propagator getPropagator() {
         return propagationQueue;

core/src/main/java/ai/timefold/solver/core/impl/bavet/common/AbstractUnindexedJoinNode.java

@@ -71,7 +71,7 @@ public final void retractLeft(LeftTuple_ leftTuple) {
         }
         IndexedSet<OutTuple_> outTupleSetLeft = leftTuple.removeStore(inputStoreIndexLeftOutTupleSet);
         leftTupleSet.remove(leftTuple);
-        outTupleSetLeft.forEach(this::retractOutTuple);
+        outTupleSetLeft.clear(this::retractOutTupleByLeft);
     }
 
     @Override
@@ -105,7 +105,7 @@ public final void retractRight(UniTuple<Right_> rightTuple) {
         }
         IndexedSet<OutTuple_> outTupleSetRight = rightTuple.removeStore(inputStoreIndexRightOutTupleSet);
         rightTupleSet.remove(rightTuple);
-        outTupleSetRight.forEach(this::retractOutTuple);
+        outTupleSetRight.clear(this::retractOutTupleByRight);
     }
 
 }