X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.db.impl%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fimpl%2Fquery%2FDirectSuperRelations.java;fp=bundles%2Forg.simantics.db.impl%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fimpl%2Fquery%2FDirectSuperRelations.java;h=3932f7da6031bc4b083b53d327e6128aa2438864;hb=1cb58fb59cd64891c682a7e7b04e00af9e3be575;hp=c11e9f262118ceca8fdb0f2f4c7070f23c293c38;hpb=0f268b9157bfa6399692f8aa42f532a0c0d68c1c;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/DirectSuperRelations.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/DirectSuperRelations.java
index c11e9f262..3932f7da6 100644
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/DirectSuperRelations.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/DirectSuperRelations.java
@@ -11,40 +11,25 @@
  *******************************************************************************/
 package org.simantics.db.impl.query;
 
-import gnu.trove.procedure.TIntProcedure;
-import gnu.trove.set.hash.TIntHashSet;
-
-import java.util.ArrayList;
+import java.util.concurrent.Semaphore;
 
+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.impl.procedure.IntProcedureAdapter;
 
-final public class DirectSuperRelations extends UnaryQuery<IntProcedure> {
+import gnu.trove.procedure.TIntProcedure;
+import gnu.trove.set.hash.TIntHashSet;
 
-	public ArrayList<InternalProcedure<IntSet>> procs = null;
+final public class DirectSuperRelations extends UnaryQuery<IntProcedure> {
 
-	private DirectSuperRelations(final int resource) {
+	DirectSuperRelations(final int resource) {
 		super(resource);
 	}
 
-	final public static void queryEach(ReadGraphImpl graph, final int r, final QueryProcessor provider, final CacheEntry parent, final ListenerBase listener, final IntProcedure procedure) {
-
-		new DirectSuperRelations(r).computeForEach(graph, provider, procedure, false);
-
-	}
-
-	@Override
-	public UnaryQuery<IntProcedure> getEntry(QueryProcessor provider) {
-		return null;
-	}
-
-	@Override
-	public void putEntry(QueryProcessor provider) {
-	}
-
 	@Override
 	final public void removeEntry(QueryProcessor provider) {
+		provider.cache.remove(this);
 	}
 
 	class Koss {
@@ -70,15 +55,6 @@ final public class DirectSuperRelations extends UnaryQuery<IntProcedure> {
 
 		}
 
-		//        public int[] toArray() {
-			//            
-			//            int[] result = Arrays.copyOf(set.toArray(), set.size() + 1);
-			//            result[set.size()] = single;
-			//            return result;
-			//            
-			//        }
-		//        
-
 		public void forEach(TIntProcedure proc) {
 			if(single > 0) proc.execute(single);
 			if(set != null) set.forEach(proc);
@@ -87,20 +63,22 @@ final public class DirectSuperRelations extends UnaryQuery<IntProcedure> {
 	}
 
 	@Override
-	public Object computeForEach(final ReadGraphImpl graph, final QueryProcessor provider, final IntProcedure procedure, final boolean store) {
+	public Object compute(final ReadGraphImpl graph, final IntProcedure procedure) throws DatabaseException {
 
-		provider.querySupport.ensureLoaded(graph, id);
+		QueryProcessor processor = graph.processor;
 		
-		int single = provider.querySupport.getSingleSuperrelation(id);
+		processor.querySupport.ensureLoaded(graph, id);
+		
+		int single = processor.querySupport.getSingleSuperrelation(id);
 		if(single > 0) {
 			procedure.execute(graph, single);
 			procedure.finished(graph);
 			return single;
 		}
 
-		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 {
 			@Override
@@ -128,7 +106,7 @@ final public class DirectSuperRelations extends UnaryQuery<IntProcedure> {
 
 		final DirectProcedure directProc = new DirectProcedure();
 
-		provider.querySupport.getObjects(graph, id, subrelationOf, directProc);
+		processor.querySupport.getObjects(graph, id, subrelationOf, directProc);
 
 		int size = directProc.size();
 
@@ -148,7 +126,11 @@ final public class DirectSuperRelations extends UnaryQuery<IntProcedure> {
 				@Override
 				public boolean execute(int arg0) {
 
-					procedure.execute(graph, arg0);
+					try {
+						procedure.execute(graph, arg0);
+					} catch (DatabaseException e) {
+						Logger.defaultLogError(e);
+					}
 					return true;
 
 				}
@@ -166,17 +148,34 @@ final public class DirectSuperRelations extends UnaryQuery<IntProcedure> {
 
 	@Override
 	public String toString() {
-		return "SuperRelations2[" + id + "]";
+		return "DirectSuperRelations[" + id + "]";
 	}
 
 	@Override
-	public Object performFromCache(ReadGraphImpl graph, QueryProcessor provider, IntProcedure procedure) {
-		throw new UnsupportedOperationException();
+	public Object performFromCache(ReadGraphImpl graph, IntProcedure procedure) throws DatabaseException {
+
+		assert(isReady());
+
+		return compute(graph, procedure);
+		
 	}
 
 	@Override
-	public void recompute(ReadGraphImpl graph, QueryProcessor provider) {
+	public void recompute(ReadGraphImpl graph) throws DatabaseException {
+
+		compute(graph, new IntProcedureAdapter() {
+
+			@Override
+			public void finished(ReadGraphImpl graph) {
+			}
+
+			@Override
+			public void exception(ReadGraphImpl graph, Throwable t) {
+				new Error("Error in recompute.", t).printStackTrace();
+			}
 
+		});
+		
 	}
 
 }