Multiple reader thread support for db client

[simantics/platform.git] / bundles / org.simantics.db.procore / src / fi / vtt / simantics / procore / internal / State.java

diff --git a/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/State.java b/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/State.java
index f30418a6a32869bf009fc661baa47244a4679a1b..efd82b6ca8f2822ab59871793c515d8a5a4f8e80 100644 (file)
--- a/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/State.java
+++ b/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/State.java
@@ -17,6 +17,7 @@ import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
 import org.simantics.db.ChangeSet;
+import org.simantics.db.Disposable;
 import org.simantics.db.Operation;
 import org.simantics.db.VirtualGraph;
 import org.simantics.db.common.utils.Logger;
@@ -296,6 +297,9 @@ class State {
                     }
                     // This will send and accept the reverse change set.
                     transactionToken.cancelEnd(session.writeSupport, null, session.clusterStream);
+                } else {
+                    queryProvider.performDirtyUpdates(graph);
+                    queryProvider.performScheduledUpdates(graph);
                 }
             }
             session.writeSupport.clearMetadata();
@@ -327,17 +331,9 @@ class State {
                 if (vg != null && clusterStream.isDirty())
                     new Exception("Internal error: virtual transaction committed changes into core (" + request + ")").printStackTrace();
 
-//                long start = System.nanoTime();
-                if (null == vg) {
-                    clusterStream.reallyFlush();
-                    // This was fired just before in handleUpdatesAndMetadata
-//                    if (!writeOnly)
-//                        session.fireMetadataListeners(graph, cs);
-                } else
-                    clusterStream.clear();
-
-//                long duration = System.nanoTime() - start;
-//                System.out.println("reallyFlush " + 1e-9*duration + "s. ");
+                // This is needed even when the write targets a virtual graph -
+                // deny can always remove a persistent statement. 
+                clusterStream.reallyFlush();
 
                 session.clientChanges = new ClientChangesImpl(session);
 
@@ -391,6 +387,7 @@ class State {
             this.close(); // Everything is lost anyway.
             throw new IllegalStateException(e);
         } finally {
+            Disposable.safeDispose(cs);
             lock.unlock();
         }
     }