copilot

Author: triceo

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

@@ -173,7 +173,8 @@ public final void retractLeft(LeftTuple_ leftTuple) {
     private void removeFromIndexerLeft(Object compositeKey, LeftTuple_ leftTuple,
             ListEntry<ExistsCounter<LeftTuple_>> counterEntry, boolean keepBucket) {
         if (useFusedEqualIndex) {
-            Bucket<ExistsCounter<LeftTuple_>, UniTuple<Right_>> bucket = leftTuple.getStore(inputStoreIndexLeftBucket);
+            Bucket<ExistsCounter<LeftTuple_>, UniTuple<Right_>> bucket =
+                    keepBucket ? leftTuple.getStore(inputStoreIndexLeftBucket) : leftTuple.removeStore(inputStoreIndexLeftBucket);
             bucket.removeLeft(compositeKey, counterEntry);
             if (!keepBucket) { // keepBucket: a same-bucket changed-key update re-adds immediately, so don't drop it.
                 fusedEqualIndex.removeBucketIfEmpty(compositeKey, bucket);

core/src/test/java/ai/timefold/solver/core/impl/bavet/common/index/ComparisonIndexerTest.java

@@ -14,8 +14,9 @@
  * Comparison is otherwise only exercised alongside a leading equal (see {@link EqualsAndComparisonIndexerTest});
  * a pure-comparison join takes the {@code useJoinIndex == false} branch and must still join correctly.
  * <p>
- * A single comparison joiner uses a {@link SingleKeyUnpacker}, so the index key is the raw (comparable) key,
- * not a {@link CompositeKey}; the tests put/query with raw keys accordingly.
+ * A single comparison joiner uses a {@link KeyUnpacker#single()},
+ * so the index key is the raw (comparable) key, not a {@link CompositeKey};
+ * the tests put/query with raw keys accordingly.
  */
 class ComparisonIndexerTest extends AbstractIndexerTest {