Merge branch 'db-threads' into private/db-threads

refs #6961

Conflicts:
	bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/AsyncReadEntry.java

Change-Id: Ia1c14d196e46b74d4d5bc542b966d049a14345b8

diff --cc bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/AssertedPredicates.java
Simple merge

diff --cc bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/AssertedStatements.java
Simple merge

diff --cc bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/AsyncMultiReadEntry.java
index fac6b011f23d2137e14755430efd88fa1365cc1e,52965dd7cf127637140958bba7320cfe7c800f45..a2a7aded168da11f23e65011de56fe42194cf8b6
--- 1/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/AsyncMultiReadEntry.java
--- 2/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/AsyncMultiReadEntry.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/AsyncMultiReadEntry.java
@@@ -174,9 -173,8 +174,9 @@@ final public class AsyncMultiReadEntry<
          
      }
  
 +      @SuppressWarnings("unchecked")
        @Override
-       public void performFromCache(ReadGraphImpl graph, Object provider, Object procedure) {
+       public Object performFromCache(ReadGraphImpl graph, Object provider, Object procedure) {
                
                final AsyncMultiProcedure<T> proc = (AsyncMultiProcedure<T>)procedure;
  

diff --cc bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/AsyncReadEntry.java
index a9726a75d6ac4eb5df323625ffd19da9369bcb9b,c6091eb268c2268ef9413c4ddf70caefb0a807b8..2410dfad7cf3b7c1e1c4bd26eca52e53a45ffd6a
--- 1/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/AsyncReadEntry.java
--- 2/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/AsyncReadEntry.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/AsyncReadEntry.java
@@@ -145,8 -147,7 +145,12 @@@ final public class AsyncReadEntry<T> ex
          
      }
  
++<<<<<<< HEAD
 +      @SuppressWarnings("unchecked")
 +      public void performFromCache(ReadGraphImpl graph, Object provider, Object procedure) {
++=======
+       public Object performFromCache(ReadGraphImpl graph, Object provider, Object procedure) {
++>>>>>>> refs/heads/db-threads
                
          AsyncProcedure<T> proc = (AsyncProcedure<T>)procedure;
  

diff --cc bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/BinaryQuery.java
index cb2df4eea79b5f25d0e0ffb63912c5e63d7c07f7,357d3d1d450406cc800580a3bd5f28c6602c74b5..9437ffe379f6eda5be21ab5410e46566442b50d0
--- 1/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/BinaryQuery.java
--- 2/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/BinaryQuery.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/BinaryQuery.java
@@@ -71,10 -71,9 +71,10 @@@ abstract public class BinaryQuery<Proce
          recompute(graph, (QueryProcessor)provider);
      }
      
 +    @SuppressWarnings("unchecked")
      @Override
-     public void performFromCache(ReadGraphImpl graph, Object provider, Object procedure) {
-         performFromCache(graph, (QueryProcessor)provider, (Procedure)procedure);
+     public Object performFromCache(ReadGraphImpl graph, Object provider, Object procedure) {
+         return performFromCache(graph, (QueryProcessor)provider, (Procedure)procedure);
      }
  
      abstract public void recompute(ReadGraphImpl graph, QueryProcessor provider);

diff --cc bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/CacheEntryBase.java
Simple merge

diff --cc bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/QueryDebugImpl.java
index e3f73833941dcc7b7d9835c9bfd9e9079da20885,93b3e363de22ae8be1da411703015a0f7c9ecc72..3925740900f5902e4e7849d371d333945dff52aa
--- 1/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/QueryDebugImpl.java
--- 2/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/QueryDebugImpl.java
+++ b/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/QueryDebugImpl.java
@@@ -20,9 -20,9 +20,9 @@@ public class QueryDebugImpl implements 
        }
  
      @Override
 -    public Set<CacheEntry> getParents(AsyncRead request) {
 +    public Set<CacheEntry> getParents(AsyncRead<?> request) {
          HashSet<CacheEntry> result = new HashSet<CacheEntry>();
-         CacheEntryBase entry = session.queryProvider2.asyncReadMap.get(request);
+         CacheEntryBase entry = session.queryProvider2.cache.asyncReadMap.get(request);
          if(entry != null) {
              for(CacheEntry parent : entry.getParents(session.queryProvider2)) result.add(parent);
          }
@@@ -30,9 -30,9 +30,9 @@@
      }
  
      @Override
 -    public Set<CacheEntry> getParents(AsyncMultiRead request) {
 +    public Set<CacheEntry> getParents(AsyncMultiRead<?> request) {
          HashSet<CacheEntry> result = new HashSet<CacheEntry>();
-         CacheEntryBase entry = session.queryProvider2.asyncMultiReadMap.get(request);
+         CacheEntryBase entry = session.queryProvider2.cache.asyncMultiReadMap.get(request);
          if(entry != null) {
              for(CacheEntry parent : entry.getParents(session.queryProvider2)) result.add(parent);
          }
@@@ -40,9 -40,9 +40,9 @@@
      }
  
      @Override
 -    public Set<CacheEntry> getParents(Read request) {
 +    public Set<CacheEntry> getParents(Read<?> request) {
          HashSet<CacheEntry> result = new HashSet<CacheEntry>();
-         CacheEntryBase entry = session.queryProvider2.readMap.get(request);
+         CacheEntryBase entry = session.queryProvider2.cache.readMap.get(request);
          if(entry != null) {
              for(CacheEntry parent : entry.getParents(session.queryProvider2)) result.add(parent);
          }
@@@ -50,9 -50,9 +50,9 @@@
      }
  
      @Override
 -    public Set<CacheEntry> getParents(MultiRead request) {
 +    public Set<CacheEntry> getParents(MultiRead<?> request) {
          HashSet<CacheEntry> result = new HashSet<CacheEntry>();
-         CacheEntryBase entry = session.queryProvider2.multiReadMap.get(request);
+         CacheEntryBase entry = session.queryProvider2.cache.multiReadMap.get(request);
          if(entry != null) {
              for(CacheEntry parent : entry.getParents(session.queryProvider2)) result.add(parent);
          }