Added new field TypeId to dependency index for exact type searching

[simantics/platform.git] / bundles / org.simantics.db.indexing / src / org / simantics / db / indexing / IndexUtils.java

diff --git a/bundles/org.simantics.db.indexing/src/org/simantics/db/indexing/IndexUtils.java b/bundles/org.simantics.db.indexing/src/org/simantics/db/indexing/IndexUtils.java
index 26a6e68ae9f9378dd4b7a429c7ac2ccdbe317684..760acd68c465578b269cdf12e164dafbb65a2516 100644 (file)
--- a/bundles/org.simantics.db.indexing/src/org/simantics/db/indexing/IndexUtils.java
+++ b/bundles/org.simantics.db.indexing/src/org/simantics/db/indexing/IndexUtils.java
@@ -91,7 +91,7 @@ public class IndexUtils {
     public static Collection<Resource> findByName(ReadGraph graph, Resource model, String name) throws DatabaseException {
         Layer0 L0 = Layer0.getInstance(graph);
         HashSet<Resource> results = new HashSet<Resource>();
-        
+
         String search = IndexQueries.quoteTerm(Dependencies.FIELD_NAME, name);
 
         for(Resource resource : findResources(graph, model, search)) {
@@ -101,29 +101,21 @@ public class IndexUtils {
     }
 
     public static Collection<Resource> findByType(ReadGraph graph, Resource model, Resource type) throws DatabaseException {
-       
-        HashSet<Resource> results = new HashSet<Resource>();
-        Layer0 L0 = Layer0.getInstance(graph);
-        String typeName = graph.getRelatedValue(type, L0.HasName, Bindings.STRING);
-        String search = IndexQueries.quoteTerm(Dependencies.FIELD_TYPES, typeName);
+        HashSet<Resource> results = new HashSet<>();
+        String search = IndexQueries.resourceIdTerm(Dependencies.FIELD_TYPE_RESOURCE, type);
 
         for(Resource resource : findResources(graph, model, search)) {
-               if(graph.isInstanceOf(resource, type)) results.add(resource);
+            if(graph.isInstanceOf(resource, type)) results.add(resource);
         }
         return results;
     }
 
     public static Collection<Resource> findByTypeAndName(ReadGraph graph, Resource model, Resource type, String name) throws DatabaseException {
-       
-        Layer0 L0 = Layer0.getInstance(graph);
-        
         HashSet<Resource> results = new HashSet<Resource>();
-        String typeName = graph.getRelatedValue(type, L0.HasName, Bindings.STRING);
-        
-        String search = IndexQueries.and(IndexQueries.quoteTerm(Dependencies.FIELD_TYPES, typeName), IndexQueries.quoteTerm(Dependencies.FIELD_NAME, name));
+        String search = IndexQueries.and(IndexQueries.resourceIdTerm(Dependencies.FIELD_TYPE_RESOURCE, type), IndexQueries.quoteTerm(Dependencies.FIELD_NAME, name));
 
         for(Resource resource : findResources(graph, model, search)) {
-               if(graph.isInstanceOf(resource, type)) results.add(resource);
+            if(graph.isInstanceOf(resource, type)) results.add(resource);
         }
         return results;
     }