Synchronize SELECT in CacheMap

jaxdb · Jun 19, 2023 · 6eadb47 · 6eadb47
1 parent 52a6b16
commit 6eadb47
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 14 deletions.
diff --git a/jsql/src/main/java/org/jaxdb/jsql/CacheMap.java b/jsql/src/main/java/org/jaxdb/jsql/CacheMap.java
@@ -156,17 +156,25 @@ void selectAll() throws IOException, SQLException {
 
   V select(final data.Key key) throws IOException, SQLException {
     if (!containsKey(key)) {
-      select(andEq(key));
-      addKey(key);
+      synchronized (this) {
+        if (!containsKey(key)) {
+          select(andEq(key));
+          addKey(key);
+        }
+      }
     }
 
     return get(key);
   }
 
   final V superSelect(final data.Key key) throws IOException, SQLException {
     if (!containsKey(key)) {
-      select(andEq(key));
-      addKey(key);
+      synchronized (this) {
+        if (!containsKey(key)) {
+          select(andEq(key));
+          addKey(key);
+        }
+      }
     }
 
     return superGet(key);

diff --git a/jsql/src/main/java/org/jaxdb/jsql/DerbyCompiler.java b/jsql/src/main/java/org/jaxdb/jsql/DerbyCompiler.java
@@ -277,6 +277,9 @@ void compileInsertOnConflict(final data.Column<?>[] columns, final Select.untype
     final Condition<?> matchRefinement;
     boolean modified = false;
     if (select == null) {
+      if (onConflict == null)
+        throw new IllegalArgumentException("Derby requires primary columns for INSERT table ON CONFLICT clause");
+
       translateTypes = null;
       selectColumnNames = null;
       matchRefinement = null;

diff --git a/jsql/src/main/java/org/jaxdb/jsql/HashTreeCacheMap.java b/jsql/src/main/java/org/jaxdb/jsql/HashTreeCacheMap.java
@@ -274,11 +274,16 @@ final SortedMap<data.Key,V> select(final data.Key fromKey, final data.Key toKey)
     if (fromKey.length() > 1)
       throw new UnsupportedOperationException("Composite keys are not yet supported");
 
-    final Interval<data.Key>[] diff = diffKeys(fromKey, toKey);
+    Interval<data.Key>[] diff = diffKeys(fromKey, toKey);
     if (diff.length > 0) {
-      select(where(diff));
-      hashMask.addAll(diff);
-      treeMask.addAll(diff);
+      synchronized (this) {
+        diff = diffKeys(fromKey, toKey);
+        if (diff.length > 0) {
+          select(where(diff));
+          hashMask.addAll(diff);
+          treeMask.addAll(diff);
+        }
+      }
     }
 
     return subMap(fromKey, toKey);

diff --git a/jsql/src/main/java/org/jaxdb/jsql/TreeCacheMap.java b/jsql/src/main/java/org/jaxdb/jsql/TreeCacheMap.java
@@ -259,10 +259,15 @@ final SortedMap<data.Key,V> select(final data.Key fromKey, final data.Key toKey)
     if (fromKey.length() > 1)
       throw new UnsupportedOperationException("Composite keys are not yet supported");
 
-    final Interval<data.Key>[] diff = diffKeys(fromKey, toKey);
+    Interval<data.Key>[] diff = diffKeys(fromKey, toKey);
     if (diff.length > 0) {
-      select(where(diff));
-      mask.addAll(diff);
+      synchronized (this) {
+        diff = diffKeys(fromKey, toKey);
+        if (diff.length > 0) {
+          select(where(diff));
+          mask.addAll(diff);
+        }
+      }
     }
 
     return subMap(fromKey, toKey);

diff --git a/jsql/src/main/java/org/jaxdb/jsql/data.java b/jsql/src/main/java/org/jaxdb/jsql/data.java
@@ -41,6 +41,7 @@
 import java.time.LocalTime;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Comparator;
 import java.util.IdentityHashMap;
 import java.util.Iterator;
 import java.util.Map;
@@ -4345,9 +4346,11 @@ public static Key with(final String value) {
     private final Object[] values;
     private final Column[] columns;
 
+    private static final Comparator<Key> comparator = (o1, o2) -> o1.compareTo(o2);
+
     private Key(final Column<?>[] columns, final Object ... values) {
       min = this;
-      c = (o1, o2) -> o1.compareTo(o2);
+      c = comparator;
 
       this.columns = columns;
       this.values = values;
@@ -4366,8 +4369,6 @@ public int compareTo(final Interval<Key> o) {
 
       final Key key = (Key)o;
       final int i$ = length();
-      if (key == null)
-        System.out.println();
       if (i$ != key.length())
         throw new IllegalArgumentException("this.length() (" + i$ + ") != that.length() (" + key.length() + ")");