X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.db.impl%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fimpl%2Fquery%2FQueryProcessor.java;h=9c60691fad7a0a850228997e85ffb47168ca1aae;hb=8b6de499c9c1bad0e72631719fd165ce39d6ad56;hp=5945589a331c2460f83e0479f4f56f2b7425ebf2;hpb=1f8b50d81a1aa1bbd67a77f7cbc1060f2eb805d4;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/QueryProcessor.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/QueryProcessor.java
index 5945589a3..9c60691fa 100644
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/QueryProcessor.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/QueryProcessor.java
@@ -16,7 +16,6 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.PrintStream;
-import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -32,8 +31,6 @@ import java.util.Set;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.locks.Condition;
-import java.util.concurrent.locks.ReentrantLock;
 
 import org.simantics.databoard.Bindings;
 import org.simantics.db.AsyncReadGraph;
@@ -54,7 +51,6 @@ import org.simantics.db.exception.NoInverseException;
 import org.simantics.db.exception.ResourceNotFoundException;
 import org.simantics.db.impl.DebugPolicy;
 import org.simantics.db.impl.ResourceImpl;
-import org.simantics.db.impl.graph.MultiIntProcedure;
 import org.simantics.db.impl.graph.ReadGraphImpl;
 import org.simantics.db.impl.graph.ReadGraphSupport;
 import org.simantics.db.impl.graph.WriteGraphImpl;
@@ -68,15 +64,12 @@ import org.simantics.db.procedure.AsyncProcedure;
 import org.simantics.db.procedure.AsyncSetListener;
 import org.simantics.db.procedure.ListenerBase;
 import org.simantics.db.procedure.MultiProcedure;
-import org.simantics.db.procedure.Procedure;
 import org.simantics.db.procedure.StatementProcedure;
+import org.simantics.db.procedure.SyncMultiProcedure;
 import org.simantics.db.request.AsyncMultiRead;
-import org.simantics.db.request.AsyncRead;
 import org.simantics.db.request.ExternalRead;
 import org.simantics.db.request.MultiRead;
-import org.simantics.db.request.Read;
 import org.simantics.db.request.RequestFlags;
-import org.simantics.db.request.WriteTraits;
 import org.simantics.layer0.Layer0;
 import org.simantics.utils.DataContainer;
 import org.simantics.utils.Development;
@@ -634,7 +627,7 @@ final public class QueryProcessor extends AbstractDisposable implements ReadGrap
 
 	}
 
