Merge pull request #31 from OszkarSemerath/datastructure

Datastructure versions

11 files changed, 72 insertions, 62 deletions

diff --git a/subprojects/store/src/test/java/tools/refinery/store/map/tests/InOrderCursorTest.java b/subprojects/store/src/test/java/tools/refinery/store/map/tests/InOrderCursorTest.java
index 4ada4ea4..98756460 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/map/tests/InOrderCursorTest.java
+++ b/subprojects/store/src/test/java/tools/refinery/store/map/tests/InOrderCursorTest.java
@@ -8,8 +8,8 @@ package tools.refinery.store.map.tests;
 import org.junit.jupiter.api.Test;
 import tools.refinery.store.map.VersionedMapStore;
 import tools.refinery.store.map.VersionedMapStoreFactoryBuilder;
-import tools.refinery.store.map.internal.InOrderMapCursor;
-import tools.refinery.store.map.internal.VersionedMapImpl;
+import tools.refinery.store.map.internal.state.InOrderMapCursor;
+import tools.refinery.store.map.internal.state.VersionedMapStateImpl;
 import tools.refinery.store.map.tests.utils.MapTestEnvironment;
 
 import static org.junit.jupiter.api.Assertions.*;
@@ -26,7 +26,7 @@ class InOrderCursorTest {
                                 .build()
                                 .createOne();
 
-                VersionedMapImpl<Integer,String> map = (VersionedMapImpl<Integer,String>) store.createMap();
+                VersionedMapStateImpl<Integer,String> map = (VersionedMapStateImpl<Integer,String>) store.createMap();
                 checkMove(map,0);
 
                 map.put(1,"A");
@@ -44,7 +44,7 @@ class InOrderCursorTest {
 
         }
 
-        private void checkMove(VersionedMapImpl<Integer,String> map, int num) {
+        private void checkMove(VersionedMapStateImpl<Integer,String> map, int num) {
                 InOrderMapCursor<Integer,String> cursor = new InOrderMapCursor<>(map);
                 for(int i=0; i<num; i++) {
                         assertTrue(cursor.move());
diff --git a/subprojects/store/src/test/java/tools/refinery/store/map/tests/MapUnitTests.java b/subprojects/store/src/test/java/tools/refinery/store/map/tests/MapUnitTests.java
index 2be49bd9..cc2e425c 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/map/tests/MapUnitTests.java
+++ b/subprojects/store/src/test/java/tools/refinery/store/map/tests/MapUnitTests.java
@@ -7,7 +7,7 @@ package tools.refinery.store.map.tests;
 
 import org.junit.jupiter.api.Test;
 import tools.refinery.store.map.VersionedMapStore;
-import tools.refinery.store.map.VersionedMapStoreImpl;
+import tools.refinery.store.map.internal.state.VersionedMapStoreStateImpl;
 import tools.refinery.store.model.TupleHashProvider;
 import tools.refinery.store.tuple.Tuple;
 
@@ -16,7 +16,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 class MapUnitTests {
         @Test
         void defaultTest() {
-                VersionedMapStore<Tuple, Boolean> store = new VersionedMapStoreImpl<>(TupleHashProvider.INSTANCE, false);
+                VersionedMapStore<Tuple, Boolean> store = new VersionedMapStoreStateImpl<>(TupleHashProvider.INSTANCE, false);
                 var map = store.createMap();
                 var out1 = map.put(Tuple.of(0), true);
                 assertEquals(false, out1);
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/MutableImmutableCompareFuzzTest.java b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/MutableImmutableCompareFuzzTest.java
index 420dade6..abfb4791 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/MutableImmutableCompareFuzzTest.java
+++ b/subprojects/store/src/test/java/tools/refinery/store/map/tests/fuzz/MutableImmutableCompareFuzzTest.java
@@ -17,10 +17,10 @@ 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.ContinousHashProvider;
+import tools.refinery.store.map.ContinuousHashProvider;
 import tools.refinery.store.map.VersionedMapStore;
-import tools.refinery.store.map.VersionedMapStoreImpl;
-import tools.refinery.store.map.internal.VersionedMapImpl;
+import tools.refinery.store.map.internal.state.VersionedMapStoreStateImpl;
+import tools.refinery.store.map.internal.state.VersionedMapStateImpl;
 import tools.refinery.store.map.tests.fuzz.utils.FuzzTestUtils;
 import tools.refinery.store.map.tests.utils.MapTestEnvironment;
 
@@ -28,11 +28,11 @@ class MutableImmutableCompareFuzzTest {
         private void runFuzzTest(String scenario, int seed, int steps, int maxKey, int maxValue,
                                                          boolean nullDefault, int commitFrequency, boolean evilHash) {
                 String[] values = MapTestEnvironment.prepareValues(maxValue, nullDefault);
-                ContinousHashProvider<Integer> chp = MapTestEnvironment.prepareHashProvider(evilHash);
+                ContinuousHashProvider<Integer> chp = MapTestEnvironment.prepareHashProvider(evilHash);
 
-                VersionedMapStore<Integer, String> store = new VersionedMapStoreImpl<>(chp, values[0]);
-                VersionedMapImpl<Integer, String> immutable = (VersionedMapImpl<Integer, String>) store.createMap();
-                VersionedMapImpl<Integer, String> mutable = (VersionedMapImpl<Integer, String>) store.createMap();
+                VersionedMapStore<Integer, String> store = new VersionedMapStoreStateImpl<>(chp, values[0]);
+                VersionedMapStateImpl<Integer, String> immutable = (VersionedMapStateImpl<Integer, String>) store.createMap();
+                VersionedMapStateImpl<Integer, String> mutable = (VersionedMapStateImpl<Integer, String>) store.createMap();
 
                 Random r = new Random(seed);
 
@@ -40,8 +40,8 @@ class MutableImmutableCompareFuzzTest {
                                 commitFrequency);
         }
 
-        private void iterativeRandomPutsAndCommitsAndCompare(String scenario, VersionedMapImpl<Integer, String> immutable,
-                                                                                                                 VersionedMapImpl<Integer, String> mutable, int steps, int maxKey, String[] values, Random r,
+        private void iterativeRandomPutsAndCommitsAndCompare(String scenario, VersionedMapStateImpl<Integer, String> immutable,
+                                                                                                                 VersionedMapStateImpl<Integer, String> mutable, int steps, int maxKey, String[] values, Random r,
                                                                                                                  int commitFrequency) {
                 for (int i = 0; i < steps; i++) {
                         int index = i + 1;
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 680d962d..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
@@ -18,10 +18,11 @@ 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.ContinousHashProvider;
+import tools.refinery.store.map.ContinuousHashProvider;
+import tools.refinery.store.map.Version;
 import tools.refinery.store.map.VersionedMapStore;
-import tools.refinery.store.map.VersionedMapStoreImpl;
-import tools.refinery.store.map.internal.VersionedMapImpl;
+import tools.refinery.store.map.internal.state.VersionedMapStoreStateImpl;
+import tools.refinery.store.map.internal.state.VersionedMapStateImpl;
 import tools.refinery.store.map.tests.fuzz.utils.FuzzTestUtils;
 import tools.refinery.store.map.tests.utils.MapTestEnvironment;
 
@@ -31,9 +32,9 @@ class SharedStoreFuzzTest {
         private void runFuzzTest(String scenario, int seed, int steps, int maxKey, int maxValue,
                                                          boolean nullDefault, int commitFrequency, boolean evilHash) {
                 String[] values = MapTestEnvironment.prepareValues(maxValue, nullDefault);
-                ContinousHashProvider<Integer> chp = MapTestEnvironment.prepareHashProvider(evilHash);
+                ContinuousHashProvider<Integer> chp = MapTestEnvironment.prepareHashProvider(evilHash);
 
-                List<VersionedMapStore<Integer, String>> stores = VersionedMapStoreImpl.createSharedVersionedMapStores(5, chp, values[0]);
+                List<VersionedMapStore<Integer, String>> stores = VersionedMapStoreStateImpl.createSharedVersionedMapStores(5, chp, values[0]);
 
                 iterativeRandomPutsAndCommitsThenRestore(scenario, stores, steps, maxKey, values, seed, commitFrequency);
         }
@@ -42,12 +43,12 @@ class SharedStoreFuzzTest {
                                                                                                                   int steps, int maxKey, String[] values, int seed, int commitFrequency) {
                 // 1. maps with versions
                 Random r = new Random(seed);
-                List<VersionedMapImpl<Integer, String>> versioneds = new LinkedList<>();
+                List<VersionedMapStateImpl<Integer, String>> versioneds = new LinkedList<>();
                 for (VersionedMapStore<Integer, String> store : stores) {
-                        versioneds.add((VersionedMapImpl<Integer, String>) store.createMap());
+                        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,16 +60,16 @@ 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");
                         }
                 }
                 // 2. create a non-versioned and
-                List<VersionedMapImpl<Integer, String>> reference = new LinkedList<>();
+                List<VersionedMapStateImpl<Integer, String>> reference = new LinkedList<>();
                 for (VersionedMapStore<Integer, String> store : stores) {
-                        reference.add((VersionedMapImpl<Integer, String>) store.createMap());
+                        reference.add((VersionedMapStateImpl<Integer, String>) store.createMap());
                 }
                 r = new Random(seed);
 
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 e7348370..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
@@ -6,7 +6,7 @@
 package tools.refinery.store.map.tests.utils;
 
 import tools.refinery.store.map.*;
-import tools.refinery.store.map.internal.VersionedMapImpl;
+import tools.refinery.store.map.internal.state.VersionedMapStateImpl;
 
 import java.util.*;
 import java.util.Map.Entry;
@@ -28,7 +28,7 @@ public class MapTestEnvironment<K, V> {
                 return values;
         }
 
-        public static ContinousHashProvider<Integer> prepareHashProvider(final boolean evil) {
+        public static ContinuousHashProvider<Integer> prepareHashProvider(final boolean evil) {
                 // Use maxPrime = 2147483629
 
                 return (key, index) -> {
@@ -125,7 +125,7 @@ public class MapTestEnvironment<K, V> {
                 }
         }
 
-        public long commit(){
+        public Version commit(){
                 return sut.commit();
         }
 
@@ -187,7 +187,7 @@ public class MapTestEnvironment<K, V> {
                         //System.out.println(cursor.getKey() + " " + ((VersionedMapImpl<K, V>) versionedMap).getHashProvider()
                         // .getHash(cursor.getKey(), 0));
                         if (previous != null) {
-                                int comparisonResult = ((VersionedMapImpl<K, V>) versionedMap).getHashProvider().compare(previous,
+                                int comparisonResult = ((VersionedMapStateImpl<K, V>) versionedMap).getHashProvider().compare(previous,
                                                 cursor.getKey());
                                 assertTrue(comparisonResult < 0, scenario + " Cursor order is not incremental!");
                         }
diff --git a/subprojects/store/src/test/java/tools/refinery/store/model/hashtests/HashEfficiencyTest.java b/subprojects/store/src/test/java/tools/refinery/store/model/hashtests/HashEfficiencyTest.java
index 4d4f5e26..5b595da7 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/model/hashtests/HashEfficiencyTest.java
+++ b/subprojects/store/src/test/java/tools/refinery/store/model/hashtests/HashEfficiencyTest.java
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.model.hashtests;
+package tools.refinery.store.model.hashTests;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -14,10 +14,9 @@ import java.util.Random;
 
 import org.junit.jupiter.api.Test;
 
-import tools.refinery.store.map.ContinousHashProvider;
+import tools.refinery.store.map.ContinuousHashProvider;
 import tools.refinery.store.tuple.Tuple;
 import tools.refinery.store.model.TupleHashProvider;
-import tools.refinery.store.model.TupleHashProviderBitMagic;
 
 class HashEfficiencyTest {
 
@@ -95,7 +94,7 @@ class HashEfficiencyTest {
                 List<Tuple> p = nRandoms(2, amount, 1);;
                 assertEquals(amount,p.size());
         }
-        private static double calculateHashClashes(List<Tuple> tuples, ContinousHashProvider<Tuple> chp) {
+        private static double calculateHashClashes(List<Tuple> tuples, ContinuousHashProvider<Tuple> chp) {
                 int sumClashes = 0;
 
                 for(int i = 0; i<tuples.size(); i++) {
@@ -108,7 +107,7 @@ class HashEfficiencyTest {
                 }
                 return (sumClashes+0.0) / tuples.size();
         }
-        private static int calculateHashClash(ContinousHashProvider<Tuple> chp, Tuple a, Tuple b) {
+        private static int calculateHashClash(ContinuousHashProvider<Tuple> chp, Tuple a, Tuple b) {
                 if(a.equals(b)) return 0;
                 final int bits = 5;
                 final int segments = Integer.SIZE/bits;
@@ -131,11 +130,9 @@ class HashEfficiencyTest {
         }
         public static void main(String[] args) {
                 List<String> hashNames = new LinkedList<>();
-                List<ContinousHashProvider<Tuple>> hashes = new LinkedList<>();
+                List<ContinuousHashProvider<Tuple>> hashes = new LinkedList<>();
                 hashNames.add("PrimeGroup");
                 hashes.add(new TupleHashProvider());
-                hashNames.add("BitMagic");
-                hashes.add(new TupleHashProviderBitMagic());
 
                 int[] arities = new int[] {2,3,4,5};
                 int[] sizes = new int[] {32*32,32*32*8};
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());