Fixed multiple issues causing dangling references to discarded queries

[simantics/platform.git] / bundles / org.simantics.db.layer0 / src / org / simantics / db / layer0 / util / ConsistsOfProcess.java

diff --git a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/ConsistsOfProcess.java b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/ConsistsOfProcess.java
index 4124add429dd76d4ae2756a6b3e0404e0d214f01..55fe1ac0111f008f90c3d0b816720b01ce34ce03 100644 (file)
--- a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/ConsistsOfProcess.java
+++ b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/ConsistsOfProcess.java
@@ -6,7 +6,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.simantics.db.AsyncReadGraph;
+import org.simantics.databoard.Bindings;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.ResourceMap;
@@ -16,8 +16,7 @@ import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.layer0.adapter.SubgraphExtent.ExtentStatus;
 import org.simantics.db.layer0.util.TransferableGraphConfiguration2.SeedSpec;
 import org.simantics.db.layer0.util.TransferableGraphConfiguration2.SeedSpec.SeedSpecType;
-import org.simantics.db.procedure.AsyncContextMultiProcedure;
-import org.simantics.db.procedure.Procedure;
+import org.simantics.db.procedure.SyncContextMultiProcedure;
 import org.simantics.db.service.DirectQuerySupport;
 import org.simantics.layer0.Layer0;
 import org.simantics.utils.datastructures.Pair;
