import org.simantics.db.impl.procedure.ResultCallWrappedQueryProcedure4;
import org.simantics.db.impl.procedure.ResultCallWrappedSingleQueryProcedure4;
import org.simantics.db.impl.query.CacheEntry;
+import org.simantics.db.impl.query.QueryCache;
import org.simantics.db.impl.query.QueryProcessor;
import org.simantics.db.impl.query.QuerySupport;
import org.simantics.db.impl.query.TripleIntProcedure;
assert (request != null);
- return processor.query(this, request, parent, null, null);
+ return QueryCache.resultReadEntry(this, request, parent, null, null);
+
+ //return processor.query(this, request, parent, null, null);
// if (parent != null) {
//
ListenerBase listener = procedure != null ? getListenerBase(procedure) : null;
- return processor.query(this, request, parent, procedure, listener);
+ return QueryCache.resultReadEntry(this, request, parent, listener, procedure);
+
+// return processor.query(this, request, parent, procedure, listener);
// if (parent != null || listener != null) {
final ResultCallWrappedSingleQueryProcedure4<T> wrapper = new ResultCallWrappedSingleQueryProcedure4<T>(
procedure, request);
- processor.query(this, request, parent, wrapper, listener);
+ QueryCache.runnerAsyncReadEntry(this, request, parent, listener, wrapper);
+
+ //processor.query(this, request, parent, wrapper, listener);
return wrapper.getResult();
assert (request != null);
ListenerBase listener = getListenerBase(procedure);
+ assert(listener == null);
- final ResultCallWrappedSingleQueryProcedure4<T> wrapper = new ResultCallWrappedSingleQueryProcedure4<T>(
- procedure, request);
-
- processor.query(this, request, parent, wrapper, listener);
+// final ResultCallWrappedSingleQueryProcedure4<T> wrapper = new ResultCallWrappedSingleQueryProcedure4<T>(
+// procedure, request);
-// if (parent != null || listener != null || ((request.getFlags() & RequestFlags.SCHEDULE) > 0)) {
-//
-//
-// } else {
-//
-// try {
-//
-//// final ReadGraphImpl newGraph = newSync();
-// processor.tryQuery(this, request, procedure);
-//// newGraph.waitAsync(null);
-// waitAsyncProcedure(procedure);
-//
-// } catch (Throwable t) {
-// if(Development.DEVELOPMENT) {
-// if(Development.<Boolean>getProperty(DevelopmentKeys.WRITEGRAPH_EXCEPTION_STACKTRACES, Bindings.BOOLEAN)) {
-// t.printStackTrace();
-// }
-// }
-// procedure.exception(this, t);
-// waitAsyncProcedure(procedure);
-// }
-//
-// }
+ QueryCache.runnerAsyncReadEntry(this, request, parent, listener, procedure);
}
if (parent != null || listener != null) {
try {
- processor.query(this, request, parent, procedure,listener);
+ QueryCache.runnerReadEntry(this, request, parent, listener, procedure);
+ //processor.query(this, request, parent, procedure,listener);
} catch (DatabaseException e) {
Logger.defaultLogError(e);
// This throwable has already been transferred to procedure at this point - do nothing about it
if (parent != null || listener != null) {
try {
- processor.query(this, request, parent, procedure, listener);
+ QueryCache.runnerAsyncReadEntry(this, request, parent, listener, procedure);
+ //processor.query(this, request, parent, procedure, listener);
} catch (DatabaseException e) {
Logger.defaultLogError(e);
}