mirror of
https://github.com/Kingsrook/qqq.git
synced 2025-07-17 20:50:44 +00:00
Option to useSynchronizedCollections in RecordLookupHelper
This commit is contained in:
@ -23,6 +23,7 @@ package com.kingsrook.qqq.backend.core.processes.utils;
|
||||
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
@ -51,13 +52,14 @@ import com.kingsrook.qqq.backend.core.utils.ValueUtils;
|
||||
*******************************************************************************/
|
||||
public class RecordLookupHelper
|
||||
{
|
||||
private Map<String, Map<Serializable, QRecord>> recordMaps = new HashMap<>();
|
||||
private Map<String, Map<Serializable, QRecord>> recordMaps;
|
||||
|
||||
private Map<String, Map<Map<String, Serializable>, QRecord>> uniqueKeyMaps = new HashMap<>();
|
||||
private Map<String, Map<Map<String, Serializable>, QRecord>> uniqueKeyMaps;
|
||||
|
||||
private Set<String> preloadedKeys = new HashSet<>();
|
||||
private Set<String> preloadedKeys;
|
||||
|
||||
private Set<Pair<String, String>> disallowedOneOffLookups = new HashSet<>();
|
||||
private Set<Pair<String, String>> disallowedOneOffLookups;
|
||||
private boolean useSynchronizedCollections;
|
||||
|
||||
|
||||
|
||||
@ -67,6 +69,33 @@ public class RecordLookupHelper
|
||||
*******************************************************************************/
|
||||
public RecordLookupHelper()
|
||||
{
|
||||
this(false);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Constructor
|
||||
**
|
||||
*******************************************************************************/
|
||||
public RecordLookupHelper(boolean useSynchronizedCollections)
|
||||
{
|
||||
this.useSynchronizedCollections = useSynchronizedCollections;
|
||||
|
||||
if(useSynchronizedCollections)
|
||||
{
|
||||
recordMaps = Collections.synchronizedMap(new HashMap<>());
|
||||
uniqueKeyMaps = Collections.synchronizedMap(new HashMap<>());
|
||||
preloadedKeys = Collections.synchronizedSet(new HashSet<>());
|
||||
disallowedOneOffLookups = Collections.synchronizedSet(new HashSet<>());
|
||||
}
|
||||
else
|
||||
{
|
||||
recordMaps = new HashMap<>();
|
||||
uniqueKeyMaps = new HashMap<>();
|
||||
preloadedKeys = new HashSet<>();
|
||||
disallowedOneOffLookups = new HashSet<>();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -77,7 +106,7 @@ public class RecordLookupHelper
|
||||
public QRecord getRecordByUniqueKey(String tableName, Map<String, Serializable> uniqueKey) throws QException
|
||||
{
|
||||
String mapKey = tableName + "." + uniqueKey.keySet().stream().sorted().collect(Collectors.joining(","));
|
||||
Map<Map<String, Serializable>, QRecord> recordMap = uniqueKeyMaps.computeIfAbsent(mapKey, (k) -> new HashMap<>());
|
||||
Map<Map<String, Serializable>, QRecord> recordMap = uniqueKeyMaps.computeIfAbsent(mapKey, (k) -> useSynchronizedCollections ? Collections.synchronizedMap(new HashMap<>()) : new HashMap<>());
|
||||
|
||||
if(!recordMap.containsKey(uniqueKey))
|
||||
{
|
||||
@ -96,7 +125,7 @@ public class RecordLookupHelper
|
||||
public QRecord getRecordByKey(String tableName, String keyFieldName, Serializable key) throws QException
|
||||
{
|
||||
String mapKey = tableName + "." + keyFieldName;
|
||||
Map<Serializable, QRecord> recordMap = recordMaps.computeIfAbsent(mapKey, (k) -> new HashMap<>());
|
||||
Map<Serializable, QRecord> recordMap = recordMaps.computeIfAbsent(mapKey, (k) -> useSynchronizedCollections ? Collections.synchronizedMap(new HashMap<>()) : new HashMap<>());
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
// make sure we have they key object in the expected type //
|
||||
@ -150,7 +179,7 @@ public class RecordLookupHelper
|
||||
public void preloadRecords(String tableName, String keyFieldName, QQueryFilter filter) throws QException
|
||||
{
|
||||
String mapKey = tableName + "." + keyFieldName;
|
||||
Map<Serializable, QRecord> tableMap = recordMaps.computeIfAbsent(mapKey, s -> new HashMap<>());
|
||||
Map<Serializable, QRecord> tableMap = recordMaps.computeIfAbsent(mapKey, s -> useSynchronizedCollections ? Collections.synchronizedMap(new HashMap<>()) : new HashMap<>());
|
||||
tableMap.putAll(GeneralProcessUtils.loadTableToMap(tableName, keyFieldName, filter));
|
||||
}
|
||||
|
||||
@ -170,7 +199,7 @@ public class RecordLookupHelper
|
||||
}
|
||||
|
||||
String mapKey = tableName + "." + keyFieldName;
|
||||
Map<Serializable, QRecord> tableMap = recordMaps.computeIfAbsent(mapKey, s -> new HashMap<>());
|
||||
Map<Serializable, QRecord> tableMap = recordMaps.computeIfAbsent(mapKey, s -> useSynchronizedCollections ? Collections.synchronizedMap(new HashMap<>()) : new HashMap<>());
|
||||
|
||||
QQueryFilter filter = new QQueryFilter(new QFilterCriteria(keyFieldName, QCriteriaOperator.IN, inList));
|
||||
tableMap.putAll(GeneralProcessUtils.loadTableToMap(tableName, keyFieldName, filter));
|
||||
|
@ -22,8 +22,15 @@
|
||||
package com.kingsrook.qqq.backend.core.processes.utils;
|
||||
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.ConcurrentModificationException;
|
||||
import java.util.List;
|
||||
import java.util.concurrent.ExecutionException;
|
||||
import java.util.concurrent.ExecutorService;
|
||||
import java.util.concurrent.Executors;
|
||||
import java.util.concurrent.Future;
|
||||
import com.kingsrook.qqq.backend.core.BaseTest;
|
||||
import com.kingsrook.qqq.backend.core.context.CapturedContext;
|
||||
import com.kingsrook.qqq.backend.core.context.QContext;
|
||||
import com.kingsrook.qqq.backend.core.exceptions.QException;
|
||||
import com.kingsrook.qqq.backend.core.model.metadata.QInstance;
|
||||
@ -32,6 +39,7 @@ import com.kingsrook.qqq.backend.core.utils.TestUtils;
|
||||
import org.junit.jupiter.api.AfterEach;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import static org.assertj.core.api.Fail.fail;
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertNotNull;
|
||||
import static org.junit.jupiter.api.Assertions.assertNull;
|
||||
@ -195,4 +203,54 @@ class RecordLookupHelperTest extends BaseTest
|
||||
assertEquals(1, MemoryRecordStore.getStatistics().get(MemoryRecordStore.STAT_QUERIES_RAN));
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** run a lot of threads (eg, 100), each trying to do lots of work in a
|
||||
** shared recordLookupHelper. w/o the flag to use sync'ed collections, this
|
||||
** (usually?) fails with a ConcurrentModificationException - but with the sync'ed
|
||||
** collections, is safe.
|
||||
*******************************************************************************/
|
||||
@Test
|
||||
void testConcurrentModification() throws InterruptedException, ExecutionException
|
||||
{
|
||||
ExecutorService executorService = Executors.newFixedThreadPool(100);
|
||||
RecordLookupHelper recordLookupHelper = new RecordLookupHelper(true);
|
||||
|
||||
CapturedContext capture = QContext.capture();
|
||||
|
||||
List<Future<?>> futures = new ArrayList<>();
|
||||
for(int i = 0; i < 100; i++)
|
||||
{
|
||||
int finalI = i;
|
||||
Future<?> future = executorService.submit(() ->
|
||||
{
|
||||
QContext.init(capture);
|
||||
for(int j = 0; j < 25000; j++)
|
||||
{
|
||||
try
|
||||
{
|
||||
recordLookupHelper.getRecordByKey(String.valueOf(j), "id", j);
|
||||
}
|
||||
catch(ConcurrentModificationException cme)
|
||||
{
|
||||
fail("CME!", cme);
|
||||
}
|
||||
catch(Exception e)
|
||||
{
|
||||
//////////////
|
||||
// expected //
|
||||
//////////////
|
||||
}
|
||||
}
|
||||
});
|
||||
futures.add(future);
|
||||
}
|
||||
|
||||
for(Future<?> future : futures)
|
||||
{
|
||||
future.get();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
Reference in New Issue
Block a user