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%2FExternalReadEntry.java;h=661076e8604bacd47504ed86607df88bca54eee8;hp=18d91dc0618643e092aa4d242f6a50545cbf6c6e;hb=782843a248c4f70d28e8146098f9a77977cc6b3c;hpb=0ae2b770234dfc3cbb18bd38f324125cf0faca07 diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/ExternalReadEntry.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/ExternalReadEntry.java index 18d91dc06..661076e86 100644 --- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/ExternalReadEntry.java +++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/ExternalReadEntry.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,21 +11,23 @@ *******************************************************************************/ package org.simantics.db.impl.query; -import java.util.ArrayList; import java.util.LinkedList; +import org.simantics.db.exception.DatabaseException; +import org.simantics.db.impl.DebugPolicy; import org.simantics.db.impl.graph.ReadGraphImpl; -import org.simantics.db.procedure.Procedure; +import org.simantics.db.procedure.AsyncProcedure; +import org.simantics.db.procedure.Listener; import org.simantics.db.request.ExternalRead; import org.simantics.db.request.RequestFlags; -final public class ExternalReadEntry extends CacheEntryBase { +final public class ExternalReadEntry extends CacheEntryBase> implements Listener { final LinkedList items = new LinkedList(); - -// public ArrayList> procs; protected ExternalRead request; + protected ReadGraphImpl graph; + protected boolean registered = false; @Override int makeHash() { @@ -45,87 +47,81 @@ final public class ExternalReadEntry extends CacheEntryBase { public void discard() { request.unregistered(); request = null; + graph = null; super.discard(); } + + @Override + public void setPending() { + //if(result != NO_RESULT) { + //new Exception("result = " + result).printStackTrace(); + //} + statusOrException = PENDING; + result = REQUIRES_COMPUTATION; + } - public ExternalReadEntry(ExternalRead request) { + public ExternalReadEntry(ExternalRead request, ReadGraphImpl graph) { assert request != null; this.request = request; + this.graph = graph; } - final public void queue(T item) { - synchronized(items) { - items.addLast(item); - // TODO: implement flags/logic in ExternalRead to state that all but the latest request result can be evaporated - // In some cases where data is produced really fast this might be necessary but currently this queueing will do. - } + @Override + public void except(Throwable t) { + + if(DebugPolicy.QUERY_STATE) System.out.println("[QUERY STATE]: excepted " + this); + if(statusOrException != DISCARDED) { + statusOrException = EXCEPTED; + result = t; + } else { + result = t; + } + + assert(isExcepted()); + } - final public void addOrSet(QueryProcessor processor, Object item) { - - try { - - assert(isPending()); - - ArrayList> p = null; - - synchronized(this) { - - setResult(item); - setReady(); -// p = procs; -// procs = null; - - } - -// if(p != null) -// for(Procedure proc : p) { -// proc.execute((T)item); -// } + @Override + public void setResult(Object result) { - } catch (Throwable t) { - t.printStackTrace(); - } + super.setResult(result); + assert(!(result instanceof Throwable)); + assert(!isExcepted()); } + @Override + public void setReady() { + super.setReady(); + } + @Override final public Query getQuery() { return new Query() { @Override - public void recompute(ReadGraphImpl graph, Object provider, CacheEntry entry) { - - final QueryProcessor qp = (QueryProcessor)provider; - synchronized(items) { - - if(entry.isExcepted()) { - - // Exception persists - - } else { - - // Update - if(!items.isEmpty()) { - setResult(items.removeFirst()); - } - // Reschedule - if(!items.isEmpty()) { - qp.updatePrimitive(request); - } - + public void recompute(ReadGraphImpl graph) { + + synchronized(items) { + + // Update + if(!items.isEmpty()) { setReady(); - - } - - } + setResult(items.removeFirst()); + } + // Reschedule + if(!items.isEmpty()) { + graph.processor.updatePrimitive(request); + } + + } } @Override public void removeEntry(QueryProcessor processor) { - processor.externalReadMap.remove(request); + processor.cache.remove(ExternalReadEntry.this); } @Override @@ -143,36 +139,29 @@ final public class ExternalReadEntry extends CacheEntryBase { } - public void performFromCache(Object procedure) { - - Procedure proc = (Procedure)procedure; + @Override + public String toString() { + if(request == null) return "DISCARDED ExternalRead " + System.identityHashCode(this); + else return request.toString() + " " + + System.identityHashCode(this); + } + + @Override + public Object performFromCache(ReadGraphImpl graph, AsyncProcedure procedure) { + + AsyncProcedure proc = (AsyncProcedure)procedure; if(isExcepted()) { - proc.exception((Throwable)getResult()); + proc.exception(graph, (Throwable)getResult()); } else { - proc.execute((T)getResult()); + proc.execute(graph, (T)getResult()); } - - } - - @Override - public String toString() { - if(request == null) return "DISCARDED ExternalRead " + System.identityHashCode(this); - else return request.toString() + " " + + System.identityHashCode(this); - } - - @Override - public void performFromCache(ReadGraphImpl graph, Object provider, Object procedure) { - performFromCache(procedure); - } - - @Override - public void setReady() { - super.setReady(); + + return getResult(); + } @Override @@ -180,4 +169,60 @@ final public class ExternalReadEntry extends CacheEntryBase { // Do nothing - the state is already set and cannot be recomputed on demand } + public Object compute(ReadGraphImpl graph, AsyncProcedure procedure) throws DatabaseException { + + try { + + ReadGraphImpl queryGraph = graph.withParent(this); + + if(!registered) { + request.register(graph, this); + registered = true; + } + + queryGraph.asyncBarrier.waitBarrier(request, graph); + + } catch (Throwable t) { + + except(t); + + } + + performFromCache(graph, procedure); + + return getResult(); + + } + + @Override + public void execute(T result) { + + if(this.result == REQUIRES_COMPUTATION) { + + setResult(result); + setReady(); + + } else { + + synchronized(items) { + items.addLast(result); + graph.processor.updatePrimitive(request); + // TODO: implement flags/logic in ExternalRead to state that all but the latest request result can be evaporated + // In some cases where data is produced really fast this might be necessary but currently this queueing will do. + } + + } + + } + + @Override + public void exception(Throwable t) { + except(t); + } + + @Override + public boolean isDisposed() { + return registered && (isDiscarded() || !graph.processor.isBound(this)); + } + }