-	final <T> void runMultiRead(final ReadGraphImpl graph, MultiReadEntry cached, final MultiRead<T> query, final CacheEntry parent, final QueryProcessor provider, final ListenerBase listener, final AsyncMultiProcedure<T> procedure) {
+	final <T> void runMultiRead(final ReadGraphImpl graph, MultiReadEntry cached, final MultiRead<T> query, final CacheEntry parent, final QueryProcessor provider, final ListenerBase listener, final SyncMultiProcedure<T> procedure) {
 
 		try {
 			QueryCache.runnerMultiReadEntry(graph, query, parent, listener, procedure);
@@ -666,7 +659,7 @@ final public class QueryProcessor extends AbstractDisposable implements ReadGrap
 //
 //	}
 
-	public <T> void queryMultiRead(final ReadGraphImpl graph, final MultiRead<T> query, final CacheEntry parent, final ListenerBase listener, final AsyncMultiProcedure<T> procedure) throws DatabaseException {
+	public <T> void queryMultiRead(final ReadGraphImpl graph, final MultiRead<T> query, final CacheEntry parent, final ListenerBase listener, final SyncMultiProcedure<T> procedure) throws DatabaseException {
 
 		QueryCache.runnerMultiReadEntry(graph, query, parent, listener, procedure);
 
@@ -2762,51 +2755,60 @@ final public class QueryProcessor extends AbstractDisposable implements ReadGrap
 	}
 
 	@Override
-	final public void forEachDirectPredicate(final ReadGraphImpl impl, final Resource subject, final AsyncMultiProcedure<Resource> procedure) {
-
-		throw new UnsupportedOperationException();
-		
-//		assert(subject != null);
-//		assert(procedure != null);
-//
-//		final ListenerBase listener = getListenerBase(procedure);
-//
-//		MultiIntProcedure proc = new MultiIntProcedure(procedure, impl, querySupport);
-//
-//		int sId = querySupport.getId(subject);
-//
-//		try {
-//			QueryCache.runnerDirectPredicates(impl, sId, impl.parent, listener, proc);
-//		} catch (DatabaseException e) {
-//			Logger.defaultLogError(e);
-//		}
-
-	}
-
-	@Override
-	final public void forEachDirectStatement(final ReadGraphImpl impl, final Resource subject, final Procedure<DirectStatements> procedure) {
+	final public void forEachDirectPredicate(final ReadGraphImpl impl, final Resource subject, final AsyncProcedure<Set<Resource>> procedure) {
 
 		assert(subject != null);
 		assert(procedure != null);
 
 		final ListenerBase listener = getListenerBase(procedure);
 
-		org.simantics.db.impl.query.DirectStatements.queryEach(impl, querySupport.getId(subject), this, impl.parent, listener, procedure);
+		int sId = querySupport.getId(subject);
 
-	}
+		try {
+			QueryCache.runnerDirectPredicates(impl, sId, impl.parent, listener, new InternalProcedure<IntSet>() {
 
-	@Override
-	final public void forEachDirectStatement(final ReadGraphImpl impl, final Resource subject, final AsyncProcedure<DirectStatements> procedure, boolean ignoreVirtual) {
+				@Override
+				public void execute(ReadGraphImpl graph, IntSet result) throws DatabaseException {
+					procedure.execute(graph, result);
+				}
 
-		assert(subject != null);
-		assert(procedure != null);
+				@Override
+				public void exception(ReadGraphImpl graph, Throwable throwable) throws DatabaseException {
+					procedure.exception(graph, throwable);
+				}
+				
+			});
+		} catch (DatabaseException e) {
+			Logger.defaultLogError(e);
+		}
 
-		final ListenerBase listener = getListenerBase(procedure);
+	}
 
-		org.simantics.db.impl.query.DirectStatements.queryEach(impl, querySupport.getId(subject), this, impl.parent, listener, procedure, ignoreVirtual);
+	final public DirectStatements getDirectStatements(final ReadGraphImpl impl, final Resource subject, final boolean ignoreVirtual) {
+
+//		assert(subject != null);
+//		assert(procedure != null);
+//
+//		final ListenerBase listener = getListenerBase(procedure);
+//
+//		org.simantics.db.impl.query.DirectStatements.queryEach(impl, querySupport.getId(subject), this, impl.parent, listener, procedure);
+		
+		return querySupport.getStatements(impl, querySupport.getId(subject), this, ignoreVirtual);
 
 	}
 
+//	@Override
+//	final public void forEachDirectStatement(final ReadGraphImpl impl, final Resource subject, final SyncProcedure<DirectStatements> procedure, boolean ignoreVirtual) {
+//
+//		assert(subject != null);
+//		assert(procedure != null);
+//
+//		final ListenerBase listener = getListenerBase(procedure);
+//
+//		org.simantics.db.impl.query.DirectStatements.queryEach(impl, querySupport.getId(subject), this, impl.parent, listener, procedure, ignoreVirtual);
+//
+//	}
+	
 	private static final Resource INVALID_RESOURCE = new ResourceImpl(null, Integer.MIN_VALUE);
 
 	@Override
@@ -3492,32 +3494,11 @@ final public class QueryProcessor extends AbstractDisposable implements ReadGrap
 	}
 
 	@Override
-	final public void forRelationInfo(final ReadGraphImpl impl, final Resource subject, final AsyncProcedure<RelationInfo> procedure) {
+	final public RelationInfo getRelationInfo(final ReadGraphImpl impl, final Resource subject) throws DatabaseException {
 		
 		assert(subject != null);
-		assert(procedure != null);
-
-		final ListenerBase listener = getListenerBase(procedure);
-		assert(listener == null);
-
-		try {
-			
-			QueryCache.runnerRelationInfoQuery(impl, querySupport.getId(subject), impl.parent, listener, new InternalProcedure<RelationInfo>() {
-
-				@Override
-				public void execute(final ReadGraphImpl graph, RelationInfo set) {
-					procedure.execute(graph, set);					
-				}
 
-				@Override
-				public void exception(ReadGraphImpl graph, Throwable t) {
-					procedure.exception(graph, t);
-				}
-
-			});
-		} catch (DatabaseException e) {
-			Logger.defaultLogError(e);
-		}
+		return QueryCache.resultRelationInfoQuery(impl, querySupport.getId(subject), impl.parent, null);
 
 	}
 
@@ -4311,7 +4292,7 @@ final public class QueryProcessor extends AbstractDisposable implements ReadGrap
 //	}
 
 	@Override
-	final public <T> void query(final ReadGraphImpl impl, final MultiRead<T> request, final CacheEntry parent, final AsyncMultiProcedure<T> procedure, ListenerBase listener) {
+	final public <T> void query(final ReadGraphImpl impl, final MultiRead<T> request, final CacheEntry parent, final SyncMultiProcedure<T> procedure, ListenerBase listener) {
 
 		assert(request != null);
 		assert(procedure != null);