Versioned.commit + Versioned.restore uses Version instead of long.

When a Version is collected by gc, the store lets the state get collected by gc as well.

7 files changed, 40 insertions, 27 deletions

diff --git a/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/DiffCursorFuzzTest.java b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/DiffCursorFuzzTest.java
index 5a4f8038..94259edc 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/DiffCursorFuzzTest.java
+++ b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/DiffCursorFuzzTest.java
@@ -10,13 +10,12 @@ import org.junit.jupiter.api.Timeout;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
-import tools.refinery.store.map.DiffCursor;
-import tools.refinery.store.map.VersionedMap;
-import tools.refinery.store.map.VersionedMapStore;
-import tools.refinery.store.map.VersionedMapStoreFactoryBuilder;
+import tools.refinery.store.map.*;
 import tools.refinery.store.map.tests.fuzz.utils.FuzzTestUtils;
 import tools.refinery.store.map.tests.utils.MapTestEnvironment;
 
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Random;
 import java.util.stream.Stream;
 
@@ -39,6 +38,7 @@ class DiffCursorFuzzTest {
                                                                                                                          int commitFrequency, boolean commitBeforeDiffCursor) {
 
                 int largestCommit = -1;
+                Map<Integer,Version> index2Version = new HashMap<>();
 
                 {
                         // 1. build a map with versions
@@ -55,8 +55,9 @@ class DiffCursorFuzzTest {
                                         fail(scenario + ":" + index + ": exception happened: " + exception);
                                 }
                                 if (index % commitFrequency == 0) {
-                                        long version = versioned.commit();
-                                        largestCommit = (int) version;
+                                        Version version = versioned.commit();
+                                        index2Version.put(index,version);
+                                        largestCommit = index;
                                 }
                                 if (index % 10000 == 0)
                                         System.out.println(scenario + ":" + index + "/" + steps + " building finished");
@@ -73,20 +74,20 @@ class DiffCursorFuzzTest {
                                 int index = i + 1;
                                 if (index % diffTravelFrequency == 0) {
                                         // diff-travel
-                                        long travelToVersion = r2.nextInt(largestCommit + 1);
+                                        int travelToVersion = r2.nextInt(largestCommit + 1);
 
-                                        VersionedMap<Integer, String> oracle = store.createMap(travelToVersion);
+                                        VersionedMap<Integer, String> oracle = store.createMap(index2Version.get(travelToVersion));
 
                                         if(commitBeforeDiffCursor) {
                                                 moving.commit();
                                         }
-                                        DiffCursor<Integer, String> diffCursor = moving.getDiffCursor(travelToVersion);
+                                        DiffCursor<Integer, String> diffCursor = moving.getDiffCursor(index2Version.get(travelToVersion));
                                         moving.putAll(diffCursor);
                                         moving.commit();
 
                                         MapTestEnvironment.compareTwoMaps(scenario + ":c" + index, oracle, moving);
 
-                                        moving.restore(travelToVersion);
+                                        moving.restore(index2Version.get(travelToVersion));
 
                                 } else {
                                         // random puts
diff --git a/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/MultiThreadTestRunnable.java b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/MultiThreadTestRunnable.java
index 9b2e591a..dfe46bae 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/MultiThreadTestRunnable.java
+++ b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/MultiThreadTestRunnable.java
@@ -13,6 +13,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Random;
 
+import tools.refinery.store.map.Version;
 import tools.refinery.store.map.VersionedMap;
 import tools.refinery.store.map.VersionedMapStore;
 import tools.refinery.store.map.tests.utils.MapTestEnvironment;
@@ -61,7 +62,7 @@ public class MultiThreadTestRunnable implements Runnable {
                 // 1. build a map with versions
                 Random r = new Random(seed);
                 VersionedMap<Integer, String> versioned =  store.createMap();
-                Map<Integer, Long> index2Version = new HashMap<>();
+                Map<Integer, Version> index2Version = new HashMap<>();
 
                 for (int i = 0; i < steps; i++) {
                         int index = i + 1;
@@ -74,7 +75,7 @@ public class MultiThreadTestRunnable implements Runnable {
                                 logAndThrowError(scenario + ":" + index + ": exception happened: " + exception);
                         }
                         if (index % commitFrequency == 0) {
-                                long version = versioned.commit();
+                                Version version = versioned.commit();
                                 index2Version.put(i, version);
                         }
                         MapTestEnvironment.printStatus(scenario, index, steps, "building");
@@ -100,13 +101,12 @@ public class MultiThreadTestRunnable implements Runnable {
                                 MapTestEnvironment.compareTwoMaps(scenario + ":" + index, reference, versioned, null);
 
                                 // go back to a random state (probably created by another thread)
-                                List<Long> states = new ArrayList<>(store.getStates());
-                                states.sort(Long::compare);
+                                List<Version> states = new ArrayList<>(index2Version.values());
+                                //states.sort(Long::compare);
                                 Collections.shuffle(states, r2);
-                                for (Long state : states.subList(0, Math.min(states.size(), 100))) {
-                                        long x = state;
-                                        versioned.restore(x);
-                                        var clean = store.createMap(x);
+                                for (Version state : states.subList(0, Math.min(states.size(), 100))) {
+                                        versioned.restore(state);
+                                        var clean = store.createMap(state);
                                         MapTestEnvironment.compareTwoMaps(scenario + ":" + index, clean, versioned, null);
                                 }
                                 versioned.restore(index2Version.get(i));
diff --git a/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/RestoreFuzzTest.java b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/RestoreFuzzTest.java
index 0b399c3a..5c768788 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/RestoreFuzzTest.java
+++ b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/RestoreFuzzTest.java
@@ -10,6 +10,7 @@ import org.junit.jupiter.api.Timeout;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
+import tools.refinery.store.map.Version;
 import tools.refinery.store.map.VersionedMap;
 import tools.refinery.store.map.VersionedMapStore;
 import tools.refinery.store.map.VersionedMapStoreFactoryBuilder;
@@ -40,7 +41,7 @@ class RestoreFuzzTest {
                 // 1. build a map with versions
                 Random r = new Random(seed);
                 VersionedMap<Integer, String> versioned = store.createMap();
-                Map<Integer, Long> index2Version = new HashMap<>();
+                Map<Integer, Version> index2Version = new HashMap<>();
 
                 for (int i = 0; i < steps; i++) {
                         int index = i + 1;
@@ -53,7 +54,7 @@ class RestoreFuzzTest {
                                 fail(scenario + ":" + index + ": exception happened: " + exception);
                         }
                         if (index % commitFrequency == 0) {
-                                long version = versioned.commit();
+                                Version version = versioned.commit();
                                 index2Version.put(i, version);
                         }
                         MapTestEnvironment.printStatus(scenario, index, steps, "building");
diff --git a/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/SharedStoreFuzzTest.java b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/SharedStoreFuzzTest.java
index b17766b7..299c94b1 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/SharedStoreFuzzTest.java
+++ b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/SharedStoreFuzzTest.java
@@ -19,6 +19,7 @@ import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
 import tools.refinery.store.map.ContinuousHashProvider;
+import tools.refinery.store.map.Version;
 import tools.refinery.store.map.VersionedMapStore;
 import tools.refinery.store.map.internal.state.VersionedMapStoreStateImpl;
 import tools.refinery.store.map.internal.state.VersionedMapStateImpl;
@@ -47,7 +48,7 @@ class SharedStoreFuzzTest {
                         versioneds.add((VersionedMapStateImpl<Integer, String>) store.createMap());
                 }
 
-                List<Map<Integer, Long>> index2Version = new LinkedList<>();
+                List<Map<Integer, Version>> index2Version = new LinkedList<>();
                 for (int i = 0; i < stores.size(); i++) {
                         index2Version.add(new HashMap<>());
                 }
@@ -59,7 +60,7 @@ class SharedStoreFuzzTest {
                                 String nextValue = values[r.nextInt(values.length)];
                                 versioneds.get(storeIndex).put(nextKey, nextValue);
                                 if (stepIndex % commitFrequency == 0) {
-                                        long version = versioneds.get(storeIndex).commit();
+                                        Version version = versioneds.get(storeIndex).commit();
                                         index2Version.get(storeIndex).put(i, version);
                                 }
                                 MapTestEnvironment.printStatus(scenario, stepIndex, steps, "building");
diff --git a/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/utils/FuzzTestCollections.java b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/utils/FuzzTestCollections.java
index 4c3ecb09..ec04904e 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/utils/FuzzTestCollections.java
+++ b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/utils/FuzzTestCollections.java
@@ -18,26 +18,35 @@ public final class FuzzTestCollections {
         public static final Object[] randomSeedOptions = {1};
         public static final Object[] storeConfigs = {
                         // State based
+                        // Default
                         VersionedMapStore.<Integer,String>builder()
-                                        .stateBasedImmutableWhenCommitting(true)
                                         .stateBasedHashProvider(MapTestEnvironment.prepareHashProvider(false))
                                         .stateBasedSharingStrategy(VersionedMapStoreFactoryBuilder.SharingStrategy.SHARED_NODE_CACHE),
+                        // Evil hash code test
                         VersionedMapStore.<Integer,String>builder()
-                                        .stateBasedImmutableWhenCommitting(true)
                                         .stateBasedHashProvider(MapTestEnvironment.prepareHashProvider(true))
                                         .stateBasedSharingStrategy(VersionedMapStoreFactoryBuilder.SharingStrategy.SHARED_NODE_CACHE),
+                        // No weak hashmap test
+                        VersionedMapStore.<Integer,String>builder()
+                                        .versionFreeing(false)
+                                        .stateBasedHashProvider(MapTestEnvironment.prepareHashProvider(false))
+                                        .stateBasedSharingStrategy(VersionedMapStoreFactoryBuilder.SharingStrategy.SHARED_NODE_CACHE),
+                        // Copy when committing, do not hurt the work copy, share between saves.
                         VersionedMapStore.<Integer,String>builder()
                                         .stateBasedImmutableWhenCommitting(false)
                                         .stateBasedHashProvider(MapTestEnvironment.prepareHashProvider(false))
                                         .stateBasedSharingStrategy(VersionedMapStoreFactoryBuilder.SharingStrategy.SHARED_NODE_CACHE),
+                        // Copy when committing, do not hurt the work copy, do not share between states.
                         VersionedMapStore.<Integer,String>builder()
                                         .stateBasedImmutableWhenCommitting(false)
                                         .stateBasedHashProvider(MapTestEnvironment.prepareHashProvider(false))
                                         .stateBasedSharingStrategy(VersionedMapStoreFactoryBuilder.SharingStrategy.NO_NODE_CACHE),
 
                         // Delta based
+                        // Set based transactions
                         VersionedMapStore.<Integer,String>builder()
                                         .deltaTransactionStrategy(VersionedMapStoreFactoryBuilder.DeltaTransactionStrategy.SET),
+                        // List based transactions
                         VersionedMapStore.<Integer,String>builder()
                                         .deltaTransactionStrategy(VersionedMapStoreFactoryBuilder.DeltaTransactionStrategy.LIST)
         };
diff --git a/subprojects/store/src/test/java/tools/refinery/store/map/tests/utils/MapTestEnvironment.java b/subprojects/store/src/test/java/tools/refinery/store/map/tests/utils/MapTestEnvironment.java
index 401f2866..b84df280 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/map/tests/utils/MapTestEnvironment.java
+++ b/subprojects/store/src/test/java/tools/refinery/store/map/tests/utils/MapTestEnvironment.java
@@ -125,7 +125,7 @@ public class MapTestEnvironment<K, V> {
                 }
         }
 
-        public long commit(){
+        public Version commit(){
                 return sut.commit();
         }
 
diff --git a/subprojects/store/src/test/java/tools/refinery/store/model/tests/ModelTest.java b/subprojects/store/src/test/java/tools/refinery/store/model/tests/ModelTest.java
index 56b75804..dc7b776e 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/model/tests/ModelTest.java
+++ b/subprojects/store/src/test/java/tools/refinery/store/model/tests/ModelTest.java
@@ -6,6 +6,7 @@
 package tools.refinery.store.model.tests;
 
 import org.junit.jupiter.api.Test;
+import tools.refinery.store.map.Version;
 import tools.refinery.store.model.Model;
 import tools.refinery.store.model.ModelStore;
 import tools.refinery.store.representation.Symbol;
@@ -120,7 +121,7 @@ class ModelTest {
                 assertTrue(model.hasUncommittedChanges());
                 assertEquals(Model.NO_STATE_ID, model.getState());
 
-                long state1 = model.commit();
+                Version state1 = model.commit();
 
                 assertFalse(model.hasUncommittedChanges());
                 assertEquals(state1, model.getState());
@@ -134,7 +135,7 @@ class ModelTest {
                 assertTrue(model.hasUncommittedChanges());
                 assertEquals(state1, model.getState());
 
-                long state2 = model.commit();
+                Version state2 = model.commit();
 
                 assertFalse(model.hasUncommittedChanges());
                 assertEquals(state2, model.getState());