private static final Logger LOGGER = LoggerFactory.getLogger(ReadEntry.class);
- protected Read<T> request;
+ protected Read<T> id;
public ReadEntry(Read<T> request) {
- this.request = request;
+ this.id = request;
}
@Override
int makeHash() {
- return request.hashCode();
+ return id.hashCode();
}
@Override
public Object getOriginalRequest() {
- return request;
+ return id;
}
@Override
try {
- T result = request.perform(graph);
+ T result = id.perform(graph);
setResult(result);
setReady();
@Override
public int type() {
- if (request instanceof ReadExt) {
- return ((ReadExt) request).getType();
+ if (id instanceof ReadExt) {
+ return ((ReadExt) id).getType();
} else {
return RequestFlags.INVALIDATE;
}
@Override
public String toString() {
- if (request == null)
+ if (id == null)
return "DISCARDED";
else
- return request.toString() + statusOrException;
+ return id.toString() + statusOrException;
}
};
}
public static <T> T computeForEach(ReadGraphImpl graph, Read<T> request, ReadEntry<T> entry,
- AsyncProcedure<T> procedure_) throws DatabaseException {
+ AsyncProcedure<T> procedure_, boolean needsToBlock) throws DatabaseException {
AsyncProcedure<T> procedure = entry != null ? entry : procedure_;
ReadGraphImpl queryGraph = graph.withParent(entry);
+ queryGraph.asyncBarrier.inc();
+ ReadGraphImpl executeGraph = graph.withParent(graph.parent);
+ executeGraph.asyncBarrier.inc();
+
try {
+ // This throws
T result = request.perform(queryGraph);
- if(procedure != null) procedure.execute(graph, result);
+
+ if(procedure != null) procedure.execute(executeGraph, result);
return (T)result;
} catch (DatabaseException e) {
- if(procedure != null) procedure.exception(graph, e);
+ if(procedure != null) procedure.exception(executeGraph, e);
throw e;
} catch (Throwable t) {
DatabaseException dbe = new DatabaseException(t);
- if(procedure != null) procedure.exception(graph, dbe);
+ if(procedure != null) procedure.exception(executeGraph, dbe);
throw dbe;
} finally {
- if (entry != null)
- entry.performFromCache(queryGraph, procedure_);
+ queryGraph.asyncBarrier.dec();
+
+ try {
+
+ if (entry != null) {
+ // This also throws so must dec barrier finally
+ entry.performFromCache(executeGraph, procedure_);
+ }
+
+ } finally {
+
+ executeGraph.asyncBarrier.dec();
+ if(needsToBlock)
+ executeGraph.asyncBarrier.waitBarrier(procedure, executeGraph);
+ }
+
+
}
}
@Override
public String toString() {
- if (request == null)
+ if (id == null)
return "DISCARDED";
else
- return request.toString() + " - " + statusOrException;
+ return id.toString() + " - " + statusOrException;
}
public Object get(ReadGraphImpl graph, AsyncProcedure<T> procedure) throws DatabaseException {
@Override
boolean isImmutable(ReadGraphImpl graph) throws DatabaseException {
- if (request instanceof ReadExt) {
- return ((ReadExt) request).isImmutable(graph);
+ if (id instanceof ReadExt) {
+ return ((ReadExt) id).isImmutable(graph);
}
return false;
}