X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.db.impl%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fimpl%2Fquery%2FDirectPredicates.java;h=feb0533efb4c06f626d4e45b158ca288076c192c;hb=ded784594eb0e1fb318fbb931135288152691cf2;hp=606afa430c1e35e870aaed5e35abbb51612aa0ef;hpb=0ae2b770234dfc3cbb18bd38f324125cf0faca07;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/DirectPredicates.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/DirectPredicates.java
index 606afa430..feb0533ef 100644
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/DirectPredicates.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/DirectPredicates.java
@@ -11,72 +11,16 @@
  *******************************************************************************/
 package org.simantics.db.impl.query;
 
-import java.util.concurrent.Semaphore;
-
 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.procedure.ListenerBase;
+import org.simantics.db.impl.procedure.InternalProcedure;
 
-final public class DirectPredicates extends CollectionUnaryQuery<IntProcedure> {
+final public class DirectPredicates extends CollectionUnaryQuery<InternalProcedure<IntSet>> {
 
-	private DirectPredicates(final int resource) {
+	DirectPredicates(final int resource) {
 		super(resource);
 	}
-
-	final static DirectPredicates entry(final QueryProcessor provider, final int r) {
-
-		return (DirectPredicates)provider.directPredicatesMap.get(r);
-
-	}
-
-	final static void runner(ReadGraphImpl graph, final int r, final QueryProcessor provider, final CacheEntry parent, final ListenerBase listener, final IntProcedure procedure) {
-
-		DirectPredicates entry = (DirectPredicates)provider.directPredicatesMap.get(r);
-		if(entry == null) {
-
-			entry = new DirectPredicates(r);
-        	entry.setPending();
-        	entry.clearResult(provider.querySupport);
-        	entry.putEntry(provider);
-			
-			provider.performForEach(graph, entry, parent, listener, procedure);
-			
-		} else {
-			
-			if(!entry.isReady()) {
-				synchronized(entry) {
-					if(!entry.isReady()) {
-						provider.registerDependencies(graph, entry, parent, listener, procedure, false);
-						entry.computeForEach(graph, provider, procedure, true);
-						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) {
-
-		if(parent == null && listener == null) {
-			DirectPredicates entry = (DirectPredicates)provider.directPredicatesMap.get(r);
-			if(entry != null && entry.isReady()) { 
-				entry.performFromCache(graph, provider, procedure);
-				return;
-			} else {
-			    computeForEach(graph, r, null, procedure, false);
-			    return;
-			}
-		}
-
-		runner(graph, r, provider, parent, listener, procedure);
-
-	}
-
 	
 	@Override
 	public void clearResult(QuerySupport support) {
@@ -84,31 +28,21 @@ final public class DirectPredicates extends CollectionUnaryQuery<IntProcedure> {
 		setResult(INVALID_RESULT);
 	}
 	
-	@Override
-	public UnaryQuery<IntProcedure> getEntry(QueryProcessor provider) {
-		return provider.directPredicatesMap.get(id);
-	}
-
-	@Override
-	public void putEntry(QueryProcessor provider) {
-		provider.directPredicatesMap.put(id, this);
-	}
-
 	@Override
 	final public void removeEntry(QueryProcessor provider) {
-		provider.directPredicatesMap.remove(id);
+		provider.cache.remove(this);
 	}
 
 	@Override
-	public Object computeForEach(ReadGraphImpl graph, QueryProcessor provider, IntProcedure procedure, boolean store) {
-	    return computeForEach(graph, id, this, procedure, store);
+	public Object compute(ReadGraphImpl graph, InternalProcedure<IntSet> procedure) throws DatabaseException {
+	    return computeForEach(graph, id, this, procedure);
 	}
 	
-	public static Object computeForEach(ReadGraphImpl graph, int id, final DirectPredicates entry, final IntProcedure procedure, final boolean store) {
+	public static Object computeForEach(ReadGraphImpl graph, int id, final DirectPredicates entry, final InternalProcedure<IntSet> procedure) throws DatabaseException {
 
 		graph.processor.querySupport.ensureLoaded(graph, id);
 		
-		final IntArray list = new IntArray();
+		final IntSet list = new IntSet(graph.processor.querySupport);
 
 		graph.processor.querySupport.getPredicates(graph, id, new IntProcedure() {
 
@@ -128,16 +62,12 @@ final public class DirectPredicates extends CollectionUnaryQuery<IntProcedure> {
 
 		});
 
-		if(entry != null)
-		    entry.finish(graph, graph.processor);
-
-		if(list.data == null) {
-			if(list.sizeOrData != IntArray.NO_DATA) procedure.execute(graph, list.sizeOrData);
-		} else {
-			for(int i = 0;i < list.sizeOrData ; i++) procedure.execute(graph, list.data[i]);
+		if(entry != null) {
+		    entry.setResult(list);
+		    entry.setReady();
 		}
-
-		procedure.finished(graph);
+		
+		procedure.execute(graph, list);
 		
 		return list;
 
@@ -152,45 +82,37 @@ final public class DirectPredicates extends CollectionUnaryQuery<IntProcedure> {
 	public void setReady() {
 		statusOrException = READY;
 	}
-	
-	final private void finish(ReadGraphImpl graph, QueryProcessor provider) {
-
-		setReady();
-
-	}
 
 	@Override
-	public Object performFromCache(ReadGraphImpl graph, QueryProcessor provider, IntProcedure procedure) {
+	public Object performFromCache(ReadGraphImpl graph, InternalProcedure<IntSet> procedure) throws DatabaseException {
 
 		assert(isReady());
 
-		return computeForEach(graph, provider, procedure, false);
+    	if(handleException(graph, procedure)) return EXCEPTED;
+    	
+    	IntSet result = getResult();
+    	
+        procedure.execute(graph, result);
+        
+        return result;
 
 	}
 
 	@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 IntProcedureAdapter() {
+		compute(graph, new InternalProcedure<IntSet>() {
 
 			@Override
-			public void finished(ReadGraphImpl graph) {
-				s.release();
+			public void execute(ReadGraphImpl graph, IntSet set) {
 			}
 
 			@Override
 			public void exception(ReadGraphImpl graph, Throwable t) {
-				s.release();
 				new Error("Error in recompute.", t).printStackTrace();
 			}
 
-		}, true);
-
-        while(!s.tryAcquire()) {
-        	provider.resume(graph);
-        }
+		});
 
 	}