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=838728b17c98169b8f937c09ae811ccdd3bff82e;hb=refs%2Fchanges%2F58%2F3758%2F1;hp=488545c5fec781c80876b9cf7035f8b0eed31c06;hpb=ab914ca281bc4cfb6f8b7a9a38956c71fbd66839;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 488545c5f..838728b17 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2010 Association for Decentralized Information Management + * Copyright (c) 2007, 2019 Association for Decentralized Information Management * in Industry THTH ry. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -17,7 +17,6 @@ import java.util.Collections; import java.util.List; import java.util.Set; -import org.simantics.databoard.Bindings; import org.simantics.db.ReadGraph; import org.simantics.db.Resource; import org.simantics.db.common.primitiverequest.Adapter; @@ -26,6 +25,7 @@ import org.simantics.db.common.request.ObjectsWithType; import org.simantics.db.common.request.TernaryRead; import org.simantics.db.exception.DatabaseException; import org.simantics.db.layer0.adapter.Instances; +import org.simantics.db.layer0.genericrelation.Dependencies; import org.simantics.db.layer0.genericrelation.IndexQueries; import org.simantics.db.layer0.util.Layer0Utils; import org.simantics.db.request.ReadExt; @@ -70,58 +70,65 @@ public class EntityInstances implements Instances { public List perform(ReadGraph graph) throws DatabaseException { Resource type = parameter2; - - Layer0 L0 = Layer0.getInstance(graph); - Layer0X L0X = Layer0X.getInstance(graph); - String typeName = graph.getRelatedValue(type, L0.HasName); - if (typeName.isEmpty()) + String filter = constructLuceneQuery(graph, type, parameter3); + if (filter == null) return Collections.emptyList(); @SuppressWarnings({ "unchecked", "rawtypes" }) - Function dependencyResources = graph.syncRequest(new Adapter(L0X.DependencyResources, Function.class), TransientCacheListener.instance()); - - StringBuilder filtersb = new StringBuilder(); - filtersb.append("Types:*").append( IndexQueries.escape( typeName, true ) ); - if (parameter3.length() > 0) - filtersb.append(" AND ").append( parameter3 ); - String filter = filtersb.toString(); + Function dependencyResources = graph.syncRequest(new Adapter(Layer0X.getInstance(graph).DependencyResources, Function.class), TransientCacheListener.instance()); if (TRACE_QUERIES) { System.out.println("EntityInstances.QueryIndex: finding " + filter + " from index " + graph.getPossibleURI(parameter)); //new Exception("EntityInstances: finding " + filter + " from index " + graph.getPossibleURI(parameter)).printStackTrace(); } - + @SuppressWarnings("unchecked") - List results = (List)dependencyResources.apply(graph, parameter, filter); + List results = (List)dependencyResources.apply(graph, parameter, filter); if (results == null || results.isEmpty()) return Collections.emptyList(); if (TRACE_QUERIES) System.out.println(" EntityInstances.QueryIndex: got " + results.size() + " results"); -// // TreeSet to keep the results in deterministic order. -// Set resultSet = new TreeSet(); -// for (Map entry : results) { -// Resource res = (Resource)entry.get("Resource"); -// if (res != null && !resultSet.contains(res)) -// resultSet.add(res); -// } + // Optimize single result case. + if (results.size() == 1) { + Resource singleResult = results.get(0); + List result = graph.isInstanceOf(singleResult, type) ? results : Collections.emptyList(); + if (TRACE_QUERIES) + System.out.println(" EntityInstances.QueryIndex: got " + results.size() + " unique type-matching results"); + return result; + } CollectionSupport coll = graph.getService(CollectionSupport.class); - List result = coll.createList(); - - for (Resource res : Layer0Utils.sortByCluster(graph, results)) { + List result = coll.createList(results.size()); + for (Resource res : Layer0Utils.sortByCluster(graph, results)) if (graph.isInstanceOf(res, type)) result.add(res); - } if (TRACE_QUERIES) System.out.println(" EntityInstances.QueryIndex: got " + results.size() + " unique type-matching results"); - + return result; + } + private String constructLuceneQuery(ReadGraph graph, Resource type, String filter) throws DatabaseException { + Layer0 L0 = Layer0.getInstance(graph); + StringBuilder sb = new StringBuilder(); + boolean emptyFilter = filter.isEmpty(); + if (emptyFilter || !type.equals(L0.Entity)) { + IndexQueries.appendResourceIdTerm(sb, Dependencies.FIELD_TYPE_RESOURCE, type); + } + if (!emptyFilter) { + if (sb.length() > 0) + sb.append(" AND "); + sb.append(filter); + } + if (sb.length() == 0) { + sb.append("*:*"); + } + return sb.toString(); } - + @Override public String toString() { return "QueryIndex " + parameter + " " + parameter2 + " " + parameter3; @@ -134,7 +141,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; } } @@ -174,15 +182,17 @@ public class EntityInstances implements Instances { CollectionSupport coll = graph.getService(CollectionSupport.class); THashSet visited = new THashSet<>(); - List rec = findRec(graph, index, filter, visited); + List rec_ = findRec(graph, index, filter, visited); + // We must not modify rec_! + List rec = rec_; for(Resource global : Layer0Utils.listGlobalOntologies(graph)) { if(!visited.add(global)) continue; List rs = graph.syncRequest(new QueryIndex(global, type, filter), TransientCacheListener.>instance()); - if(rec.isEmpty() && !rs.isEmpty()) { - // TODO: rec could be an immutable empty list - rec = new ArrayList(); + if(!rs.isEmpty()) { + if(rec == rec_) + rec = new ArrayList<>(rec); + rec.addAll(rs); } - rec.addAll(rs); } Collection result = coll.asSortedList(rec); return result; @@ -191,13 +201,7 @@ public class EntityInstances implements Instances { @Override public Collection findByName(ReadGraph graph, Resource model, String name) throws DatabaseException { - Layer0 L0 = Layer0.getInstance(graph); - CollectionSupport coll = graph.getService(CollectionSupport.class); - List 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)); } }