X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.db.impl%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fimpl%2Fquery%2FURIToResource.java;h=794bcc8edc3258fdee965278321c41f8e3789156;hb=68ce0966a57f5153b133c6283fdbae10f683b745;hp=c466cb261cca975d10c16a70461eab15bb3f77b2;hpb=c26409b1caf2f1e560d37c5befd11b442399c3fe;p=simantics%2Fplatform.git diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/URIToResource.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/URIToResource.java index c466cb261..794bcc8ed 100644 --- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/URIToResource.java +++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/URIToResource.java @@ -11,176 +11,32 @@ *******************************************************************************/ package org.simantics.db.impl.query; -import gnu.trove.map.hash.TObjectIntHashMap; - -import java.util.concurrent.Semaphore; - import org.simantics.databoard.util.URIStringUtils; +import org.simantics.db.ObjectResourceIdMap; import org.simantics.db.common.exception.DebugException; +import org.simantics.db.exception.DatabaseException; +import org.simantics.db.exception.ResourceNotFoundException; import org.simantics.db.impl.graph.ReadGraphImpl; import org.simantics.db.impl.procedure.InternalProcedure; -import org.simantics.db.procedure.ListenerBase; public class URIToResource extends StringQuery> { -// public ArrayList> procs = null; - - private URIToResource(final String id) { + URIToResource(final String id) { super(id); } - - final static URIToResource entry(final QueryProcessor provider, final String id) { - return (URIToResource)provider.uriToResourceMap.get(id); - } - - final static void runner(ReadGraphImpl graph, final String id, CacheEntry parent, final ListenerBase listener, final InternalProcedure procedure) { - - QueryProcessor processor = graph.processor; - - URIToResource entry = (URIToResource)processor.uriToResourceMap.get(id); - if(entry == null) { - - entry = new URIToResource(id); - entry.setPending(); - entry.clearResult(processor.querySupport); - entry.putEntry(processor); - - processor.performForEach(graph, entry, parent, listener, procedure); - - } else { - - if(entry.isPending()) { - synchronized(entry) { - if(entry.isPending()) { - throw new IllegalStateException(); -// if(entry.procs == null) entry.procs = new ArrayList>(); -// entry.procs.add(procedure); -// processor.registerDependencies(graph, entry, parent, listener, procedure, false); -// return; - } - } - } - - processor.performForEach(graph, entry, parent, listener, procedure); - - } - - } - - final public static void queryEach(ReadGraphImpl graph, final String id, final CacheEntry parent, final ListenerBase listener, final InternalProcedure procedure) { - - assert(id != null); - - if(graph.parent == null && listener == null) { - URIToResource.computeForEach(graph, id, null, procedure); - } else { - runner(graph, id, parent, listener, procedure); - } - - } - - @Override - public URIToResource getEntry(QueryProcessor provider) { - return provider.uriToResourceMap.get(id); - } - - @Override - public void putEntry(QueryProcessor provider) { - provider.uriToResourceMap.put(id, this); - } @Override final public void removeEntry(QueryProcessor provider) { - provider.uriToResourceMap.remove(id); - } - - private void lookup(ReadGraphImpl graph, final QueryProcessor processor, final InternalProcedure procedure, final String namespace, final String name) { - - NamespaceIndex.queryEach(graph, namespace, processor, this, null, new InternalProcedure>() { - - @Override - public void execute(ReadGraphImpl graph, TObjectIntHashMap index) { - - if(index != null) { - int result = index.get(name); - if(result != 0) { - addOrSet(graph, processor, result); - procedure.execute(graph, result); - return; - } - } - - addOrSet(graph, processor, new Integer(0)); - procedure.execute(graph, new Integer(0)); - - } - - @Override - public void exception(ReadGraphImpl graph, Throwable t) { - except(t); - procedure.exception(graph, t); - } - - }); - - } - - private static void lookup(ReadGraphImpl graph, final URIToResource entry, final InternalProcedure procedure, final String namespace, final String name) { - - NamespaceIndex.queryEach(graph, namespace, graph.processor, entry, null, new InternalProcedure>() { - - @Override - public void execute(ReadGraphImpl graph, TObjectIntHashMap index) { - - if(index != null) { - int result = index.get(name); - if(result != 0) { - if(entry != null) entry.addOrSet(graph, graph.processor, result); - procedure.execute(graph, result); - return; - } - } - - Integer zero = 0; - if(entry != null) entry.addOrSet(graph, graph.processor, zero); - procedure.execute(graph, zero); - - } - - @Override - public void exception(ReadGraphImpl graph, Throwable t) { - if(entry != null) entry.except(t); - procedure.exception(graph, t); - } - - }); - + provider.cache.remove(this); } - @Override - public void computeForEach(ReadGraphImpl graph, final QueryProcessor processor, final InternalProcedure procedure) { - -// new Exception("URIToResource " + id).printStackTrace(); - - if("http://".equals(id) || "http:/".equals(id)) { - - addOrSet(graph, processor, processor.getRootLibrary()); - procedure.execute(graph, processor.getRootLibrary()); - - } else { - - final String[] parts = URIStringUtils.splitURI(id); - if (parts != null) { - lookup(graph, processor, procedure, parts[0], parts[1]); - } else { - lookup(graph, processor, procedure, "http://", id.replaceFirst("http://", "")); - } - - } - + //@Override + public Object compute(ReadGraphImpl graph, final InternalProcedure procedure) throws DatabaseException { + computeForEach(graph, id, this, procedure); + return getResult(); } - final private static void computeForEach(ReadGraphImpl graph, String id, final URIToResource entry, final InternalProcedure procedure) { + static void computeForEach(ReadGraphImpl graph, String id, final URIToResource entry, final InternalProcedure procedure) throws DatabaseException { if("http://".equals(id) || "http:/".equals(id)) { @@ -192,9 +48,24 @@ public class URIToResource extends StringQuery> { final String[] parts = URIStringUtils.splitURI(id); if (parts != null) { - lookup(graph, entry, procedure, parts[0], parts[1]); + + Integer parentId = QueryCache.resultURIToResource(graph, parts[0], entry, null); + ObjectResourceIdMap map = QueryCache.resultChildMap(graph, parentId, entry, null); + if(map == null) { + procedure.execute(graph, 0); + if(entry != null) entry.addOrSet(graph, graph.processor, 0); + } else { + int result = map.getId(URIStringUtils.unescape(parts[1])); + if(entry != null) entry.addOrSet(graph, graph.processor, result); + procedure.execute(graph, result); + } + } else { - lookup(graph, entry, procedure, "http://", id.replaceFirst("http://", "")); + + ResourceNotFoundException e = new ResourceNotFoundException("No resource for URI: " + id); + if(entry != null) entry.except(e); + procedure.exception(graph, e); + } } @@ -205,19 +76,10 @@ public class URIToResource extends StringQuery> { assert(isPending()); -// ArrayList> p = null; - synchronized(this) { - setResult(result); setReady(); -// p = procs; -// procs = null; - } - -// if(p != null) -// for(InternalProcedure proc : p) proc.execute(graph, result); } @@ -227,30 +89,25 @@ public class URIToResource extends StringQuery> { } @Override - public void performFromCache(ReadGraphImpl graph, QueryProcessor provider, InternalProcedure procedure) { + public Object performFromCache(ReadGraphImpl graph, InternalProcedure procedure) throws DatabaseException { assert(isReady()); - if(handleException(graph, procedure)) return; - - if(isExcepted()) { - procedure.exception(graph, (Throwable)statusOrException); - } else { - procedure.execute(graph, (Integer)getResult()); - } + if(handleException(graph, procedure)) return (Throwable)statusOrException; + + Integer result = (Integer)getResult(); + procedure.execute(graph, result); + return result; } @Override - public void recompute(ReadGraphImpl graph, QueryProcessor provider) { + public void recompute(ReadGraphImpl graph) throws DatabaseException { - final Semaphore s = new Semaphore(0); - - computeForEach(graph, provider, new InternalProcedure() { + compute(graph, new InternalProcedure() { @Override public void execute(ReadGraphImpl graph, Integer result) { - s.release(); } @Override @@ -261,10 +118,6 @@ public class URIToResource extends StringQuery> { }); - while(!s.tryAcquire()) { - provider.resume(graph); - } - } }