From: Antti Villberg <antti.villberg@semantum.fi>
Date: Wed, 21 Mar 2018 08:20:12 +0000 (+0200)
Subject: Merge branch 'db-threads' into private/db-threads
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=e3290cc52342e783a2617f3009fff8e6f3e54560;p=simantics%2Fplatform.git

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
---

e3290cc52342e783a2617f3009fff8e6f3e54560
diff --cc bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/AsyncMultiReadEntry.java
index fac6b011f,52965dd7c..a2a7aded1
--- a/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 a9726a75d,c6091eb26..2410dfad7
--- a/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 cb2df4eea,357d3d1d4..9437ffe37
--- a/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.procore/src/fi/vtt/simantics/procore/internal/QueryDebugImpl.java
index e3f738339,93b3e363d..392574090
--- a/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);
          }