X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.db.layer0%2Fsrc%2Forg%2Fsimantics%2Fdb%2Flayer0%2Fadapter%2Fimpl%2FEntityInstances.java;h=ffbec2f5e01ca88222926bb1c03848ed940d692a;hb=5f5747460a3330a1317395fedb60db33f6c00ab2;hp=07ddce7bd176e1fe2d8eca40819a0183ca3b64bf;hpb=550e12043381d305cb3248bfee1a39fa9b47e814;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/adapter/impl/EntityInstances.java b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/adapter/impl/EntityInstances.java
index 07ddce7bd..ffbec2f5e 100644
--- a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/adapter/impl/EntityInstances.java
+++ b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/adapter/impl/EntityInstances.java
@@ -119,13 +119,16 @@ public class EntityInstances implements Instances {
                 String typeName = graph.getPossibleRelatedValue(type, L0.HasName, Bindings.STRING);
                 if (typeName == null || typeName.isEmpty())
                     return null;
-                sb.append("Types:").append( IndexQueries.escape( typeName, true ) );
+                sb.append("Types:").append( IndexQueries.quoteTerm(typeName) );
             }
             if (!emptyFilter) {
                 if (sb.length() > 0)
                     sb.append(" AND ");
                 sb.append(filter);
             }
+            if (sb.length() == 0) {
+            	sb.append("*:*");
+            }
             return sb.toString();
         }
 
@@ -141,7 +144,8 @@ public class EntityInstances implements Instances {
 
 		@Override
 		public int getType() {
-			return RequestFlags.IMMEDIATE_UPDATE;
+			// This query should not be immediate update since it takes a long time!
+			return RequestFlags.INVALIDATE;
 		}
 
     }
@@ -181,15 +185,17 @@ public class EntityInstances implements Instances {
     	CollectionSupport coll = graph.getService(CollectionSupport.class);
     	
     	THashSet<Resource> visited = new THashSet<>();
-    	List<Resource> rec = findRec(graph, index, filter, visited);
+    	List<Resource> rec_ = findRec(graph, index, filter, visited);
+    	// We must not modify rec_!
+    	List<Resource> rec = rec_;
     	for(Resource global : Layer0Utils.listGlobalOntologies(graph)) {
         	if(!visited.add(global)) continue;
     		List<Resource> rs = graph.syncRequest(new QueryIndex(global, type, filter), TransientCacheListener.<List<Resource>>instance());
-    		if(rec.isEmpty() && !rs.isEmpty()) {
-    			// TODO: rec could be an immutable empty list
-    			rec = new ArrayList<Resource>();
+    		if(!rs.isEmpty()) {
+    		    if(rec == rec_)
+    		        rec = new ArrayList<>(rec);
+                rec.addAll(rs);
     		}
-    		rec.addAll(rs);
     	}
     	Collection<Resource> result = coll.asSortedList(rec);
     	return result; 
@@ -198,13 +204,7 @@ public class EntityInstances implements Instances {
     @Override
     public Collection<Resource> findByName(ReadGraph graph, Resource model,
             String name) throws DatabaseException {
-        Layer0 L0 = Layer0.getInstance(graph);
-    	CollectionSupport coll = graph.getService(CollectionSupport.class);
-        List<Resource> results = coll.createList();
-        for(Resource match : find(graph, model, name)) {
-            if(name.equals(graph.getPossibleRelatedValue(match, L0.HasName, Bindings.STRING))) results.add(match);
-        }
-        return results;
+        return find(graph, model, IndexQueries.quoteTerm(name));
     }
 
 }