X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.db.impl%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fimpl%2Fquery%2FQueryCache.java;h=5a6f5d0ba67bb120e9bfe4f4cb08e06d80e8b50c;hb=1f8b50d81a1aa1bbd67a77f7cbc1060f2eb805d4;hp=dbd0068c3f66100404eda02d5fbba9d70fdc8308;hpb=1e957fc9da518f3bef8a2c19cad72772087e1b6a;p=simantics%2Fplatform.git diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/QueryCache.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/QueryCache.java index dbd0068c3..5a6f5d0ba 100644 --- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/QueryCache.java +++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/QueryCache.java @@ -1,9 +1,12 @@ package org.simantics.db.impl.query; +import org.simantics.db.ObjectResourceIdMap; import org.simantics.db.RelationInfo; +import org.simantics.db.common.utils.Logger; import org.simantics.db.exception.DatabaseException; import org.simantics.db.impl.graph.ReadGraphImpl; import org.simantics.db.impl.procedure.InternalProcedure; +import org.simantics.db.impl.query.QueryProcessor.SessionTask; import org.simantics.db.procedure.AsyncMultiProcedure; import org.simantics.db.procedure.AsyncProcedure; import org.simantics.db.procedure.ListenerBase; @@ -21,7 +24,7 @@ public class QueryCache extends QueryCacheBase { super(querySupport, threads); } - Objects getOrCreateObjects(int r1, int r2) throws DatabaseException { + Objects getOrCreateObjects(ReadGraphImpl graph, int r1, int r2) throws DatabaseException { Objects existing = null; synchronized(objectsMap) { existing = (Objects)objectsMap.get(r1,r2); @@ -30,6 +33,7 @@ public class QueryCache extends QueryCacheBase { existing.clearResult(querySupport); existing.setPending(); objectsMap.put(keyR2(r1,r2), existing); + size++; return existing; } if(existing.requiresComputation()) { @@ -37,7 +41,7 @@ public class QueryCache extends QueryCacheBase { return existing; } } - if(existing.isPending()) waitPending(existing); + if(existing.isPending()) waitPending(graph, existing); return existing; } @@ -47,23 +51,24 @@ public class QueryCache extends QueryCacheBase { } } - public static void runnerObjects(ReadGraphImpl graph, int r1, int r2, CacheEntry parent, ListenerBase listener, IntProcedure procedure) throws DatabaseException { - if(parent == null && listener == null) { + public static void runnerObjects(ReadGraphImpl graph, int r1, int r2, CacheEntry parent, ListenerBase listener, final IntProcedure procedure) throws DatabaseException { + QueryCache cache = graph.processor.cache; + if(parent == null && listener == null && !cache.shouldCache(graph.processor, r1,r2)) { Objects.computeForEach(graph, r1,r2, null, procedure); return; } - QueryCache cache = graph.processor.cache; - if(procedure == null) procedure = emptyProcedureObjects; - Objects entry = (Objects)cache.getOrCreateObjects(r1,r2); - ListenerEntry listenerEntry = cache.registerDependencies(graph, entry, parent, listener, procedure, false); - if(entry.isReady()) entry.performFromCache(graph, procedure); + Objects entry = (Objects)cache.getOrCreateObjects(graph, r1,r2); + IntProcedure procedure_ = procedure != null ? procedure : emptyProcedureObjects; + ListenerEntry listenerEntry = cache.registerDependencies(graph, entry, parent, listener, procedure_, false); + if(entry.isReady()) entry.performFromCache(graph, procedure_); else { - Objects.computeForEach(graph, r1,r2, entry, procedure); + assert(entry.isPending()); + Objects.computeForEach(graph, r1,r2, entry, procedure_); if(listenerEntry != null) cache.primeListenerEntry(listenerEntry, entry.getResult()); } } - Statements getOrCreateStatements(int r1, int r2) throws DatabaseException { + Statements getOrCreateStatements(ReadGraphImpl graph, int r1, int r2) throws DatabaseException { Statements existing = null; synchronized(statementsMap) { existing = (Statements)statementsMap.get(r1,r2); @@ -72,6 +77,7 @@ public class QueryCache extends QueryCacheBase { existing.clearResult(querySupport); existing.setPending(); statementsMap.put(keyR2(r1,r2), existing); + size++; return existing; } if(existing.requiresComputation()) { @@ -79,7 +85,7 @@ public class QueryCache extends QueryCacheBase { return existing; } } - if(existing.isPending()) waitPending(existing); + if(existing.isPending()) waitPending(graph, existing); return existing; } @@ -89,23 +95,24 @@ public class QueryCache extends QueryCacheBase { } } - public static void runnerStatements(ReadGraphImpl graph, int r1, int r2, CacheEntry parent, ListenerBase listener, TripleIntProcedure procedure) throws DatabaseException { - if(parent == null && listener == null) { + public static void runnerStatements(ReadGraphImpl graph, int r1, int r2, CacheEntry parent, ListenerBase listener, final TripleIntProcedure procedure) throws DatabaseException { + QueryCache cache = graph.processor.cache; + if(parent == null && listener == null && !cache.shouldCache(graph.processor, r1,r2)) { Statements.computeForEach(graph, r1,r2, null, procedure); return; } - QueryCache cache = graph.processor.cache; - if(procedure == null) procedure = emptyProcedureStatements; - Statements entry = (Statements)cache.getOrCreateStatements(r1,r2); - ListenerEntry listenerEntry = cache.registerDependencies(graph, entry, parent, listener, procedure, false); - if(entry.isReady()) entry.performFromCache(graph, procedure); + Statements entry = (Statements)cache.getOrCreateStatements(graph, r1,r2); + TripleIntProcedure procedure_ = procedure != null ? procedure : emptyProcedureStatements; + ListenerEntry listenerEntry = cache.registerDependencies(graph, entry, parent, listener, procedure_, false); + if(entry.isReady()) entry.performFromCache(graph, procedure_); else { - Statements.computeForEach(graph, r1,r2, entry, procedure); + assert(entry.isPending()); + Statements.computeForEach(graph, r1,r2, entry, procedure_); if(listenerEntry != null) cache.primeListenerEntry(listenerEntry, entry.getResult()); } } - DirectObjects getOrCreateDirectObjects(int r1, int r2) throws DatabaseException { + DirectObjects getOrCreateDirectObjects(ReadGraphImpl graph, int r1, int r2) throws DatabaseException { DirectObjects existing = null; synchronized(directObjectsMap) { existing = (DirectObjects)directObjectsMap.get(r1,r2); @@ -114,6 +121,7 @@ public class QueryCache extends QueryCacheBase { existing.clearResult(querySupport); existing.setPending(); directObjectsMap.put(keyR2(r1,r2), existing); + size++; return existing; } if(existing.requiresComputation()) { @@ -121,7 +129,7 @@ public class QueryCache extends QueryCacheBase { return existing; } } - if(existing.isPending()) waitPending(existing); + if(existing.isPending()) waitPending(graph, existing); return existing; } @@ -131,23 +139,24 @@ public class QueryCache extends QueryCacheBase { } } - public static void runnerDirectObjects(ReadGraphImpl graph, int r1, int r2, CacheEntry parent, ListenerBase listener, IntProcedure procedure) throws DatabaseException { - if(parent == null && listener == null) { + public static void runnerDirectObjects(ReadGraphImpl graph, int r1, int r2, CacheEntry parent, ListenerBase listener, final IntProcedure procedure) throws DatabaseException { + QueryCache cache = graph.processor.cache; + if(parent == null && listener == null && !cache.shouldCache(graph.processor, r1,r2)) { DirectObjects.computeForEach(graph, r1,r2, null, procedure); return; } - QueryCache cache = graph.processor.cache; - if(procedure == null) procedure = emptyProcedureDirectObjects; - DirectObjects entry = (DirectObjects)cache.getOrCreateDirectObjects(r1,r2); - ListenerEntry listenerEntry = cache.registerDependencies(graph, entry, parent, listener, procedure, false); - if(entry.isReady()) entry.performFromCache(graph, procedure); + DirectObjects entry = (DirectObjects)cache.getOrCreateDirectObjects(graph, r1,r2); + IntProcedure procedure_ = procedure != null ? procedure : emptyProcedureDirectObjects; + ListenerEntry listenerEntry = cache.registerDependencies(graph, entry, parent, listener, procedure_, false); + if(entry.isReady()) entry.performFromCache(graph, procedure_); else { - DirectObjects.computeForEach(graph, r1,r2, entry, procedure); + assert(entry.isPending()); + DirectObjects.computeForEach(graph, r1,r2, entry, procedure_); if(listenerEntry != null) cache.primeListenerEntry(listenerEntry, entry.getResult()); } } - RelationInfoQuery getOrCreateRelationInfoQuery(int r) throws DatabaseException { + RelationInfoQuery getOrCreateRelationInfoQuery(ReadGraphImpl graph, int r) throws DatabaseException { RelationInfoQuery existing = null; synchronized(relationInfoQueryMap) { existing = (RelationInfoQuery)relationInfoQueryMap.get(r); @@ -156,6 +165,7 @@ public class QueryCache extends QueryCacheBase { existing.clearResult(querySupport); existing.setPending(); relationInfoQueryMap.put(keyR(r), existing); + size++; return existing; } if(existing.requiresComputation()) { @@ -163,7 +173,7 @@ public class QueryCache extends QueryCacheBase { return existing; } } - if(existing.isPending()) waitPending(existing); + if(existing.isPending()) waitPending(graph, existing); return existing; } @@ -173,23 +183,24 @@ public class QueryCache extends QueryCacheBase { } } - public static void runnerRelationInfoQuery(ReadGraphImpl graph, int r, CacheEntry parent, ListenerBase listener, InternalProcedure procedure) throws DatabaseException { - if(parent == null && listener == null) { + public static void runnerRelationInfoQuery(ReadGraphImpl graph, int r, CacheEntry parent, ListenerBase listener, final InternalProcedure procedure) throws DatabaseException { + QueryCache cache = graph.processor.cache; + if(parent == null && listener == null && !cache.shouldCache(graph.processor, r)) { RelationInfoQuery.computeForEach(graph, r, null, procedure); return; } - QueryCache cache = graph.processor.cache; - if(procedure == null) procedure = emptyProcedureRelationInfoQuery; - RelationInfoQuery entry = (RelationInfoQuery)cache.getOrCreateRelationInfoQuery(r); - ListenerEntry listenerEntry = cache.registerDependencies(graph, entry, parent, listener, procedure, false); - if(entry.isReady()) entry.performFromCache(graph, procedure); + RelationInfoQuery entry = (RelationInfoQuery)cache.getOrCreateRelationInfoQuery(graph, r); + InternalProcedure procedure_ = procedure != null ? procedure : emptyProcedureRelationInfoQuery; + ListenerEntry listenerEntry = cache.registerDependencies(graph, entry, parent, listener, procedure_, false); + if(entry.isReady()) entry.performFromCache(graph, procedure_); else { - RelationInfoQuery.computeForEach(graph, r, entry, procedure); + assert(entry.isPending()); + RelationInfoQuery.computeForEach(graph, r, entry, procedure_); if(listenerEntry != null) cache.primeListenerEntry(listenerEntry, entry.getResult()); } } - URIToResource getOrCreateURIToResource(String id) throws DatabaseException { + URIToResource getOrCreateURIToResource(ReadGraphImpl graph, String id) throws DatabaseException { URIToResource existing = null; synchronized(uRIToResourceMap) { existing = (URIToResource)uRIToResourceMap.get(id); @@ -198,6 +209,7 @@ public class QueryCache extends QueryCacheBase { existing.clearResult(querySupport); existing.setPending(); uRIToResourceMap.put(keyID(id), existing); + size++; return existing; } if(existing.requiresComputation()) { @@ -205,7 +217,7 @@ public class QueryCache extends QueryCacheBase { return existing; } } - if(existing.isPending()) waitPending(existing); + if(existing.isPending()) waitPending(graph, existing); return existing; } @@ -215,23 +227,24 @@ public class QueryCache extends QueryCacheBase { } } - public static void runnerURIToResource(ReadGraphImpl graph, String id, CacheEntry parent, ListenerBase listener, InternalProcedure procedure) throws DatabaseException { - if(parent == null && listener == null) { + public static void runnerURIToResource(ReadGraphImpl graph, String id, CacheEntry parent, ListenerBase listener, final InternalProcedure procedure) throws DatabaseException { + QueryCache cache = graph.processor.cache; + if(parent == null && listener == null && !cache.shouldCache(graph.processor, id)) { URIToResource.computeForEach(graph, id, null, procedure); return; } - QueryCache cache = graph.processor.cache; - if(procedure == null) procedure = emptyProcedureURIToResource; - URIToResource entry = (URIToResource)cache.getOrCreateURIToResource(id); - ListenerEntry listenerEntry = cache.registerDependencies(graph, entry, parent, listener, procedure, false); - if(entry.isReady()) entry.performFromCache(graph, procedure); + URIToResource entry = (URIToResource)cache.getOrCreateURIToResource(graph, id); + InternalProcedure procedure_ = procedure != null ? procedure : emptyProcedureURIToResource; + ListenerEntry listenerEntry = cache.registerDependencies(graph, entry, parent, listener, procedure_, false); + if(entry.isReady()) entry.performFromCache(graph, procedure_); else { - URIToResource.computeForEach(graph, id, entry, procedure); + assert(entry.isPending()); + URIToResource.computeForEach(graph, id, entry, procedure_); if(listenerEntry != null) cache.primeListenerEntry(listenerEntry, entry.getResult()); } } - ValueQuery getOrCreateValueQuery(int r) throws DatabaseException { + ValueQuery getOrCreateValueQuery(ReadGraphImpl graph, int r) throws DatabaseException { ValueQuery existing = null; synchronized(valueQueryMap) { existing = (ValueQuery)valueQueryMap.get(r); @@ -240,6 +253,7 @@ public class QueryCache extends QueryCacheBase { existing.clearResult(querySupport); existing.setPending(); valueQueryMap.put(keyR(r), existing); + size++; return existing; } if(existing.requiresComputation()) { @@ -247,7 +261,7 @@ public class QueryCache extends QueryCacheBase { return existing; } } - if(existing.isPending()) waitPending(existing); + if(existing.isPending()) waitPending(graph, existing); return existing; } @@ -257,23 +271,24 @@ public class QueryCache extends QueryCacheBase { } } - public static void runnerValueQuery(ReadGraphImpl graph, int r, CacheEntry parent, ListenerBase listener, InternalProcedure procedure) throws DatabaseException { - if(parent == null && listener == null) { + public static void runnerValueQuery(ReadGraphImpl graph, int r, CacheEntry parent, ListenerBase listener, final InternalProcedure procedure) throws DatabaseException { + QueryCache cache = graph.processor.cache; + if(parent == null && listener == null && !cache.shouldCache(graph.processor, r)) { ValueQuery.computeForEach(graph, r, null, procedure); return; } - QueryCache cache = graph.processor.cache; - if(procedure == null) procedure = emptyProcedureValueQuery; - ValueQuery entry = (ValueQuery)cache.getOrCreateValueQuery(r); - ListenerEntry listenerEntry = cache.registerDependencies(graph, entry, parent, listener, procedure, false); - if(entry.isReady()) entry.performFromCache(graph, procedure); + ValueQuery entry = (ValueQuery)cache.getOrCreateValueQuery(graph, r); + InternalProcedure procedure_ = procedure != null ? procedure : emptyProcedureValueQuery; + ListenerEntry listenerEntry = cache.registerDependencies(graph, entry, parent, listener, procedure_, false); + if(entry.isReady()) entry.performFromCache(graph, procedure_); else { - ValueQuery.computeForEach(graph, r, entry, procedure); + assert(entry.isPending()); + ValueQuery.computeForEach(graph, r, entry, procedure_); if(listenerEntry != null) cache.primeListenerEntry(listenerEntry, entry.getResult()); } } - OrderedSet getOrCreateOrderedSet(int r) throws DatabaseException { + OrderedSet getOrCreateOrderedSet(ReadGraphImpl graph, int r) throws DatabaseException { OrderedSet existing = null; synchronized(orderedSetMap) { existing = (OrderedSet)orderedSetMap.get(r); @@ -282,6 +297,7 @@ public class QueryCache extends QueryCacheBase { existing.clearResult(querySupport); existing.setPending(); orderedSetMap.put(keyR(r), existing); + size++; return existing; } if(existing.requiresComputation()) { @@ -289,7 +305,7 @@ public class QueryCache extends QueryCacheBase { return existing; } } - if(existing.isPending()) waitPending(existing); + if(existing.isPending()) waitPending(graph, existing); return existing; } @@ -299,23 +315,24 @@ public class QueryCache extends QueryCacheBase { } } - public static void runnerOrderedSet(ReadGraphImpl graph, int r, CacheEntry parent, ListenerBase listener, IntProcedure procedure) throws DatabaseException { - if(parent == null && listener == null) { + public static void runnerOrderedSet(ReadGraphImpl graph, int r, CacheEntry parent, ListenerBase listener, final IntProcedure procedure) throws DatabaseException { + QueryCache cache = graph.processor.cache; + if(parent == null && listener == null && !cache.shouldCache(graph.processor, r)) { OrderedSet.computeForEach(graph, r, null, procedure); return; } - QueryCache cache = graph.processor.cache; - if(procedure == null) procedure = emptyProcedureOrderedSet; - OrderedSet entry = (OrderedSet)cache.getOrCreateOrderedSet(r); - ListenerEntry listenerEntry = cache.registerDependencies(graph, entry, parent, listener, procedure, false); - if(entry.isReady()) entry.performFromCache(graph, procedure); + OrderedSet entry = (OrderedSet)cache.getOrCreateOrderedSet(graph, r); + IntProcedure procedure_ = procedure != null ? procedure : emptyProcedureOrderedSet; + ListenerEntry listenerEntry = cache.registerDependencies(graph, entry, parent, listener, procedure_, false); + if(entry.isReady()) entry.performFromCache(graph, procedure_); else { - OrderedSet.computeForEach(graph, r, entry, procedure); + assert(entry.isPending()); + OrderedSet.computeForEach(graph, r, entry, procedure_); if(listenerEntry != null) cache.primeListenerEntry(listenerEntry, entry.getResult()); } } - PrincipalTypes getOrCreatePrincipalTypes(int r) throws DatabaseException { + PrincipalTypes getOrCreatePrincipalTypes(ReadGraphImpl graph, int r) throws DatabaseException { PrincipalTypes existing = null; synchronized(principalTypesMap) { existing = (PrincipalTypes)principalTypesMap.get(r); @@ -324,6 +341,7 @@ public class QueryCache extends QueryCacheBase { existing.clearResult(querySupport); existing.setPending(); principalTypesMap.put(keyR(r), existing); + size++; return existing; } if(existing.requiresComputation()) { @@ -331,7 +349,7 @@ public class QueryCache extends QueryCacheBase { return existing; } } - if(existing.isPending()) waitPending(existing); + if(existing.isPending()) waitPending(graph, existing); return existing; } @@ -341,23 +359,24 @@ public class QueryCache extends QueryCacheBase { } } - public static void runnerPrincipalTypes(ReadGraphImpl graph, int r, CacheEntry parent, ListenerBase listener, IntProcedure procedure) throws DatabaseException { - if(parent == null && listener == null) { + public static void runnerPrincipalTypes(ReadGraphImpl graph, int r, CacheEntry parent, ListenerBase listener, final IntProcedure procedure) throws DatabaseException { + QueryCache cache = graph.processor.cache; + if(parent == null && listener == null && !cache.shouldCache(graph.processor, r)) { PrincipalTypes.computeForEach(graph, r, null, procedure); return; } - QueryCache cache = graph.processor.cache; - if(procedure == null) procedure = emptyProcedurePrincipalTypes; - PrincipalTypes entry = (PrincipalTypes)cache.getOrCreatePrincipalTypes(r); - ListenerEntry listenerEntry = cache.registerDependencies(graph, entry, parent, listener, procedure, false); - if(entry.isReady()) entry.performFromCache(graph, procedure); + PrincipalTypes entry = (PrincipalTypes)cache.getOrCreatePrincipalTypes(graph, r); + IntProcedure procedure_ = procedure != null ? procedure : emptyProcedurePrincipalTypes; + ListenerEntry listenerEntry = cache.registerDependencies(graph, entry, parent, listener, procedure_, false); + if(entry.isReady()) entry.performFromCache(graph, procedure_); else { - PrincipalTypes.computeForEach(graph, r, entry, procedure); + assert(entry.isPending()); + PrincipalTypes.computeForEach(graph, r, entry, procedure_); if(listenerEntry != null) cache.primeListenerEntry(listenerEntry, entry.getResult()); } } - DirectPredicates getOrCreateDirectPredicates(int r) throws DatabaseException { + DirectPredicates getOrCreateDirectPredicates(ReadGraphImpl graph, int r) throws DatabaseException { DirectPredicates existing = null; synchronized(directPredicatesMap) { existing = (DirectPredicates)directPredicatesMap.get(r); @@ -366,6 +385,7 @@ public class QueryCache extends QueryCacheBase { existing.clearResult(querySupport); existing.setPending(); directPredicatesMap.put(keyR(r), existing); + size++; return existing; } if(existing.requiresComputation()) { @@ -373,7 +393,7 @@ public class QueryCache extends QueryCacheBase { return existing; } } - if(existing.isPending()) waitPending(existing); + if(existing.isPending()) waitPending(graph, existing); return existing; } @@ -383,23 +403,24 @@ public class QueryCache extends QueryCacheBase { } } - public static void runnerDirectPredicates(ReadGraphImpl graph, int r, CacheEntry parent, ListenerBase listener, InternalProcedure procedure) throws DatabaseException { - if(parent == null && listener == null) { + public static void runnerDirectPredicates(ReadGraphImpl graph, int r, CacheEntry parent, ListenerBase listener, final InternalProcedure procedure) throws DatabaseException { + QueryCache cache = graph.processor.cache; + if(parent == null && listener == null && !cache.shouldCache(graph.processor, r)) { DirectPredicates.computeForEach(graph, r, null, procedure); return; } - QueryCache cache = graph.processor.cache; - if(procedure == null) procedure = emptyProcedureDirectPredicates; - DirectPredicates entry = (DirectPredicates)cache.getOrCreateDirectPredicates(r); - ListenerEntry listenerEntry = cache.registerDependencies(graph, entry, parent, listener, procedure, false); - if(entry.isReady()) entry.performFromCache(graph, procedure); + DirectPredicates entry = (DirectPredicates)cache.getOrCreateDirectPredicates(graph, r); + InternalProcedure procedure_ = procedure != null ? procedure : emptyProcedureDirectPredicates; + ListenerEntry listenerEntry = cache.registerDependencies(graph, entry, parent, listener, procedure_, false); + if(entry.isReady()) entry.performFromCache(graph, procedure_); else { - DirectPredicates.computeForEach(graph, r, entry, procedure); + assert(entry.isPending()); + DirectPredicates.computeForEach(graph, r, entry, procedure_); if(listenerEntry != null) cache.primeListenerEntry(listenerEntry, entry.getResult()); } } - Predicates getOrCreatePredicates(int r) throws DatabaseException { + Predicates getOrCreatePredicates(ReadGraphImpl graph, int r) throws DatabaseException { Predicates existing = null; synchronized(predicatesMap) { existing = (Predicates)predicatesMap.get(r); @@ -408,6 +429,7 @@ public class QueryCache extends QueryCacheBase { existing.clearResult(querySupport); existing.setPending(); predicatesMap.put(keyR(r), existing); + size++; return existing; } if(existing.requiresComputation()) { @@ -415,7 +437,7 @@ public class QueryCache extends QueryCacheBase { return existing; } } - if(existing.isPending()) waitPending(existing); + if(existing.isPending()) waitPending(graph, existing); return existing; } @@ -425,23 +447,24 @@ public class QueryCache extends QueryCacheBase { } } - public static void runnerPredicates(ReadGraphImpl graph, int r, CacheEntry parent, ListenerBase listener, InternalProcedure procedure) throws DatabaseException { - if(parent == null && listener == null) { + public static void runnerPredicates(ReadGraphImpl graph, int r, CacheEntry parent, ListenerBase listener, final InternalProcedure procedure) throws DatabaseException { + QueryCache cache = graph.processor.cache; + if(parent == null && listener == null && !cache.shouldCache(graph.processor, r)) { Predicates.computeForEach(graph, r, null, procedure); return; } - QueryCache cache = graph.processor.cache; - if(procedure == null) procedure = emptyProcedurePredicates; - Predicates entry = (Predicates)cache.getOrCreatePredicates(r); - ListenerEntry listenerEntry = cache.registerDependencies(graph, entry, parent, listener, procedure, false); - if(entry.isReady()) entry.performFromCache(graph, procedure); + Predicates entry = (Predicates)cache.getOrCreatePredicates(graph, r); + InternalProcedure procedure_ = procedure != null ? procedure : emptyProcedurePredicates; + ListenerEntry listenerEntry = cache.registerDependencies(graph, entry, parent, listener, procedure_, false); + if(entry.isReady()) entry.performFromCache(graph, procedure_); else { - Predicates.computeForEach(graph, r, entry, procedure); + assert(entry.isPending()); + Predicates.computeForEach(graph, r, entry, procedure_); if(listenerEntry != null) cache.primeListenerEntry(listenerEntry, entry.getResult()); } } - ReadEntry getOrCreateReadEntry(Read r) throws DatabaseException { + ReadEntry getOrCreateReadEntry(ReadGraphImpl graph, Read r, boolean isSync) throws DatabaseException { ReadEntry existing = null; synchronized(readEntryMap) { existing = (ReadEntry)readEntryMap.get(r); @@ -450,6 +473,7 @@ public class QueryCache extends QueryCacheBase { existing.clearResult(querySupport); existing.setPending(); readEntryMap.put(id(r), existing); + size++; return existing; } if(existing.requiresComputation()) { @@ -457,7 +481,10 @@ public class QueryCache extends QueryCacheBase { return existing; } } - if(existing.isPending()) waitPending(existing); + if(existing.isPending()) { + if(isSync) waitPending(graph, existing); + else return null; + } return existing; } @@ -467,23 +494,38 @@ public class QueryCache extends QueryCacheBase { } } - public static void runnerReadEntry(ReadGraphImpl graph, Read r, CacheEntry parent, ListenerBase listener, AsyncProcedure procedure) throws DatabaseException { - if(parent == null && listener == null) { + public static void runnerReadEntry(ReadGraphImpl graph, Read r, CacheEntry parent, ListenerBase listener, final AsyncProcedure procedure, boolean isSync) throws DatabaseException { + QueryCache cache = graph.processor.cache; + if(parent == null && listener == null && !cache.shouldCache(graph.processor, r)) { ReadEntry.computeForEach(graph, r, null, procedure); return; } - QueryCache cache = graph.processor.cache; - if(procedure == null) procedure = emptyProcedureReadEntry; - ReadEntry entry = (ReadEntry)cache.getOrCreateReadEntry(r); - ListenerEntry listenerEntry = cache.registerDependencies(graph, entry, parent, listener, procedure, false); - if(entry.isReady()) entry.performFromCache(graph, procedure); + ReadEntry entry = (ReadEntry)cache.getOrCreateReadEntry(graph, r, isSync); + if(entry == null) { + graph.processor.schedule(new SessionTask(false) { + @Override + public void run(int thread) { + try { + assert(!isSync); + runnerReadEntry(graph, r, parent, listener, procedure, isSync); + } catch (DatabaseException e) { + Logger.defaultLogError(e); + } + } + }); + return; + } + AsyncProcedure procedure_ = procedure != null ? procedure : emptyProcedureReadEntry; + ListenerEntry listenerEntry = cache.registerDependencies(graph, entry, parent, listener, procedure_, false); + if(entry.isReady()) entry.performFromCache(graph, procedure_); else { - ReadEntry.computeForEach(graph, r, entry, procedure); + assert(entry.isPending()); + ReadEntry.computeForEach(graph, r, entry, procedure_); if(listenerEntry != null) cache.primeListenerEntry(listenerEntry, entry.getResult()); } } - AsyncReadEntry getOrCreateAsyncReadEntry(AsyncRead r) throws DatabaseException { + AsyncReadEntry getOrCreateAsyncReadEntry(ReadGraphImpl graph, AsyncRead r, boolean isSync) throws DatabaseException { AsyncReadEntry existing = null; synchronized(asyncReadEntryMap) { existing = (AsyncReadEntry)asyncReadEntryMap.get(r); @@ -492,6 +534,7 @@ public class QueryCache extends QueryCacheBase { existing.clearResult(querySupport); existing.setPending(); asyncReadEntryMap.put(id(r), existing); + size++; return existing; } if(existing.requiresComputation()) { @@ -499,7 +542,10 @@ public class QueryCache extends QueryCacheBase { return existing; } } - if(existing.isPending()) waitPending(existing); + if(existing.isPending()) { + if(isSync) waitPending(graph, existing); + else return null; + } return existing; } @@ -509,23 +555,38 @@ public class QueryCache extends QueryCacheBase { } } - public static void runnerAsyncReadEntry(ReadGraphImpl graph, AsyncRead r, CacheEntry parent, ListenerBase listener, AsyncProcedure procedure) throws DatabaseException { - if(parent == null && listener == null) { + public static void runnerAsyncReadEntry(ReadGraphImpl graph, AsyncRead r, CacheEntry parent, ListenerBase listener, final AsyncProcedure procedure, boolean isSync) throws DatabaseException { + QueryCache cache = graph.processor.cache; + if(parent == null && listener == null && !cache.shouldCache(graph.processor, r)) { AsyncReadEntry.computeForEach(graph, r, null, procedure); return; } - QueryCache cache = graph.processor.cache; - if(procedure == null) procedure = emptyProcedureAsyncReadEntry; - AsyncReadEntry entry = (AsyncReadEntry)cache.getOrCreateAsyncReadEntry(r); - ListenerEntry listenerEntry = cache.registerDependencies(graph, entry, parent, listener, procedure, false); - if(entry.isReady()) entry.performFromCache(graph, procedure); + AsyncReadEntry entry = (AsyncReadEntry)cache.getOrCreateAsyncReadEntry(graph, r, isSync); + if(entry == null) { + graph.processor.schedule(new SessionTask(false) { + @Override + public void run(int thread) { + try { + assert(!isSync); + runnerAsyncReadEntry(graph, r, parent, listener, procedure, isSync); + } catch (DatabaseException e) { + Logger.defaultLogError(e); + } + } + }); + return; + } + AsyncProcedure procedure_ = procedure != null ? procedure : emptyProcedureAsyncReadEntry; + ListenerEntry listenerEntry = cache.registerDependencies(graph, entry, parent, listener, procedure_, false); + if(entry.isReady()) entry.performFromCache(graph, procedure_); else { - AsyncReadEntry.computeForEach(graph, r, entry, procedure); + assert(entry.isPending()); + AsyncReadEntry.computeForEach(graph, r, entry, procedure_); if(listenerEntry != null) cache.primeListenerEntry(listenerEntry, entry.getResult()); } } - Types getOrCreateTypes(int r) throws DatabaseException { + Types getOrCreateTypes(ReadGraphImpl graph, int r) throws DatabaseException { Types existing = null; synchronized(typesMap) { existing = (Types)typesMap.get(r); @@ -534,6 +595,7 @@ public class QueryCache extends QueryCacheBase { existing.clearResult(querySupport); existing.setPending(); typesMap.put(keyR(r), existing); + size++; return existing; } if(existing.requiresComputation()) { @@ -541,7 +603,7 @@ public class QueryCache extends QueryCacheBase { return existing; } } - if(existing.isPending()) waitPending(existing); + if(existing.isPending()) waitPending(graph, existing); return existing; } @@ -551,31 +613,33 @@ public class QueryCache extends QueryCacheBase { } } - public static void runnerTypes(ReadGraphImpl graph, int r, CacheEntry parent, ListenerBase listener, InternalProcedure procedure) throws DatabaseException { - if(parent == null && listener == null) { + public static void runnerTypes(ReadGraphImpl graph, int r, CacheEntry parent, ListenerBase listener, final InternalProcedure procedure) throws DatabaseException { + QueryCache cache = graph.processor.cache; + if(parent == null && listener == null && !cache.shouldCache(graph.processor, r)) { Types.computeForEach(graph, r, null, procedure); return; } - QueryCache cache = graph.processor.cache; - if(procedure == null) procedure = emptyProcedureTypes; - Types entry = (Types)cache.getOrCreateTypes(r); - ListenerEntry listenerEntry = cache.registerDependencies(graph, entry, parent, listener, procedure, false); - if(entry.isReady()) entry.performFromCache(graph, procedure); + Types entry = (Types)cache.getOrCreateTypes(graph, r); + InternalProcedure procedure_ = procedure != null ? procedure : emptyProcedureTypes; + ListenerEntry listenerEntry = cache.registerDependencies(graph, entry, parent, listener, procedure_, false); + if(entry.isReady()) entry.performFromCache(graph, procedure_); else { - Types.computeForEach(graph, r, entry, procedure); + assert(entry.isPending()); + Types.computeForEach(graph, r, entry, procedure_); if(listenerEntry != null) cache.primeListenerEntry(listenerEntry, entry.getResult()); } } - NamespaceIndex getOrCreateNamespaceIndex(String id) throws DatabaseException { - NamespaceIndex existing = null; - synchronized(namespaceIndexMap) { - existing = (NamespaceIndex)namespaceIndexMap.get(id); + ChildMap getOrCreateChildMap(ReadGraphImpl graph, int r) throws DatabaseException { + ChildMap existing = null; + synchronized(childMapMap) { + existing = (ChildMap)childMapMap.get(r); if(existing == null) { - existing = new NamespaceIndex(id); + existing = new ChildMap(r); existing.clearResult(querySupport); existing.setPending(); - namespaceIndexMap.put(keyID(id), existing); + childMapMap.put(keyR(r), existing); + size++; return existing; } if(existing.requiresComputation()) { @@ -583,33 +647,34 @@ public class QueryCache extends QueryCacheBase { return existing; } } - if(existing.isPending()) waitPending(existing); + if(existing.isPending()) waitPending(graph, existing); return existing; } - void remove(NamespaceIndex entry) { - synchronized(namespaceIndexMap) { - namespaceIndexMap.remove(entry.id); + void remove(ChildMap entry) { + synchronized(childMapMap) { + childMapMap.remove(entry.id); } } - public static void runnerNamespaceIndex(ReadGraphImpl graph, String id, CacheEntry parent, ListenerBase listener, InternalProcedure> procedure) throws DatabaseException { - if(parent == null && listener == null) { - NamespaceIndex.computeForEach(graph, id, null, procedure); + public static void runnerChildMap(ReadGraphImpl graph, int r, CacheEntry parent, ListenerBase listener, final InternalProcedure> procedure) throws DatabaseException { + QueryCache cache = graph.processor.cache; + if(parent == null && listener == null && !cache.shouldCache(graph.processor, r)) { + ChildMap.computeForEach(graph, r, null, procedure); return; } - QueryCache cache = graph.processor.cache; - if(procedure == null) procedure = emptyProcedureNamespaceIndex; - NamespaceIndex entry = (NamespaceIndex)cache.getOrCreateNamespaceIndex(id); - ListenerEntry listenerEntry = cache.registerDependencies(graph, entry, parent, listener, procedure, false); - if(entry.isReady()) entry.performFromCache(graph, procedure); + ChildMap entry = (ChildMap)cache.getOrCreateChildMap(graph, r); + InternalProcedure> procedure_ = procedure != null ? procedure : emptyProcedureChildMap; + ListenerEntry listenerEntry = cache.registerDependencies(graph, entry, parent, listener, procedure_, false); + if(entry.isReady()) entry.performFromCache(graph, procedure_); else { - NamespaceIndex.computeForEach(graph, id, entry, procedure); + assert(entry.isPending()); + ChildMap.computeForEach(graph, r, entry, procedure_); if(listenerEntry != null) cache.primeListenerEntry(listenerEntry, entry.getResult()); } } - AssertedStatements getOrCreateAssertedStatements(int r1, int r2) throws DatabaseException { + AssertedStatements getOrCreateAssertedStatements(ReadGraphImpl graph, int r1, int r2) throws DatabaseException { AssertedStatements existing = null; synchronized(assertedStatementsMap) { existing = (AssertedStatements)assertedStatementsMap.get(r1,r2); @@ -618,6 +683,7 @@ public class QueryCache extends QueryCacheBase { existing.clearResult(querySupport); existing.setPending(); assertedStatementsMap.put(keyR2(r1,r2), existing); + size++; return existing; } if(existing.requiresComputation()) { @@ -625,7 +691,7 @@ public class QueryCache extends QueryCacheBase { return existing; } } - if(existing.isPending()) waitPending(existing); + if(existing.isPending()) waitPending(graph, existing); return existing; } @@ -635,19 +701,20 @@ public class QueryCache extends QueryCacheBase { } } - public static void runnerAssertedStatements(ReadGraphImpl graph, int r1, int r2, CacheEntry parent, ListenerBase listener, TripleIntProcedure procedure) throws DatabaseException { + public static void runnerAssertedStatements(ReadGraphImpl graph, int r1, int r2, CacheEntry parent, ListenerBase listener, final TripleIntProcedure procedure) throws DatabaseException { QueryCache cache = graph.processor.cache; - if(procedure == null) procedure = emptyProcedureAssertedStatements; - AssertedStatements entry = (AssertedStatements)cache.getOrCreateAssertedStatements(r1,r2); - ListenerEntry listenerEntry = cache.registerDependencies(graph, entry, parent, listener, procedure, false); - if(entry.isReady()) entry.performFromCache(graph, procedure); + AssertedStatements entry = (AssertedStatements)cache.getOrCreateAssertedStatements(graph, r1,r2); + TripleIntProcedure procedure_ = procedure != null ? procedure : emptyProcedureAssertedStatements; + ListenerEntry listenerEntry = cache.registerDependencies(graph, entry, parent, listener, procedure_, false); + if(entry.isReady()) entry.performFromCache(graph, procedure_); else { - entry.compute(graph, procedure); + assert(entry.isPending()); + entry.compute(graph, procedure_); if(listenerEntry != null) cache.primeListenerEntry(listenerEntry, entry.getResult()); } } - AssertedPredicates getOrCreateAssertedPredicates(int r) throws DatabaseException { + AssertedPredicates getOrCreateAssertedPredicates(ReadGraphImpl graph, int r) throws DatabaseException { AssertedPredicates existing = null; synchronized(assertedPredicatesMap) { existing = (AssertedPredicates)assertedPredicatesMap.get(r); @@ -656,6 +723,7 @@ public class QueryCache extends QueryCacheBase { existing.clearResult(querySupport); existing.setPending(); assertedPredicatesMap.put(keyR(r), existing); + size++; return existing; } if(existing.requiresComputation()) { @@ -663,7 +731,7 @@ public class QueryCache extends QueryCacheBase { return existing; } } - if(existing.isPending()) waitPending(existing); + if(existing.isPending()) waitPending(graph, existing); return existing; } @@ -673,19 +741,20 @@ public class QueryCache extends QueryCacheBase { } } - public static void runnerAssertedPredicates(ReadGraphImpl graph, int r, CacheEntry parent, ListenerBase listener, IntProcedure procedure) throws DatabaseException { + public static void runnerAssertedPredicates(ReadGraphImpl graph, int r, CacheEntry parent, ListenerBase listener, final IntProcedure procedure) throws DatabaseException { QueryCache cache = graph.processor.cache; - if(procedure == null) procedure = emptyProcedureAssertedPredicates; - AssertedPredicates entry = (AssertedPredicates)cache.getOrCreateAssertedPredicates(r); - ListenerEntry listenerEntry = cache.registerDependencies(graph, entry, parent, listener, procedure, false); - if(entry.isReady()) entry.performFromCache(graph, procedure); + AssertedPredicates entry = (AssertedPredicates)cache.getOrCreateAssertedPredicates(graph, r); + IntProcedure procedure_ = procedure != null ? procedure : emptyProcedureAssertedPredicates; + ListenerEntry listenerEntry = cache.registerDependencies(graph, entry, parent, listener, procedure_, false); + if(entry.isReady()) entry.performFromCache(graph, procedure_); else { - entry.compute(graph, procedure); + assert(entry.isPending()); + entry.compute(graph, procedure_); if(listenerEntry != null) cache.primeListenerEntry(listenerEntry, entry.getResult()); } } - DirectSuperRelations getOrCreateDirectSuperRelations(int r) throws DatabaseException { + DirectSuperRelations getOrCreateDirectSuperRelations(ReadGraphImpl graph, int r) throws DatabaseException { DirectSuperRelations existing = null; synchronized(directSuperRelationsMap) { existing = (DirectSuperRelations)directSuperRelationsMap.get(r); @@ -694,6 +763,7 @@ public class QueryCache extends QueryCacheBase { existing.clearResult(querySupport); existing.setPending(); directSuperRelationsMap.put(keyR(r), existing); + size++; return existing; } if(existing.requiresComputation()) { @@ -701,7 +771,7 @@ public class QueryCache extends QueryCacheBase { return existing; } } - if(existing.isPending()) waitPending(existing); + if(existing.isPending()) waitPending(graph, existing); return existing; } @@ -711,19 +781,20 @@ public class QueryCache extends QueryCacheBase { } } - public static void runnerDirectSuperRelations(ReadGraphImpl graph, int r, CacheEntry parent, ListenerBase listener, IntProcedure procedure) throws DatabaseException { + public static void runnerDirectSuperRelations(ReadGraphImpl graph, int r, CacheEntry parent, ListenerBase listener, final IntProcedure procedure) throws DatabaseException { QueryCache cache = graph.processor.cache; - if(procedure == null) procedure = emptyProcedureDirectSuperRelations; - DirectSuperRelations entry = (DirectSuperRelations)cache.getOrCreateDirectSuperRelations(r); - ListenerEntry listenerEntry = cache.registerDependencies(graph, entry, parent, listener, procedure, false); - if(entry.isReady()) entry.performFromCache(graph, procedure); + DirectSuperRelations entry = (DirectSuperRelations)cache.getOrCreateDirectSuperRelations(graph, r); + IntProcedure procedure_ = procedure != null ? procedure : emptyProcedureDirectSuperRelations; + ListenerEntry listenerEntry = cache.registerDependencies(graph, entry, parent, listener, procedure_, false); + if(entry.isReady()) entry.performFromCache(graph, procedure_); else { - entry.compute(graph, procedure); + assert(entry.isPending()); + entry.compute(graph, procedure_); if(listenerEntry != null) cache.primeListenerEntry(listenerEntry, entry.getResult()); } } - SuperTypes getOrCreateSuperTypes(int r) throws DatabaseException { + SuperTypes getOrCreateSuperTypes(ReadGraphImpl graph, int r) throws DatabaseException { SuperTypes existing = null; synchronized(superTypesMap) { existing = (SuperTypes)superTypesMap.get(r); @@ -732,6 +803,7 @@ public class QueryCache extends QueryCacheBase { existing.clearResult(querySupport); existing.setPending(); superTypesMap.put(keyR(r), existing); + size++; return existing; } if(existing.requiresComputation()) { @@ -739,7 +811,7 @@ public class QueryCache extends QueryCacheBase { return existing; } } - if(existing.isPending()) waitPending(existing); + if(existing.isPending()) waitPending(graph, existing); return existing; } @@ -749,19 +821,20 @@ public class QueryCache extends QueryCacheBase { } } - public static void runnerSuperTypes(ReadGraphImpl graph, int r, CacheEntry parent, ListenerBase listener, InternalProcedure procedure) throws DatabaseException { + public static void runnerSuperTypes(ReadGraphImpl graph, int r, CacheEntry parent, ListenerBase listener, final InternalProcedure procedure) throws DatabaseException { QueryCache cache = graph.processor.cache; - if(procedure == null) procedure = emptyProcedureSuperTypes; - SuperTypes entry = (SuperTypes)cache.getOrCreateSuperTypes(r); - ListenerEntry listenerEntry = cache.registerDependencies(graph, entry, parent, listener, procedure, false); - if(entry.isReady()) entry.performFromCache(graph, procedure); + SuperTypes entry = (SuperTypes)cache.getOrCreateSuperTypes(graph, r); + InternalProcedure procedure_ = procedure != null ? procedure : emptyProcedureSuperTypes; + ListenerEntry listenerEntry = cache.registerDependencies(graph, entry, parent, listener, procedure_, false); + if(entry.isReady()) entry.performFromCache(graph, procedure_); else { - entry.compute(graph, procedure); + assert(entry.isPending()); + entry.compute(graph, procedure_); if(listenerEntry != null) cache.primeListenerEntry(listenerEntry, entry.getResult()); } } - TypeHierarchy getOrCreateTypeHierarchy(int r) throws DatabaseException { + TypeHierarchy getOrCreateTypeHierarchy(ReadGraphImpl graph, int r) throws DatabaseException { TypeHierarchy existing = null; synchronized(typeHierarchyMap) { existing = (TypeHierarchy)typeHierarchyMap.get(r); @@ -770,6 +843,7 @@ public class QueryCache extends QueryCacheBase { existing.clearResult(querySupport); existing.setPending(); typeHierarchyMap.put(keyR(r), existing); + size++; return existing; } if(existing.requiresComputation()) { @@ -777,7 +851,7 @@ public class QueryCache extends QueryCacheBase { return existing; } } - if(existing.isPending()) waitPending(existing); + if(existing.isPending()) waitPending(graph, existing); return existing; } @@ -787,19 +861,20 @@ public class QueryCache extends QueryCacheBase { } } - public static void runnerTypeHierarchy(ReadGraphImpl graph, int r, CacheEntry parent, ListenerBase listener, InternalProcedure procedure) throws DatabaseException { + public static void runnerTypeHierarchy(ReadGraphImpl graph, int r, CacheEntry parent, ListenerBase listener, final InternalProcedure procedure) throws DatabaseException { QueryCache cache = graph.processor.cache; - if(procedure == null) procedure = emptyProcedureTypeHierarchy; - TypeHierarchy entry = (TypeHierarchy)cache.getOrCreateTypeHierarchy(r); - ListenerEntry listenerEntry = cache.registerDependencies(graph, entry, parent, listener, procedure, false); - if(entry.isReady()) entry.performFromCache(graph, procedure); + TypeHierarchy entry = (TypeHierarchy)cache.getOrCreateTypeHierarchy(graph, r); + InternalProcedure procedure_ = procedure != null ? procedure : emptyProcedureTypeHierarchy; + ListenerEntry listenerEntry = cache.registerDependencies(graph, entry, parent, listener, procedure_, false); + if(entry.isReady()) entry.performFromCache(graph, procedure_); else { - entry.compute(graph, procedure); + assert(entry.isPending()); + entry.compute(graph, procedure_); if(listenerEntry != null) cache.primeListenerEntry(listenerEntry, entry.getResult()); } } - SuperRelations getOrCreateSuperRelations(int r) throws DatabaseException { + SuperRelations getOrCreateSuperRelations(ReadGraphImpl graph, int r) throws DatabaseException { SuperRelations existing = null; synchronized(superRelationsMap) { existing = (SuperRelations)superRelationsMap.get(r); @@ -808,6 +883,7 @@ public class QueryCache extends QueryCacheBase { existing.clearResult(querySupport); existing.setPending(); superRelationsMap.put(keyR(r), existing); + size++; return existing; } if(existing.requiresComputation()) { @@ -815,7 +891,7 @@ public class QueryCache extends QueryCacheBase { return existing; } } - if(existing.isPending()) waitPending(existing); + if(existing.isPending()) waitPending(graph, existing); return existing; } @@ -825,19 +901,20 @@ public class QueryCache extends QueryCacheBase { } } - public static void runnerSuperRelations(ReadGraphImpl graph, int r, CacheEntry parent, ListenerBase listener, InternalProcedure procedure) throws DatabaseException { + public static void runnerSuperRelations(ReadGraphImpl graph, int r, CacheEntry parent, ListenerBase listener, final InternalProcedure procedure) throws DatabaseException { QueryCache cache = graph.processor.cache; - if(procedure == null) procedure = emptyProcedureSuperRelations; - SuperRelations entry = (SuperRelations)cache.getOrCreateSuperRelations(r); - ListenerEntry listenerEntry = cache.registerDependencies(graph, entry, parent, listener, procedure, false); - if(entry.isReady()) entry.performFromCache(graph, procedure); + SuperRelations entry = (SuperRelations)cache.getOrCreateSuperRelations(graph, r); + InternalProcedure procedure_ = procedure != null ? procedure : emptyProcedureSuperRelations; + ListenerEntry listenerEntry = cache.registerDependencies(graph, entry, parent, listener, procedure_, false); + if(entry.isReady()) entry.performFromCache(graph, procedure_); else { - entry.compute(graph, procedure); + assert(entry.isPending()); + entry.compute(graph, procedure_); if(listenerEntry != null) cache.primeListenerEntry(listenerEntry, entry.getResult()); } } - MultiReadEntry getOrCreateMultiReadEntry(MultiRead r) throws DatabaseException { + MultiReadEntry getOrCreateMultiReadEntry(ReadGraphImpl graph, MultiRead r) throws DatabaseException { MultiReadEntry existing = null; synchronized(multiReadEntryMap) { existing = (MultiReadEntry)multiReadEntryMap.get(r); @@ -846,6 +923,7 @@ public class QueryCache extends QueryCacheBase { existing.clearResult(querySupport); existing.setPending(); multiReadEntryMap.put(id(r), existing); + size++; return existing; } if(existing.requiresComputation()) { @@ -853,7 +931,7 @@ public class QueryCache extends QueryCacheBase { return existing; } } - if(existing.isPending()) waitPending(existing); + if(existing.isPending()) waitPending(graph, existing); return existing; } @@ -863,19 +941,20 @@ public class QueryCache extends QueryCacheBase { } } - public static void runnerMultiReadEntry(ReadGraphImpl graph, MultiRead r, CacheEntry parent, ListenerBase listener, AsyncMultiProcedure procedure) throws DatabaseException { + public static void runnerMultiReadEntry(ReadGraphImpl graph, MultiRead r, CacheEntry parent, ListenerBase listener, final AsyncMultiProcedure procedure) throws DatabaseException { QueryCache cache = graph.processor.cache; - if(procedure == null) procedure = emptyProcedureMultiReadEntry; - MultiReadEntry entry = (MultiReadEntry)cache.getOrCreateMultiReadEntry(r); - ListenerEntry listenerEntry = cache.registerDependencies(graph, entry, parent, listener, procedure, false); - if(entry.isReady()) entry.performFromCache(graph, procedure); + MultiReadEntry entry = (MultiReadEntry)cache.getOrCreateMultiReadEntry(graph, r); + AsyncMultiProcedure procedure_ = procedure != null ? procedure : emptyProcedureMultiReadEntry; + ListenerEntry listenerEntry = cache.registerDependencies(graph, entry, parent, listener, procedure_, false); + if(entry.isReady()) entry.performFromCache(graph, procedure_); else { - entry.compute(graph, procedure); + assert(entry.isPending()); + entry.compute(graph, procedure_); if(listenerEntry != null) cache.primeListenerEntry(listenerEntry, entry.getResult()); } } - AsyncMultiReadEntry getOrCreateAsyncMultiReadEntry(AsyncMultiRead r) throws DatabaseException { + AsyncMultiReadEntry getOrCreateAsyncMultiReadEntry(ReadGraphImpl graph, AsyncMultiRead r) throws DatabaseException { AsyncMultiReadEntry existing = null; synchronized(asyncMultiReadEntryMap) { existing = (AsyncMultiReadEntry)asyncMultiReadEntryMap.get(r); @@ -884,6 +963,7 @@ public class QueryCache extends QueryCacheBase { existing.clearResult(querySupport); existing.setPending(); asyncMultiReadEntryMap.put(id(r), existing); + size++; return existing; } if(existing.requiresComputation()) { @@ -891,7 +971,7 @@ public class QueryCache extends QueryCacheBase { return existing; } } - if(existing.isPending()) waitPending(existing); + if(existing.isPending()) waitPending(graph, existing); return existing; } @@ -901,19 +981,20 @@ public class QueryCache extends QueryCacheBase { } } - public static void runnerAsyncMultiReadEntry(ReadGraphImpl graph, AsyncMultiRead r, CacheEntry parent, ListenerBase listener, AsyncMultiProcedure procedure) throws DatabaseException { + public static void runnerAsyncMultiReadEntry(ReadGraphImpl graph, AsyncMultiRead r, CacheEntry parent, ListenerBase listener, final AsyncMultiProcedure procedure) throws DatabaseException { QueryCache cache = graph.processor.cache; - if(procedure == null) procedure = emptyProcedureAsyncMultiReadEntry; - AsyncMultiReadEntry entry = (AsyncMultiReadEntry)cache.getOrCreateAsyncMultiReadEntry(r); - ListenerEntry listenerEntry = cache.registerDependencies(graph, entry, parent, listener, procedure, false); - if(entry.isReady()) entry.performFromCache(graph, procedure); + AsyncMultiReadEntry entry = (AsyncMultiReadEntry)cache.getOrCreateAsyncMultiReadEntry(graph, r); + AsyncMultiProcedure procedure_ = procedure != null ? procedure : emptyProcedureAsyncMultiReadEntry; + ListenerEntry listenerEntry = cache.registerDependencies(graph, entry, parent, listener, procedure_, false); + if(entry.isReady()) entry.performFromCache(graph, procedure_); else { - entry.compute(graph, procedure); + assert(entry.isPending()); + entry.compute(graph, procedure_); if(listenerEntry != null) cache.primeListenerEntry(listenerEntry, entry.getResult()); } } - ExternalReadEntry getOrCreateExternalReadEntry(ExternalRead r) throws DatabaseException { + ExternalReadEntry getOrCreateExternalReadEntry(ReadGraphImpl graph, ExternalRead r) throws DatabaseException { ExternalReadEntry existing = null; synchronized(externalReadEntryMap) { existing = (ExternalReadEntry)externalReadEntryMap.get(r); @@ -922,6 +1003,7 @@ public class QueryCache extends QueryCacheBase { existing.clearResult(querySupport); existing.setPending(); externalReadEntryMap.put(id(r), existing); + size++; return existing; } if(existing.requiresComputation()) { @@ -929,7 +1011,7 @@ public class QueryCache extends QueryCacheBase { return existing; } } - if(existing.isPending()) waitPending(existing); + if(existing.isPending()) waitPending(graph, existing); return existing; } @@ -939,14 +1021,15 @@ public class QueryCache extends QueryCacheBase { } } - public static void runnerExternalReadEntry(ReadGraphImpl graph, ExternalRead r, CacheEntry parent, ListenerBase listener, AsyncProcedure procedure) throws DatabaseException { + public static void runnerExternalReadEntry(ReadGraphImpl graph, ExternalRead r, CacheEntry parent, ListenerBase listener, final AsyncProcedure procedure) throws DatabaseException { QueryCache cache = graph.processor.cache; - if(procedure == null) procedure = emptyProcedureExternalReadEntry; - ExternalReadEntry entry = (ExternalReadEntry)cache.getOrCreateExternalReadEntry(r); - ListenerEntry listenerEntry = cache.registerDependencies(graph, entry, parent, listener, procedure, false); - if(entry.isReady()) entry.performFromCache(graph, procedure); + ExternalReadEntry entry = (ExternalReadEntry)cache.getOrCreateExternalReadEntry(graph, r); + AsyncProcedure procedure_ = procedure != null ? procedure : emptyProcedureExternalReadEntry; + ListenerEntry listenerEntry = cache.registerDependencies(graph, entry, parent, listener, procedure_, false); + if(entry.isReady()) entry.performFromCache(graph, procedure_); else { - entry.compute(graph, procedure); + assert(entry.isPending()); + entry.compute(graph, procedure_); if(listenerEntry != null) cache.primeListenerEntry(listenerEntry, entry.getResult()); } }