X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.db.impl%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fimpl%2Fquery%2FSuperRelations.java;h=b8d29b7e6ea995299e9baa11cc6c6c1be4a78c11;hb=68ce0966a57f5153b133c6283fdbae10f683b745;hp=fc3cbebab6753460c3b396831845d11b13bdf937;hpb=a1dd54cd8e3595e66c83ad0e2d935470a3567481;p=simantics%2Fplatform.git diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/SuperRelations.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/SuperRelations.java index fc3cbebab..b8d29b7e6 100644 --- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/SuperRelations.java +++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/SuperRelations.java @@ -11,118 +11,32 @@ *******************************************************************************/ package org.simantics.db.impl.query; -import gnu.trove.procedure.TIntProcedure; -import gnu.trove.set.hash.TIntHashSet; - -import java.util.concurrent.Semaphore; import java.util.concurrent.atomic.AtomicInteger; +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 gnu.trove.procedure.TIntProcedure; +import gnu.trove.set.hash.TIntHashSet; final public class SuperRelations extends UnaryQuery> { - private SuperRelations(final int resource) { + SuperRelations(final int resource) { super(resource); } final static SuperRelations entry(final QueryProcessor provider, final int r) { - return (SuperRelations)provider.cache.superRelationsMap.get(r); - - } - - final static IntSet runner(ReadGraphImpl graph, final int r, final QueryProcessor provider, final CacheEntry parent, final ListenerBase listener, final InternalProcedure procedure) { - - SuperRelations entry = (SuperRelations)provider.cache.superRelationsMap.get(r); - if(entry == null) { - - entry = new SuperRelations(r); - entry.setPending(); - entry.clearResult(provider.querySupport); - entry.putEntry(provider); - - return (IntSet)provider.performForEach(graph, entry, parent, listener, procedure); - - } else { - - if(!entry.isReady()) { - throw new IllegalStateException(); - } - return (IntSet)provider.performForEach(graph, entry, parent, listener, procedure); - - } - } - - final static IntSet runner2(ReadGraphImpl graph, final int r, final QueryProcessor provider, final CacheEntry parent, final ListenerBase listener, final InternalProcedure procedure) throws Throwable { - - SuperRelations entry = (SuperRelations)provider.cache.superRelationsMap.get(r); - if(entry == null) { - - entry = new SuperRelations(r); - entry.setPending(); - entry.clearResult(provider.querySupport); - entry.putEntry(provider); - - return (IntSet)provider.performForEach2(graph, entry, parent, listener, procedure); - - } else { - - if(!entry.isReady()) { - throw new IllegalStateException(); - } - return (IntSet)provider.performForEach2(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 InternalProcedure procedure) { - - if(parent == null && listener == null) { - SuperRelations entry = (SuperRelations)provider.cache.superRelationsMap.get(r); - if(entry != null && entry.isReady()) { - entry.performFromCache(graph, provider, procedure); - return; - } - } - - runner(graph, r, provider, parent, listener, procedure); - - } - - final public static IntSet queryEach2(ReadGraphImpl graph, final int r, final QueryProcessor provider, final CacheEntry parent, final ListenerBase listener, final InternalProcedure procedure) throws Throwable { - - if(parent == null && listener == null) { - SuperRelations entry = (SuperRelations)provider.cache.superRelationsMap.get(r); - if(entry != null && entry.isReady()) { - return (IntSet)entry.get(graph, provider, procedure); - } - } - - return runner2(graph, r, provider, parent, listener, procedure); - - } - - @Override - public UnaryQuery> getEntry(QueryProcessor provider) { - return provider.cache.superRelationsMap.get(id); - } - - @Override - public void putEntry(QueryProcessor provider) { - provider.cache.superRelationsMap.put(id, this); - } @Override final public void removeEntry(QueryProcessor provider) { - provider.cache.superRelationsMap.remove(id); + provider.cache.remove(this); } static int histoCounter = 0; - static IntSet EMPTY_SET = new IntSet(); static int counter = 0; class Koss { @@ -155,16 +69,18 @@ final public class SuperRelations extends UnaryQuery> } - @Override - public Object computeForEach(final ReadGraphImpl graph, final QueryProcessor provider, final InternalProcedure procedure, final boolean store) { + //@Override + public Object compute(final ReadGraphImpl graph, final InternalProcedure procedure) throws DatabaseException { - provider.querySupport.ensureLoaded(graph, id); + QueryProcessor processor = graph.processor; + + processor.querySupport.ensureLoaded(graph, id); final InternalProcedure proc = (InternalProcedure)procedure; - final int subrelationOf = provider.getSubrelationOf(); + final int subrelationOf = processor.getSubrelationOf(); - final IntSet result = new IntSet(provider.querySupport); + final IntSet result = new IntSet(processor.querySupport); final class DirectProcedure extends Koss implements IntProcedure, TIntProcedure, InternalProcedure { @Override @@ -181,9 +97,9 @@ final public class SuperRelations extends UnaryQuery> add(r); } @Override - final public void execute(ReadGraphImpl graph, IntSet set) { + final public void execute(ReadGraphImpl graph, IntSet set) throws DatabaseException { set.forEach(this); - addOrSet(graph, result, provider); + addOrSet(graph, result, processor); proc.execute(graph, result); } @Override @@ -198,19 +114,19 @@ final public class SuperRelations extends UnaryQuery> final DirectProcedure directProc = new DirectProcedure(); - provider.querySupport.getObjects(graph, id, subrelationOf, directProc); + processor.querySupport.getObjects(graph, id, subrelationOf, directProc); int size = directProc.size(); if(size == 0) { - addOrSet(graph, EMPTY_SET, provider); - proc.execute(graph, EMPTY_SET); + addOrSet(graph, IntSet.EMPTY, processor); + proc.execute(graph, IntSet.EMPTY); } else if (size == 1) { result.add(directProc.single); - SuperRelations.queryEach(graph, directProc.single, provider, SuperRelations.this, null, directProc); + QueryCache.runnerSuperRelations(graph, directProc.single, SuperRelations.this, null, directProc); } else { @@ -232,26 +148,35 @@ final public class SuperRelations extends UnaryQuery> @Override public boolean execute(int arg0) { + try { + return execute0(arg0); + } catch (DatabaseException e) { + Logger.defaultLogError(e); + } + return false; + } + + public boolean execute0(int arg0) throws DatabaseException { synchronized(result) { result.add(arg0); } - SuperRelations.queryEach(graph, arg0, provider, SuperRelations.this, null, new InternalProcedure() { + QueryCache.runnerSuperRelations(graph, arg0, SuperRelations.this, null, new InternalProcedure() { @Override - public void execute(ReadGraphImpl graph, IntSet set) { + public void execute(ReadGraphImpl graph, IntSet set) throws DatabaseException { set.forEach(addToResult); int current = finishes.addAndGet(1); if(current == directProc.size()) { - addOrSet(graph, result, provider); + addOrSet(graph, result, processor); proc.execute(graph, result); return; } } @Override - public void exception(ReadGraphImpl graph, Throwable t) { + public void exception(ReadGraphImpl graph, Throwable t) throws DatabaseException { proc.exception(graph, t); } @@ -278,29 +203,18 @@ final public class SuperRelations extends UnaryQuery> assert(!isReady()); -// ArrayList> p = null; - synchronized(this) { value.trim(); setResult(value); setReady(); -// p = procs; -// procs = null; } - -// if(p != null) { -// IntSet v = (IntSet)getResult(); -// if(v != null) { -// for(InternalProcedure proc : p) proc.execute(graph, v); -// } -// } } @Override - public Object performFromCache(ReadGraphImpl graph, QueryProcessor provider, InternalProcedure procedure) { + public Object performFromCache(ReadGraphImpl graph, InternalProcedure procedure) throws DatabaseException { assert(isReady()); @@ -315,31 +229,22 @@ final public class SuperRelations extends UnaryQuery> } @Override - public void recompute(ReadGraphImpl graph, QueryProcessor provider) { + public void recompute(ReadGraphImpl graph) throws DatabaseException { - final Semaphore s = new Semaphore(0); - - computeForEach(graph, provider, new InternalProcedure() { + compute(graph, new InternalProcedure() { @Override public void execute(ReadGraphImpl graph, IntSet result) { - s.release(); } @Override public void exception(ReadGraphImpl graph, Throwable t) { - s.release(); new Error("Error in recompute.", t).printStackTrace(); } - }, true); - - while(!s.tryAcquire()) { - provider.resume(graph); - } + }); } - @Override boolean isImmutable(ReadGraphImpl graph) {