X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.db.impl%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fimpl%2Fquery%2FURIToResource.java;h=ec7ebeed7fad0324035280af18dc69225307c1ac;hp=c466cb261cca975d10c16a70461eab15bb3f77b2;hb=0d9b90834ce56b292c00b1a39850ed842c3e4d42;hpb=e5db6157fd8722c946613d4e46d7aaf6bfa92609 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..ec7ebeed7 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2010 Association for Decentralized Information Management + * Copyright (c) 2007, 2018 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 @@ -11,248 +11,116 @@ *******************************************************************************/ 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 class URIToResource extends StringQuery> implements InternalProcedure { -// public ArrayList> procs = null; - - private URIToResource(final String id) { + URIToResource(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); + public final void removeEntry(QueryProcessor provider) { + provider.cache.remove(this); } - @Override - final public void removeEntry(QueryProcessor provider) { - provider.uriToResourceMap.remove(id); + public Object compute(ReadGraphImpl graph, final InternalProcedure procedure) throws DatabaseException { + computeForEach(graph, id, this, procedure); + return getResult(); } - 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>() { + static void computeForEach(ReadGraphImpl graph, String id, final URIToResource entry, final InternalProcedure procedure_) throws DatabaseException { - @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)); - - } + InternalProcedure procedure = entry != null ? entry : procedure_; - @Override - public void exception(ReadGraphImpl graph, Throwable t) { - except(t); - procedure.exception(graph, t); - } + if("http://".equals(id) || "http:/".equals(id)) { - }); + QueryProcessor processor = graph.processor; + procedure.execute(graph, processor.getRootLibrary()); - } + } else { - 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>() { + final String[] parts = URIStringUtils.splitURI(id); + if (parts != null) { - @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); + QueryCache.runnerURIToResource(graph, parts[0], entry, null, new InternalProcedure() { - } + @Override + public void execute(ReadGraphImpl graph, Integer parentId) throws DatabaseException { - @Override - public void exception(ReadGraphImpl graph, Throwable t) { - if(entry != null) entry.except(t); - procedure.exception(graph, t); - } + ObjectResourceIdMap map = QueryCache.resultChildMap(graph, parentId, entry, null); + assert(map != null); + int result = map.getId(URIStringUtils.unescape(parts[1])); + if (result == 0) { + ResourceNotFoundException e = new ResourceNotFoundException(id); + procedure.exception(graph, e); + } else { + procedure.execute(graph, result); + } + } - }); + @Override + public void exception(ReadGraphImpl graph, Throwable throwable) throws DatabaseException { + procedure.exception(graph, throwable); + } - } - - @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://", "")); + ResourceNotFoundException e = new ResourceNotFoundException(id); + procedure.exception(graph, e); } } - - } - final private static void computeForEach(ReadGraphImpl graph, String id, final URIToResource entry, final InternalProcedure procedure) { - - if("http://".equals(id) || "http:/".equals(id)) { - - QueryProcessor processor = graph.processor; - if(entry != null) entry.addOrSet(graph, processor, processor.getRootLibrary()); - procedure.execute(graph, processor.getRootLibrary()); + if(entry != null) entry.performFromCache(graph, procedure_); - } else { - - final String[] parts = URIStringUtils.splitURI(id); - if (parts != null) { - lookup(graph, entry, procedure, parts[0], parts[1]); - } else { - lookup(graph, entry, procedure, "http://", id.replaceFirst("http://", "")); - } - - } - } - - public void addOrSet(ReadGraphImpl graph, QueryProcessor provider, Integer result) { - assert(isPending()); + public void addOrSet(Integer result) { -// ArrayList> p = null; + assert(isPending()); synchronized(this) { - setResult(result); setReady(); -// p = procs; -// procs = null; - } -// if(p != null) -// for(InternalProcedure proc : p) proc.execute(graph, result); - } - + @Override public String toString() { return "URIToResource[" + id + "]"; } @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)getResult(); + + Integer result = (Integer)getResult(); + procedure.execute(graph, result); + return result; + } - + @Override - public void recompute(ReadGraphImpl graph, QueryProcessor provider) { - - final Semaphore s = new Semaphore(0); - - computeForEach(graph, provider, new InternalProcedure() { + public void recompute(ReadGraphImpl graph) throws DatabaseException { + + compute(graph, new InternalProcedure() { @Override public void execute(ReadGraphImpl graph, Integer result) { - s.release(); } - + @Override public void exception(ReadGraphImpl graph, Throwable t) { if(DebugException.DEBUG) new DebugException(t).printStackTrace(); @@ -260,11 +128,20 @@ public class URIToResource extends StringQuery> { } }); - - while(!s.tryAcquire()) { - provider.resume(graph); - } - + + } + + @Override + public void execute(ReadGraphImpl graph, Integer result) throws DatabaseException { + synchronized(this) { + setResult(result); + setReady(); + } } - + + @Override + public void exception(ReadGraphImpl graph, Throwable throwable) throws DatabaseException { + except(throwable); + } + }