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%2FCacheEntryBase.java;h=98e7f0d00554f1c3f351339d8aa4b891028966ae;hp=7c87b50e3acfa0e4630f3eb93ba8859c1eb13c90;hb=ae2e31aa5eb35410e5b2ce222d42421154f3fecc;hpb=9f0fd59be54719b1fe9322d8fd37e4950857308c

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/CacheEntryBase.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/CacheEntryBase.java
index 7c87b50e3..98e7f0d00 100644
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/CacheEntryBase.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/CacheEntryBase.java
@@ -12,12 +12,15 @@
 package org.simantics.db.impl.query;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Iterator;
 
+import org.simantics.databoard.Bindings;
+import org.simantics.db.DevelopmentKeys;
 import org.simantics.db.exception.DatabaseException;
-import org.simantics.db.impl.DebugPolicy;
 import org.simantics.db.impl.graph.ReadGraphImpl;
 import org.simantics.db.impl.procedure.InternalProcedure;
+import org.simantics.utils.Development;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -34,8 +37,8 @@ public abstract class CacheEntryBase<Procedure> extends CacheEntry<Procedure> {
 	
     final public static CacheEntryBase[] NONE = new CacheEntryBase[0];
 
-	static Object NO_RESULT = new Object();
-	static protected Object INVALID_RESULT = new Object();
+	static Object NO_RESULT = new Object() { public String toString() { return "NO_RESULT"; }};
+	static protected Object INVALID_RESULT = new Object() { public String toString() { return "INVALID_RESULT"; }};
 	
 //	// Just created
 //    static protected Object FRESH = new Object() { public String toString() { return "CREATED"; }};
@@ -74,6 +77,7 @@ public abstract class CacheEntryBase<Procedure> extends CacheEntry<Procedure> {
     }
 
     public void setReady() {
+        assert(result != NO_RESULT);
     	statusOrException = READY;
     }
 
@@ -84,7 +88,11 @@ public abstract class CacheEntryBase<Procedure> extends CacheEntry<Procedure> {
     
     @Override
     public void discard() {
-    	if(DebugPolicy.QUERY_STATE) System.out.println("[QUERY STATE]: discarded " + this);
+		if (Development.DEVELOPMENT) {
+			if(Development.<Boolean>getProperty(DevelopmentKeys.CACHE_ENTRY_STATE, Bindings.BOOLEAN)) {
+				System.err.println("[QUERY STATE]: discarded " + this);
+			}
+		}
     	statusOrException = DISCARDED;
     }
     
@@ -95,7 +103,11 @@ public abstract class CacheEntryBase<Procedure> extends CacheEntry<Procedure> {
     
     @Override
     final public void refute() {
-    	if(DebugPolicy.QUERY_STATE) System.out.println("[QUERY STATE]: refuted " + this);
+		if (Development.DEVELOPMENT) {
+			if(Development.<Boolean>getProperty(DevelopmentKeys.CACHE_ENTRY_STATE, Bindings.BOOLEAN)) {
+				System.err.println("[QUERY STATE]: refuted " + this);
+			}
+		}
     	statusOrException = REQUIRES_COMPUTATION;
     }
     
@@ -106,7 +118,11 @@ public abstract class CacheEntryBase<Procedure> extends CacheEntry<Procedure> {
 
     @Override
     public void except(Throwable throwable) {
-    	if(DebugPolicy.QUERY_STATE) System.out.println("[QUERY STATE]: excepted " + this);
+		if (Development.DEVELOPMENT) {
+			if(Development.<Boolean>getProperty(DevelopmentKeys.CACHE_ENTRY_STATE, Bindings.BOOLEAN)) {
+				System.err.println("[QUERY STATE]: excepted " + this);
+			}
+		}
     	if(statusOrException != DISCARDED) {
 	    	statusOrException = EXCEPTED;
 	    	result = throwable;
@@ -130,8 +146,9 @@ public abstract class CacheEntryBase<Procedure> extends CacheEntry<Procedure> {
     }
 
     @Override
-    public void setPending() {
-    	statusOrException = PENDING;
+    public void setPending(QuerySupport querySupport) {
+        statusOrException = PENDING;
+        clearResult(querySupport);
     }
     
     @Override
@@ -261,7 +278,31 @@ public abstract class CacheEntryBase<Procedure> extends CacheEntry<Procedure> {
     	}
         
     }
-    
+
+    @Override
+    void pruneParentSet() {
+        // First parent is discarded => look for more parents
+        if(p2OrParents instanceof QueryIdentityHashSet) {
+
+            QueryIdentityHashSet set = (QueryIdentityHashSet)p2OrParents;
+            set.removeDiscardedReally();
+            if(set.isEmpty()) p2OrParents = null;
+
+        } else if(p2OrParents instanceof CacheEntry) {
+
+            CacheEntry entry = (CacheEntry)p2OrParents;
+            if(entry.isDiscarded()) {
+                // Second entry is also discarded => all empty
+                p2OrParents = null;
+            }
+
+        } else {
+
+            // Nothing left
+
+        }
+    }
+
     @Override
     final public void removeParent(CacheEntry entry) {
        
@@ -323,7 +364,7 @@ public abstract class CacheEntryBase<Procedure> extends CacheEntry<Procedure> {
     }
     
     @Override
-	final public Iterable<CacheEntry<?>> getParents(QueryProcessor processor) {
+	final public Collection<CacheEntry<?>> getParents(QueryProcessor processor) {
 
 		ArrayList<CacheEntry<?>> result = new ArrayList<CacheEntry<?>>();
 		if(p1 != null) result.add(p1);
@@ -424,8 +465,7 @@ public abstract class CacheEntryBase<Procedure> extends CacheEntry<Procedure> {
     
     @Override
     void prepareRecompute(QuerySupport querySupport) {
-		setPending();
-		clearResult(querySupport);
+        setPending(querySupport);
     }
     
     @Override
@@ -456,5 +496,44 @@ public abstract class CacheEntryBase<Procedure> extends CacheEntry<Procedure> {
 
     public CacheEntryBase() {
     }
+    
+    public String classId() {
+        return getClass().getName();
+    }
+
+    public void serializeKey(QuerySerializer serializer) {
+        throw new IllegalStateException("Cannot serialize query key for " + this);
+    }
+    
+    public void serializeValue(QuerySerializer serializer) {
+        throw new IllegalStateException("Cannot serialize query value for " + this);
+    }
+    
+    public void serializeParents(QuerySerializer serializer) {
+        Collection<CacheEntry<?>> ps = getParents(serializer.getQueryProcessor());
+        int sizePos = serializer.writeUnknownSize();
+        int actual = 0;
+        for(CacheEntry<?> entry : ps) {
+            CacheEntryBase b = (CacheEntryBase)entry;
+            String cid = b.classId();
+            if(cid == null) 
+                continue;
+            serializer.serializeId(b.classId());
+            b.serializeKey(serializer);
+            actual++;
+        }
+        serializer.setUnknownSize(sizePos, actual);
+    }
+
+    public long cluster(QueryProcessor processor) {
+        throw new IllegalStateException("Cannot compute query cluster for " + this);
+    }
+
+    public void serialize(QuerySerializer serializer) {
+        serializer.serializeId(classId());
+        serializeKey(serializer);
+        serializeValue(serializer);
+        serializeParents(serializer);
+    }
 
 }