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

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/ValueQuery.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/ValueQuery.java
index d85595831..b96e13d42 100644
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/ValueQuery.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/ValueQuery.java
@@ -11,85 +11,22 @@
  *******************************************************************************/
 package org.simantics.db.impl.query;
 
-import java.util.concurrent.Semaphore;
-
+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;
 
 final public class ValueQuery extends UnaryQuery<InternalProcedure<byte[]>> {
     
-    private ValueQuery(final int resource) {
+    ValueQuery(final int resource) {
         super(resource);
     }
-    
-    final static ValueQuery entry(final QueryProcessor provider, final int r) {
-        return (ValueQuery)provider.valueMap.get(r);
-    }
-
-    final static byte[] runner(final ReadGraphImpl graph, final int r, CacheEntry parent, final ListenerBase listener, final InternalProcedure<byte[]> procedure) {
-
-    	QueryProcessor processor = graph.processor;
-    	
-    	ValueQuery entry = (ValueQuery)processor.valueMap.get(r); 
-        if(entry == null) {
-        	
-        	entry = new ValueQuery(r);
-        	entry.setPending();
-        	entry.clearResult(processor.querySupport);
-        	entry.putEntry(processor);
-        	
-        	return (byte[])processor.performForEach(graph, entry, parent, listener, procedure);
-            
-        } else {
-        	
-        	return (byte[])processor.performForEach(graph, entry, parent, listener, procedure);
-            
-        }
-
-    }
-    
-    final public static byte[] queryEach(ReadGraphImpl graph, final int r, final CacheEntry parent, final ListenerBase listener, final InternalProcedure<byte[]> procedure) {
-        
-    	assert(r != 0);
-    	
-    	if(graph.parent == null && listener == null) {
-    		return ValueQuery.computeForEach(graph, r, null, procedure);
-        } else {
-        	return runner(graph, r, parent, listener, procedure);
-        }
-         
-    }
-
-    final public static byte[] queryEach(ReadGraphImpl graph, final int r, final CacheEntry parent) {
-        
-        assert(r != 0);
-        
-        if(graph.parent == null) {
-            return ValueQuery.computeForEach(graph, r);
-        } else {
-            return runner(graph, r, parent, null, null);
-        }
-         
-    }
-    
- 	@Override
- 	public UnaryQuery<InternalProcedure<byte[]>> getEntry(QueryProcessor provider) {
-        return provider.valueMap.get(id);
- 	}
- 	
- 	@Override
- 	public void putEntry(QueryProcessor provider) {
-        provider.valueMap.put(id, this);
- 	}
 
  	@Override
  	final public void removeEntry(QueryProcessor provider) {
- 		provider.valueMap.remove(id);
+ 		provider.cache.remove(this);
  	}
- 	
  		
-	public static byte[] computeForEach(ReadGraphImpl graph, final int r, final ValueQuery entry, final InternalProcedure<byte[]> procedure) {
+	public static byte[] computeForEach(ReadGraphImpl graph, final int r, final ValueQuery entry, final InternalProcedure<byte[]> procedure) throws DatabaseException {
 
  		graph.ensureLoaded(r);
  		
@@ -106,18 +43,9 @@ final public class ValueQuery extends UnaryQuery<InternalProcedure<byte[]>> {
  		
  	}
 
-    public static byte[] computeForEach(ReadGraphImpl graph, final int r) {
-
-        graph.ensureLoaded(r);
-        
-        return graph.getValue(r);
-        
-    }
-	
- 	@Override
- 	public Object computeForEach(ReadGraphImpl graph, final QueryProcessor queryProvider, final InternalProcedure<byte[]> procedure, final boolean store) {
- 		return computeForEach(graph, id, this, procedure);
-    }
+// 	public Object compute(ReadGraphImpl graph, final InternalProcedure<byte[]> procedure) throws DatabaseException {
+// 		return computeForEach(graph, id, this, procedure);
+//    }
     
     @Override
     public String toString() {
@@ -125,20 +53,17 @@ final public class ValueQuery extends UnaryQuery<InternalProcedure<byte[]>> {
     }
 
     @Override
-    public Object performFromCache(ReadGraphImpl graph, QueryProcessor queryProvider, InternalProcedure<byte[]> procedure) {
-    	return computeForEach(graph, queryProvider, procedure, false);
+    public Object performFromCache(ReadGraphImpl graph, InternalProcedure<byte[]> procedure) throws DatabaseException {
+    	return computeForEach(graph, id, this, procedure);
     }
     
     @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 InternalProcedure<byte[]>() {
+    	computeForEach(graph, id, this, new InternalProcedure<byte[]>() {
 
             @Override
             public void execute(ReadGraphImpl graph, byte[] result) {
-            	s.release();
             }
 			
 			@Override
@@ -146,17 +71,13 @@ final public class ValueQuery extends UnaryQuery<InternalProcedure<byte[]>> {
 				throw new Error("Error in recompute.", t);
             }
 
-        }, true);
-        
-        while(!s.tryAcquire()) {
-        	provider.resume(graph);
-        }
+        });
         
     }
     
     @Override
     boolean isImmutable(ReadGraphImpl graph) {
     	return graph.processor.isImmutable(id);
-    }    
+    }
     
 }