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%2FTypeHierarchy.java;h=5c2be0c64e6dca1908b182ee340073de9405bfa3;hp=5c5d6cb093d1f3e3a90f10c30fb2560ff35b5bc5;hb=0d9b90834ce56b292c00b1a39850ed842c3e4d42;hpb=e5db6157fd8722c946613d4e46d7aaf6bfa92609 diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/TypeHierarchy.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/TypeHierarchy.java index 5c5d6cb09..5c2be0c64 100644 --- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/TypeHierarchy.java +++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/TypeHierarchy.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,86 +11,41 @@ *******************************************************************************/ package org.simantics.db.impl.query; -import gnu.trove.procedure.TIntProcedure; - -import java.util.concurrent.Semaphore; - +import org.simantics.db.exception.DatabaseException; import org.simantics.db.impl.graph.ReadGraphImpl; import org.simantics.db.impl.procedure.InternalProcedure; import org.simantics.db.procedure.ListenerBase; -final public class TypeHierarchy extends UnaryQuery> { - -// public ArrayList> procs = null; - - private TypeHierarchy(final int resource) { +import gnu.trove.procedure.TIntProcedure; + +public final class TypeHierarchy extends UnaryQueryP { + + TypeHierarchy(int resource) { super(resource); } - - final static void runner(ReadGraphImpl graph, final int r, final CacheEntry parent, final QueryProcessor provider, final ListenerBase listener, final InternalProcedure procedure) { - - TypeHierarchy entry = (TypeHierarchy)provider.typeHierarchyMap.get(r); - if(entry == null) { - - entry = new TypeHierarchy(r); - entry.setPending(); - entry.clearResult(provider.querySupport); - entry.putEntry(provider); - - provider.performForEach(graph, entry, parent, listener, procedure); - - } else { - - if(!entry.isReady()) { - synchronized(entry) { - if(!entry.isReady()) { - throw new IllegalStateException(); -// if(entry.procs == null) entry.procs = new ArrayList>(); -// entry.procs.add(procedure); -// provider.registerDependencies(graph, entry, parent, listener, procedure, false); -// return; - } - } - } - provider.performForEach(graph, entry, parent, listener, procedure); - } + public static final void queryEach(ReadGraphImpl graph, final int r, final QueryProcessor provider, final CacheEntry parent, final ListenerBase listener, final InternalProcedure procedure) throws DatabaseException { + QueryCache.runnerTypeHierarchy(graph, r, parent, listener, procedure); + } + + @Override + public final void removeEntry(QueryProcessor provider) { + provider.cache.remove(this); } - - final public static void queryEach(ReadGraphImpl graph, final int r, final QueryProcessor provider, final CacheEntry parent, final ListenerBase listener, final InternalProcedure procedure) { - - if(parent == null && listener == null) { - TypeHierarchy entry = (TypeHierarchy)provider.typeHierarchyMap.get(r); - if(entry != null && entry.isReady()) { - entry.performFromCache(graph, provider, procedure); - return; - } - } - - runner(graph, r, parent, provider, listener, procedure); - + + @Override + public void compute(final ReadGraphImpl graph, final InternalProcedure procedure) throws DatabaseException { + computeForEach(graph, id, this, procedure); } - - @Override - public UnaryQuery> getEntry(QueryProcessor provider) { - return provider.typeHierarchyMap.get(id); - } - - @Override - public void putEntry(QueryProcessor provider) { - provider.typeHierarchyMap.put(id, this); - } - - @Override - final public void removeEntry(QueryProcessor provider) { - provider.typeHierarchyMap.remove(id); - } - - @Override - public IntSet computeForEach(ReadGraphImpl graph, final QueryProcessor provider, final InternalProcedure procedure, boolean store) { - - final IntSet result = new IntSet(provider.querySupport, id); - + + public static IntSet computeForEach(ReadGraphImpl graph, int id, TypeHierarchy entry, final InternalProcedure procedure_) throws DatabaseException { + + InternalProcedure procedure = entry != null ? entry : procedure_; + + QueryProcessor processor = graph.processor; + + final IntSet result = new IntSet(processor.querySupport, id); + final TIntProcedure addToResult = new TIntProcedure() { @Override public boolean execute(int r) { @@ -98,102 +53,31 @@ final public class TypeHierarchy extends UnaryQuery> { return true; } }; - - SuperTypes.queryEach(graph, id, provider, TypeHierarchy.this, null, new InternalProcedure() { - - @Override - public void execute(ReadGraphImpl graph, IntSet types) { - types.forEach(addToResult); - addOrSet(graph, result, provider); - procedure.execute(graph, result); + QueryCache.runnerSuperTypes(graph, id, entry, null, new InternalProcedure() { - } + @Override + public void execute(ReadGraphImpl graph, IntSet types) throws DatabaseException { + types.forEach(addToResult); + procedure.execute(graph, result); + } - @Override - public void exception(ReadGraphImpl graph, Throwable t) { - procedure.exception(graph, t); - } + @Override + public void exception(ReadGraphImpl graph, Throwable t) throws DatabaseException { + procedure.exception(graph, t); + } }); - + + if(entry != null) entry.performFromCache(graph, procedure_); + return result; - - } - - @Override - public String toString() { - return "TypeHierarchy[" + id + "]"; - } - private void addOrSet(ReadGraphImpl graph, final IntSet value, QueryProcessor provider) { - - assert(!isReady()); - -// ArrayList> p = null; - - synchronized(this) { - - value.trim(); - setResult(value); - setReady(); -// p = procs; -// procs = null; - - } - -// if(p != null) { -// IntSet v = (IntSet)getResult(); -// if(v != null) { -// for(InternalProcedure proc : p) proc.execute(graph, v); -// } -// } - } @Override - public Object performFromCache(ReadGraphImpl graph, QueryProcessor provider, InternalProcedure procedure) { - - assert(isReady()); - - if(handleException(graph, procedure)) return null; - - IntSet result = getResult(); - - procedure.execute(graph, result); - - return result; - + public String toString() { + return "TypeHierarchy[" + id + "]"; } - - @Override - public void recompute(ReadGraphImpl graph, QueryProcessor provider) { - - final Semaphore s = new Semaphore(0); - - computeForEach(graph, provider, new InternalProcedure() { - - @Override - public void execute(ReadGraphImpl graph, IntSet result) { - s.release(); - } - @Override - public void exception(ReadGraphImpl graph, Throwable t) { - s.release(); - new Error("Error in recompute.", t).printStackTrace(); - } - - }, true); - - while(!s.tryAcquire()) { - provider.resume(graph); - } - - } - - @Override - boolean isImmutable(ReadGraphImpl graph) { - return graph.processor.isImmutable(id); - } }