X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.db.impl%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fimpl%2Fquery%2FOrderedSet.java;h=38c6be6e1f30fc60e6b0a06dae1d5542c2f9b671;hb=ded784594eb0e1fb318fbb931135288152691cf2;hp=c693d2a91f0e38add060c1be564f97252e806a56;hpb=67b615f53cb96c89900131f642648b5219ae8efc;p=simantics%2Fplatform.git diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/OrderedSet.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/OrderedSet.java index c693d2a91..38c6be6e1 100644 --- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/OrderedSet.java +++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/OrderedSet.java @@ -11,12 +11,13 @@ *******************************************************************************/ package org.simantics.db.impl.query; -import java.util.ArrayList; -import java.util.concurrent.Semaphore; +import java.util.concurrent.atomic.AtomicInteger; import org.simantics.db.common.exception.DebugException; +import org.simantics.db.exception.DatabaseException; import org.simantics.db.impl.graph.ReadGraphImpl; import org.simantics.db.impl.procedure.IntProcedureAdapter; +import org.simantics.db.impl.procedure.InternalProcedure; import org.simantics.db.procedure.ListenerBase; final public class OrderedSet extends CollectionUnaryQuery { @@ -25,93 +26,32 @@ final public class OrderedSet extends CollectionUnaryQuery { super(r); } - final static OrderedSet entry(final QueryProcessor provider, final int r) { - - return (OrderedSet)provider.cache.orderedSetMap.get(r); - - } - - final static void runner(ReadGraphImpl graph, final int r, final QueryProcessor provider, OrderedSet cached, final CacheEntry parent, ListenerBase listener, final IntProcedure procedure) { - - OrderedSet entry = cached != null ? cached : (OrderedSet)provider.cache.orderedSetMap.get(r); - if(entry == null) { - - entry = new OrderedSet(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(); -// if(entry.procs == null) entry.procs = new ArrayList(); -// entry.procs.add(procedure); -// provider.registerDependencies(graph, entry, parent, listener, procedure, false); -// return; - } - } - } - provider.performForEach(graph, entry, parent, listener, procedure); - } - - } - - 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 OrderedSet entry = (OrderedSet)provider.cache.orderedSetMap.get(r); - - if(parent == null && !(listener != null)) { - if(entry != null && entry.isReady()) { - entry.performFromCache(graph, provider, procedure); - return; - } - } - - runner(graph, r, provider, entry, parent, listener, procedure); - - } - - @Override - public UnaryQuery getEntry(QueryProcessor provider) { - return provider.cache.orderedSetMap.get(id); - } - - @Override - public void putEntry(QueryProcessor provider) { - provider.cache.orderedSetMap.put(id, this); - } - @Override final public void removeEntry(QueryProcessor provider) { - provider.cache.orderedSetMap.remove(id); + provider.cache.remove(this); } - - private int current = 0; - private boolean nextElement(ReadGraphImpl graph, final QueryProcessor provider, final IntProcedure procedure, final boolean store) { + private static int nextElement(ReadGraphImpl graph, int current, int orderedSet, OrderedSet entry, final IntProcedure procedure) throws DatabaseException { - provider.querySupport.ensureLoaded(graph, current); + QueryProcessor processor = graph.processor; + + processor.querySupport.ensureLoaded(graph, current); + + AtomicInteger res = new AtomicInteger(0); - boolean found = provider.querySupport.getObjects(graph, current, id, new IntProcedure() { + boolean found = processor.querySupport.getObjects(graph, current, orderedSet, new IntProcedure() { @Override - public void execute(ReadGraphImpl graph, int i) { - if(i != id) { - addOrSet(i); + public void execute(ReadGraphImpl graph, int i) throws DatabaseException { + if(i != orderedSet) { + if(entry != null) entry.addOrSet(i); procedure.execute(graph, i); } - current = i; + res.set(i); } @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); } @@ -122,31 +62,33 @@ final public class OrderedSet extends CollectionUnaryQuery { }); - if(!found) current = id; - - if(current == id) { - finish(graph, provider); + if(res.get() == orderedSet) { + if(entry != null) entry.finish(graph, processor); procedure.finished(graph); - return false; - } else { - return true; } + + return res.get(); } @Override public void clearResult(QuerySupport support) { - current = id; setResult(new IntArray()); } @Override - public Object computeForEach(ReadGraphImpl graph, final QueryProcessor provider, final IntProcedure procedure, final boolean store) { - - while(nextElement(graph, provider, procedure, store)); - + public Object compute(ReadGraphImpl graph, final IntProcedure procedure) throws DatabaseException { + computeForEach(graph, id, this, procedure); return getResult(); - + } + + static void computeForEach(ReadGraphImpl graph, int orderedSet, final OrderedSet entry, final IntProcedure procedure) throws DatabaseException { + + int current = nextElement(graph, orderedSet, orderedSet, entry, procedure); + while(current != orderedSet) { + current = nextElement(graph, current, orderedSet, entry, procedure); + } + } @Override @@ -158,30 +100,10 @@ final public class OrderedSet extends CollectionUnaryQuery { assert(isPending()); -// ArrayList p = null; - synchronized(this) { - setReady(); -// p = procs; -// procs = null; - } -// if(p != null) { -// IntArray v = (IntArray)getResult(); -// if(v.data == null) { -// if(v.sizeOrData != IntArray.NO_DATA) { -// for(IntProcedure proc : p) proc.execute(graph, v.sizeOrData); -// } -// } else { -// for(IntProcedure proc : p) { -// for(int i = 0;i < v.sizeOrData ; i++) proc.execute(graph, v.data[i]); -// } -// } -// for(IntProcedure proc : p) proc.finished(graph); -// } - } final public void addOrSet(int add) { @@ -194,7 +116,7 @@ final public class OrderedSet extends CollectionUnaryQuery { } @Override - public Object performFromCache(ReadGraphImpl graph, QueryProcessor provider, final IntProcedure procedure) { + public Object performFromCache(ReadGraphImpl graph, final IntProcedure procedure) throws DatabaseException { assert(isReady()); @@ -214,15 +136,12 @@ final public class OrderedSet extends CollectionUnaryQuery { } @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 IntProcedureAdapter() { + compute(graph, new IntProcedureAdapter() { @Override public void finished(ReadGraphImpl graph) { - s.release(); } @Override @@ -230,11 +149,7 @@ final public class OrderedSet extends CollectionUnaryQuery { throw new Error("Error in recompute.", t); } - }, true); - - while(!s.tryAcquire()) { - provider.resume(graph); - } + }); }