@@ -26,8 +25,8 @@ class ConsistsOfProcess {
 
        final List<ConsistsOfProcessEntry> result;
        final Set<Resource> childrenWithNoName;
-       final AsyncContextMultiProcedure<ConsistsOfProcessEntry, Resource> structure;
-       final AsyncContextMultiProcedure<ConsistsOfProcessEntry, Resource> names;
+       final SyncContextMultiProcedure<ConsistsOfProcessEntry, Resource> structure;
+       final SyncContextMultiProcedure<ConsistsOfProcessEntry, Resource> names;
 
        public static Pair<List<ConsistsOfProcessEntry>,Set<Resource>> walk(ReadGraph graph, Collection<SeedSpec> specs, boolean ignoreVirtual) throws DatabaseException {
                return walk(graph, null, specs, ignoreVirtual);
@@ -35,14 +34,7 @@ class ConsistsOfProcess {
 
        public static Pair<List<ConsistsOfProcessEntry>,Set<Resource>> walk(ReadGraph graph, ResourceMap<ExtentStatus> status, Collection<SeedSpec> specs, boolean ignoreVirtual) throws DatabaseException {
                
-               Collection<ConsistsOfProcessEntry> entries = new ArrayList<>();
-               for(SeedSpec r : specs) {
-                       if(SeedSpecType.INTERNAL.equals(r.specType))
-                           entries.add(new ConsistsOfProcessEntry(null, r.resource, true));
-                       else
-                               entries.add(new ConsistsOfProcessEntry(null, r.resource, false));
-               }
-       ConsistsOfProcess process = new ConsistsOfProcess(graph, status, entries, ignoreVirtual);
+       ConsistsOfProcess process = new ConsistsOfProcess(graph, status, specs, ignoreVirtual);
        return Pair.make(process.result, process.childrenWithNoName);
        
     }
@@ -50,61 +42,50 @@ class ConsistsOfProcess {
     static class ConsistsOfProcessEntry {
        public ConsistsOfProcessEntry parent;
        public Resource resource;
-       public boolean internal;
        public boolean valid = true;
        public String name = null;
-       ConsistsOfProcessEntry(ConsistsOfProcessEntry parent, Resource resource, boolean internal) {
+       ConsistsOfProcessEntry(ConsistsOfProcessEntry parent, Resource resource) {
                this.parent = parent;
                this.resource = resource;
-               this.internal = internal;
        }
     }
        
-    private ConsistsOfProcess(ReadGraph graph, ResourceMap<ExtentStatus> status, final Collection<ConsistsOfProcessEntry> entries, final boolean ignoreVirtual) throws DatabaseException {
+    private ConsistsOfProcess(ReadGraph graph, ResourceMap<ExtentStatus> status, final Collection<SeedSpec> seeds, final boolean ignoreVirtual) throws DatabaseException {
 
                final Layer0 L0 = Layer0.getInstance(graph);
                final DirectQuerySupport dqs = graph.getService(DirectQuerySupport.class);
                
                result = new ArrayList<>();
                childrenWithNoName = new HashSet<>();
-               names = dqs.compileForEachObject(graph, L0.HasName, new AsyncContextMultiProcedure<ConsistsOfProcessEntry, Resource>() {
+               names = dqs.compileForEachObject(graph, L0.HasName, new SyncContextMultiProcedure<ConsistsOfProcessEntry, Resource>() {
 
                        @Override
-                       public void execute(AsyncReadGraph graph, ConsistsOfProcessEntry entry, Resource nameResource) {
+                       public void execute(ReadGraph graph, ConsistsOfProcessEntry entry, Resource nameResource) throws DatabaseException {
                
                                if(status != null)
                                        status.put(nameResource, ExtentStatus.EXCLUDED);
                                
-                               graph.forPossibleValue(nameResource, new Procedure<String>() {
-
-                                       @Override
-                                       public void execute(String name) {
-                                           if(!entry.valid) return;
-                                           
-                                           if(name == null) {
-                                               entry.valid = false;
-                                           } else if (entry.name != null) {
-                                               entry.valid = false;
-                                           } else {
-                                               entry.name = name;
-                                           }
-                                       }
+                           if(!entry.valid) return;
+
+                               String name = graph.getValue(nameResource, Bindings.STRING);
+                               if(name == null) {
+                                       entry.valid = false;
+                               } else if (entry.name != null) {
+                                       entry.valid = false;
+                               } else {
+                                       entry.name = name;
+                               }
 
-                                       @Override
-                                       public void exception(Throwable t) {
-                                               Logger.defaultLogError(t);
-                                       }
-                                       
-                               });
+                               
                        }
 
                        @Override
-                       public void exception(AsyncReadGraph graph, Throwable throwable) {
+                       public void exception(ReadGraph graph, Throwable throwable) {
                                Logger.defaultLogError(throwable);
                        }
 
                        @Override
-                       public void finished(AsyncReadGraph graph, ConsistsOfProcessEntry entry) {
+                       public void finished(ReadGraph graph, ConsistsOfProcessEntry entry) {
                            if(entry.valid) {
                                if(entry.name != null) {
                                    result.add(entry);
@@ -119,16 +100,16 @@ class ConsistsOfProcess {
                        }
                });
                
-               structure = dqs.compileForEachObject(graph, L0.ConsistsOf, new AsyncContextMultiProcedure<ConsistsOfProcessEntry, Resource>() {
+               structure = dqs.compileForEachObject(graph, L0.ConsistsOf, new SyncContextMultiProcedure<ConsistsOfProcessEntry, Resource>() {
 
                        @Override
-                       public void execute(AsyncReadGraph graph, ConsistsOfProcessEntry parent, Resource child) {
+                       public void execute(ReadGraph graph, ConsistsOfProcessEntry parent, Resource child) {
 
                                if(status != null)
                                        if(ExtentStatus.EXCLUDED.equals(status.get(child))) return;
                                
                                if(!ignoreVirtual || child.isPersistent()) {
-                                       ConsistsOfProcessEntry entry = new ConsistsOfProcessEntry(parent, child, false);
+                                       ConsistsOfProcessEntry entry = new ConsistsOfProcessEntry(parent, child);
                                        dqs.forEachObjectCompiled(graph, child, entry, structure);
                                        dqs.forEachObjectCompiled(graph, child, entry, names);
                                }
@@ -136,11 +117,11 @@ class ConsistsOfProcess {
                        }
 
                        @Override
-                       public void finished(AsyncReadGraph graph, ConsistsOfProcessEntry parent) {
+                       public void finished(ReadGraph graph, ConsistsOfProcessEntry parent) {
                        }
 
                        @Override
-                       public void exception(AsyncReadGraph graph, Throwable throwable) {
+                       public void exception(ReadGraph graph, Throwable throwable) {
                                Logger.defaultLogError(throwable);
                        }
 
@@ -150,11 +131,20 @@ class ConsistsOfProcess {
 
                        @Override
                        public void run(ReadGraph graph) throws DatabaseException {
-                               for(ConsistsOfProcessEntry entry  : entries) {
-                                       dqs.forEachObjectCompiled(graph, entry.resource, entry, structure);
-                                       if(entry.internal) {
-                                               // For roots names are not processed
-                                               dqs.forEachObjectCompiled(graph, entry.resource, entry, names);
+                               for(SeedSpec seed  : seeds) {
+                                       
+                                       if(status != null) {
+                                               ExtentStatus es = status.get(seed.resource);
+                                               if(ExtentStatus.EXCLUDED.equals(es)) continue;
+                                               if(ExtentStatus.EXTERNAL.equals(es)) continue;
+                                       }
+                                       
+                                       ConsistsOfProcessEntry entry = new ConsistsOfProcessEntry(null, seed.resource);
+                                       
+                                       dqs.forEachObjectCompiled(graph, seed.resource, entry, structure);
+                                       if(SeedSpecType.INTERNAL.equals(seed.specType)) {
+                                               // Process names only for internal seeds
+                                               dqs.forEachObjectCompiled(graph, seed.resource, entry, names);
                                        }
                                }
                        }