X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.db.impl%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fimpl%2Fquery%2FMultiReadEntry.java;fp=bundles%2Forg.simantics.db.impl%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fimpl%2Fquery%2FMultiReadEntry.java;h=f2fff24cfc7ac213de3890331806509d68808575;hb=d0e8f57df83c175bac2098412ee71646fb9ff0e9;hp=d0bb436d74e88e994a66fa9e27474f5a31139bfd;hpb=bdab0adcee131a18290393e1c2fca72de48c10d2;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/MultiReadEntry.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/MultiReadEntry.java
index d0bb436d7..f2fff24cf 100644
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/MultiReadEntry.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/MultiReadEntry.java
@@ -15,6 +15,7 @@ import java.util.ArrayList;
 
 import org.simantics.db.AsyncReadGraph;
 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.query.QueryProcessor.AsyncBarrier;
 import org.simantics.db.procedure.AsyncMultiProcedure;
@@ -22,13 +23,11 @@ import org.simantics.db.request.MultiRead;
 import org.simantics.db.request.RequestFlags;
 import org.simantics.utils.datastructures.Pair;
 
-final public class MultiReadEntry<T> extends CacheEntryBase {
-
-//    public ArrayList<Pair<AsyncMultiProcedure<T>, AsyncBarrier>> procs;
+final public class MultiReadEntry<T> extends CacheEntryBase<AsyncMultiProcedure<T>> {
 
     protected MultiRead<T> request;
     
-    public MultiReadEntry(MultiRead<T> request) {
+    MultiReadEntry(MultiRead<T> request) {
     	this.request = request;
     }
 
@@ -56,27 +55,9 @@ final public class MultiReadEntry<T> extends CacheEntryBase {
         ArrayList<Pair<AsyncMultiProcedure<T>, AsyncBarrier>> p = null;
 
         synchronized(this) {
-
         	setReady();
-        	
-//            p = procs;
-//            procs = null; 
-        
         }
         
-//        if(p != null) {
-//        	ArrayList<T> v = (ArrayList<T>)getResult();
-//        	if(v != null) {
-//        		for(Pair<AsyncMultiProcedure<T>, AsyncBarrier> pair : p) {
-//        			for(T t : v) pair.first.execute(graph, t);
-//        		}
-//        	}
-//        	for(Pair<AsyncMultiProcedure<T>, AsyncBarrier> pair : p) {
-//        		pair.first.finished(graph);
-//        		pair.second.dec();
-//        	}
-//        }
-        
     }
 
     @Override
@@ -99,41 +80,30 @@ final public class MultiReadEntry<T> extends CacheEntryBase {
         return new Query() {
 
 			@Override
-			public void recompute(ReadGraphImpl graph, Object provider, CacheEntry entry) {
+			public void recompute(ReadGraphImpl graph) {
 				
-				QueryProcessor qp = (QueryProcessor)provider;
-
-				final ReadGraphImpl parentGraph = ReadGraphImpl.forRecompute(entry, qp); 
-//                parentGraph.state.barrier.inc();
-
 				try {
 
-				    request.perform(parentGraph , new AsyncMultiProcedure<T>() {
+				    request.perform(graph , new AsyncMultiProcedure<T>() {
 
                         @Override
                         public void execute(AsyncReadGraph graph, T result) {
                             addOrSet(result);
-//                            parentGraph.state.barrier.dec();
                         }
                         
                         public void finished(AsyncReadGraph graph) {
                         	finish(graph);
-//                            parentGraph.state.barrier.dec();
                         };
         				
         				@Override
         				public void exception(AsyncReadGraph graph, Throwable t) {
                             except(t);
-//                            parentGraph.state.barrier.dec();
         	            }
 
                     });
 
-//					parentGraph.waitAsync(request);
-
 				} catch (Throwable t) {
                     except(t);
-//                    parentGraph.state.barrier.dec();
                     if(DebugException.DEBUG) new DebugException(t).printStackTrace();
                 }
 				
@@ -141,7 +111,7 @@ final public class MultiReadEntry<T> extends CacheEntryBase {
 
 			@Override
 			public void removeEntry(QueryProcessor processor) {
-		    	processor.multiReadMap.remove(request);
+		    	processor.cache.remove(MultiReadEntry.this);
 			}
 
 			@Override
@@ -195,11 +165,8 @@ final public class MultiReadEntry<T> extends CacheEntryBase {
     }
     
 	@Override
-	public void performFromCache(ReadGraphImpl graph, Object provider,
-			Object procedure) {
+	public Object performFromCache(ReadGraphImpl graph, AsyncMultiProcedure<T> proc) {
 		
-		final AsyncMultiProcedure<T> proc = (AsyncMultiProcedure<T>)procedure;
-
         if(isExcepted()) {
             
             try {
@@ -227,7 +194,7 @@ final public class MultiReadEntry<T> extends CacheEntryBase {
 
         }
 		
-		
+		return null;
 		
 	}
 	
@@ -237,4 +204,9 @@ final public class MultiReadEntry<T> extends CacheEntryBase {
 		else return request.toString() + statusOrException;
 	}
 
+	//@Override
+	public Object compute(ReadGraphImpl graph, AsyncMultiProcedure<T> procedure) throws DatabaseException {
+    	return graph.processor.cache.performQuery(graph, request, this, procedure);
+	}
+
 }