X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.db.impl%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fimpl%2Fquery%2FPredicates.java;h=03b17bba5cfba708064f2a9ed84b115348af8f4d;hb=68ce0966a57f5153b133c6283fdbae10f683b745;hp=312522007e4f53483490e08554fb4773dd86e64a;hpb=a1dd54cd8e3595e66c83ad0e2d935470a3567481;p=simantics%2Fplatform.git diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/Predicates.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/Predicates.java index 312522007..03b17bba5 100644 --- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/Predicates.java +++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/Predicates.java @@ -11,173 +11,64 @@ *******************************************************************************/ package org.simantics.db.impl.query; -import gnu.trove.procedure.TIntProcedure; - -import java.util.concurrent.Semaphore; - import org.simantics.db.common.exception.DebugException; +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.procedure.ListenerBase; import org.simantics.db.request.RequestFlags; -final public class Predicates extends UnaryQuery { - - public Predicates(final int r) { - super(r); - } - - public static Predicates newInstance(final int r) { - return new Predicates(r); - } - - final static Predicates entry(final QueryProcessor provider, final int r) { - - return (Predicates)provider.cache.predicatesMap.get(r); - - } - - final static void runner(ReadGraphImpl graph, final int r, final QueryProcessor provider, Predicates cached, final CacheEntry parent, final ListenerBase listener, final IntProcedure procedure) { - - Predicates entry = cached != null ? cached : (Predicates)provider.cache.predicatesMap.get(r); - if(entry == null) { - - entry = new Predicates(r); - entry.setPending(); - entry.clearResult(provider.querySupport); - entry.putEntry(provider); - - provider.performForEach(graph, entry, parent, listener, procedure); - - } else { - - if(entry.isPending()) { - synchronized(entry) { - if(entry.isPending()) { - throw new IllegalStateException(); - } - } - } - provider.performForEach(graph, entry, parent, listener, procedure); - } - - } - - final static IntSet runner2(ReadGraphImpl graph, final int r, final QueryProcessor provider, final CacheEntry parent) throws Throwable { - - Predicates entry = (Predicates)provider.cache.predicatesMap.get(r); - if(entry == null) { - - entry = new Predicates(r); - entry.setPending(); - entry.clearResult(provider.querySupport); - entry.putEntry(provider); - - return (IntSet)provider.performForEach2(graph, entry, parent, null, null); - - } else { - - if(entry.isPending()) { - synchronized(entry) { - if(entry.isPending()) { - throw new IllegalStateException(); - } - } - } - return (IntSet)provider.performForEach(graph, entry, parent, null, null); - - } +import gnu.trove.procedure.TIntProcedure; - } - - final public static void queryEach(ReadGraphImpl graph, final int r, final QueryProcessor provider, final CacheEntry parent, final ListenerBase listener, final IntProcedure procedure) { - - assert(r != 0); - - final Predicates entry = (Predicates)provider.cache.predicatesMap.get(r); - - if(parent == null && listener == null) { - if(entry != null && entry.isReady()) { - entry.performFromCache(graph, provider, procedure); - return; - } - } +final public class Predicates extends UnaryQuery> { - runner(graph, r, provider, entry, parent, listener, procedure); - + Predicates(final int r) { + super(r); } - final public static IntSet queryEach2(ReadGraphImpl graph, final int r, final QueryProcessor provider, final CacheEntry parent) throws Throwable { - - if(parent == null) { - final Predicates entry = (Predicates)provider.cache.predicatesMap.get(r); - if(entry != null && entry.isReady()) { - return (IntSet)entry.get(graph, provider, null); - } - } - - return runner2(graph, r, provider, parent); - - } - - @Override - public UnaryQuery getEntry(QueryProcessor provider) { - return provider.cache.predicatesMap.get(id); - } - - @Override - public void putEntry(QueryProcessor provider) { - provider.cache.predicatesMap.put(id, this); - } - @Override final public void removeEntry(QueryProcessor provider) { - provider.cache.predicatesMap.remove(id); + provider.cache.remove(this); } - final private void forAssertions(ReadGraphImpl graph, final QueryProcessor queryProvider, final IntProcedure procedure, final boolean store) { + final static private void forAssertions(ReadGraphImpl graph, int r, Predicates entry, final IntSet set) throws DatabaseException { - PrincipalTypes.queryEach(graph, id, queryProvider, store ? Predicates.this : null, null, new SyncIntProcedure() { + QueryCache.runnerPrincipalTypes(graph, r, entry, null, new SyncIntProcedure() { @Override - public void run(ReadGraphImpl graph) { - - finish(graph, queryProvider); - procedure.finished(graph); - + public void run(ReadGraphImpl graph) throws DatabaseException { } IntProcedure proc = new IntProcedure() { @Override - public void execute(ReadGraphImpl graph, int i) { - if(addOrSet(queryProvider, i)) - procedure.execute(graph, i); + public void execute(ReadGraphImpl graph, int i) throws DatabaseException { + set.add(i); } @Override - public void finished(ReadGraphImpl graph) { + public void finished(ReadGraphImpl graph) throws DatabaseException { dec(graph); } @Override - public void exception(ReadGraphImpl graph, Throwable t) { + public void exception(ReadGraphImpl graph, Throwable t) throws DatabaseException { if(DebugException.DEBUG) new DebugException(t).printStackTrace(); - procedure.exception(graph, t); } }; @Override - public void execute(ReadGraphImpl graph, int type) { + public void execute(ReadGraphImpl graph, int type) throws DatabaseException { inc(); - - AssertedPredicates.queryEach(graph, type, queryProvider, store ? Predicates.this : null, null, proc); + QueryCache.runnerAssertedPredicates(graph, type, entry, null, proc); } @Override - public void finished(ReadGraphImpl graph) { + public void finished(ReadGraphImpl graph) throws DatabaseException { dec(graph); } @@ -186,84 +77,61 @@ final public class Predicates extends UnaryQuery { } - @Override - public Object computeForEach(ReadGraphImpl graph, final QueryProcessor provider, final IntProcedure procedure, final boolean store) { - - DirectPredicates.queryEach(graph, id, provider, store ? Predicates.this : null, null, new IntProcedure() { - - @Override - public void execute(ReadGraphImpl graph, final int pred) { - - if(addOrSet(provider, pred)) - procedure.execute(graph, pred); - - } - - @Override - public void finished(ReadGraphImpl graph) { - - forAssertions(graph, provider, procedure, store); + //@Override + public Object compute(ReadGraphImpl graph, final InternalProcedure procedure) throws DatabaseException { + computeForEach(graph, id, this, procedure); + return getResult(); + } - } - - @Override - public void exception(ReadGraphImpl graph, Throwable t) { - procedure.exception(graph, t); - } - - }); + public static void computeForEach(ReadGraphImpl graph, final int r, final Predicates entry, final InternalProcedure procedure) throws DatabaseException { + + IntSet direct = QueryCache.resultDirectPredicates(graph, r, entry, null); + + IntSet result = new IntSet(graph.processor.querySupport); + forAssertions(graph, r, entry, result); + + if(result.isEmpty()) { + + if(entry != null) { + entry.setResult(direct); + entry.setReady(); + } + + procedure.execute(graph, direct); + + } else { + + direct.forEach(new TIntProcedure() { + @Override + public boolean execute(int value) { + result.add(value); + return true; + } + }); + + if(entry != null) { + entry.setResult(result); + entry.setReady(); + } + + procedure.execute(graph, result); + + } - return getResult(); } @Override public String toString() { - return "Predicates2[" + id + "]"; + return "Predicates[" + id + "]"; } final public void finish(final ReadGraphImpl graph, QueryProcessor provider) { -// ArrayList p = null; - synchronized(this) { - setReady(); -// p = procs; -// procs = null; - } - -// if(p != null) { -// -// final ArrayList finalP = p; -// -// IntSet v = (IntSet)getResult(); -// v.forEach(new TIntProcedure() { -// -// @Override -// public boolean execute(int arg0) { -// for(IntProcedure proc : finalP) proc.execute(graph, arg0); -// return true; -// } -// -// }); -// -// for(IntProcedure proc : p) proc.finished(graph); -// -// } - - } - - synchronized private boolean addOrSet(QueryProcessor processor, int add) { - if(!isPending()) { - setResult(new IntSet(null)); - } - - IntSet value = (IntSet)getResult(); - return value.add(add); - } @Override @@ -272,55 +140,35 @@ final public class Predicates extends UnaryQuery { } @Override - public Object performFromCache(final ReadGraphImpl graph, QueryProcessor provider, final IntProcedure procedure) { + public Object performFromCache(final ReadGraphImpl graph, final InternalProcedure procedure) throws DatabaseException { assert(isReady()); if(handleException(graph, procedure)) return EXCEPTED; - IntSet v = getResult(); - if(procedure != null) { - v.forEach(new TIntProcedure() { - - @Override - public boolean execute(int arg0) { - procedure.execute(graph, arg0); - return true; - } - }); - procedure.finished(graph); - } + IntSet result = getResult(); + + procedure.execute(graph, result); - return v; + return result; } @Override - public void recompute(ReadGraphImpl graph, QueryProcessor provider) { - - final Semaphore s = new Semaphore(0); + public void recompute(ReadGraphImpl graph) throws DatabaseException { - computeForEach(graph, provider, new IntProcedure() { + compute(graph, new InternalProcedure() { - @Override - public void finished(ReadGraphImpl graph) { - s.release(); - } - @Override public void exception(ReadGraphImpl graph, Throwable t) { throw new Error("Error in recompute.", t); } @Override - public void execute(ReadGraphImpl graph, int i) { + public void execute(ReadGraphImpl graph, IntSet i) { } - }, true); - - while(!s.tryAcquire()) { - provider.resume(graph); - } + }); }