X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.db.procore%2Fsrc%2Ffi%2Fvtt%2Fsimantics%2Fprocore%2Finternal%2FSessionImplSocket.java;h=8bbccd080512af308765c0a15c1a413526c5acf1;hb=1e957fc9da518f3bef8a2c19cad72772087e1b6a;hp=9290ac99fdd98a5792a542a0b51b7309941f1704;hpb=09366c7018d046746832e4e7033ca2588455dac2;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/SessionImplSocket.java b/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/SessionImplSocket.java
index 9290ac99f..8bbccd080 100644
--- a/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/SessionImplSocket.java
+++ b/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/SessionImplSocket.java
@@ -89,6 +89,7 @@ import org.simantics.db.impl.graph.WriteSupport;
 import org.simantics.db.impl.internal.RandomAccessValueSupport;
 import org.simantics.db.impl.procedure.ResultCallWrappedQueryProcedure4;
 import org.simantics.db.impl.procedure.ResultCallWrappedSingleQueryProcedure4;
+import org.simantics.db.impl.query.QueryCache;
 import org.simantics.db.impl.query.QueryProcessor;
 import org.simantics.db.impl.query.QueryProcessor.SessionRead;
 import org.simantics.db.impl.query.QueryProcessor.SessionTask;
@@ -466,7 +467,7 @@ public abstract class SessionImplSocket implements Session, WriteRequestSchedule
                     }
 
 
-                    assert(!queryProvider2.dirty);
+                    assert(!queryProvider2.cache.dirty);
 
                 } catch (Throwable e) {
 
@@ -1022,15 +1023,13 @@ public abstract class SessionImplSocket implements Session, WriteRequestSchedule
         		try {
 
         			int sResourceKey = ClusterTraits.getResourceIndexFromResourceKey(s);
-        			int pResourceKey = ClusterTraits.getResourceIndexFromResourceKey(p);
-        			int oResourceKey = ClusterTraits.getResourceIndexFromResourceKey(o);
 
         			ClusterI pc = clusterTable.getClusterProxyByResourceKey(p);
         			ClusterI oc = clusterTable.getClusterProxyByResourceKey(o);
 
         			clusterTranslator.addStatementIndex(cluster, sResourceKey, cluster.getClusterUID(), ClusterChange.REMOVE_OPERATION);
-        			clusterTranslator.addStatementIndex(cluster, pResourceKey, pc.getClusterUID(), ClusterStream.NULL_OPERATION);
-        			clusterTranslator.addStatementIndex(cluster, oResourceKey, oc.getClusterUID(), ClusterStream.NULL_OPERATION);
+        			clusterTranslator.addStatementIndex(cluster, p, pc.getClusterUID(), ClusterStream.NULL_OPERATION);
+        			clusterTranslator.addStatementIndex(cluster, o, oc.getClusterUID(), ClusterStream.NULL_OPERATION);
         			clusterTranslator.removeStatement(cluster);
 
         			queryProvider2.invalidateResource(s);
@@ -1514,7 +1513,8 @@ public abstract class SessionImplSocket implements Session, WriteRequestSchedule
                     if (listener != null) {
 
                     	try {
-                    		newGraph.processor.queryRead(newGraph, request, null, new AsyncProcedure<T>() {
+                    		
+                    		AsyncProcedure ap = new AsyncProcedure<T>() {
 
                     			@Override
                     			public void exception(AsyncReadGraph graph, Throwable t) {
@@ -1532,7 +1532,10 @@ public abstract class SessionImplSocket implements Session, WriteRequestSchedule
                     				procedure.execute(graph, t);
                     			}
 
-                    		}, listener);
+                    		};
+                    		
+                    		QueryCache.runnerReadEntry(newGraph, request, null, listener, ap);
+                    		
                     	} catch (Throwable t) {
                     	    // This is handled by the AsyncProcedure
                     		//Logger.defaultLogError("Internal error", t);
@@ -1625,9 +1628,12 @@ public abstract class SessionImplSocket implements Session, WriteRequestSchedule
 
                     if (listener != null) {
 
-                        newGraph.processor.query(newGraph, request, null, procedure, listener);
-
-//                        newGraph.waitAsync(request);
+                        try {
+                        	QueryCache.runnerAsyncReadEntry(newGraph, request, null, listener, procedure);
+							//newGraph.processor.query(newGraph, request, null, procedure, listener);
+						} catch (DatabaseException e) {
+							Logger.defaultLogError(e);
+						}
 
                     } else {
 
@@ -3507,7 +3513,7 @@ public abstract class SessionImplSocket implements Session, WriteRequestSchedule
 
     public int getAmountOfQueryThreads() {
         // This must be a power of two
-        return 1;
+        return 4;
 //        return Integer.highestOneBit(Runtime.getRuntime().availableProcessors());
     }