Fixed multiple issues causing dangling references to discarded queries

[simantics/platform.git] / bundles / org.simantics.db.impl / src / org / simantics / db / impl / query / UnaryQuery.java

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/UnaryQuery.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/UnaryQuery.java
index 4f95fdebc52add63e77efefd8b8ad3b9413cdc22..fe24846aa318539da2524f19a0c50b4a2e382d5c 100644 (file)
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/UnaryQuery.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/UnaryQuery.java
@@ -1,86 +1,83 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2010 Association for Decentralized Information Management\r
- * in Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.db.impl.query;\r
-\r
-import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.db.impl.graph.ReadGraphImpl;\r
-import org.simantics.db.request.RequestFlags;\r
-\r
-abstract public class UnaryQuery<Procedure> extends CacheEntryBase implements Query {\r
-       \r
-    final public int id;\r
-\r
-    public UnaryQuery(int r) {\r
-        assert(r != 0);\r
-       this.id = r;\r
-    }\r
-    \r
-    @Override\r
-    int makeHash() {\r
-       return id;\r
-    }\r
-    \r
-    @Override\r
-    public int type() {\r
-        return RequestFlags.INVALIDATE;\r
-    }\r
-    \r
-    @Override\r
-    final public boolean equals(Object object) {\r
-        if (this == object)\r
-            return true;\r
-        else if (object == null)\r
-            return false;\r
-        else if (getClass() != object.getClass())\r
-            return false;\r
-        UnaryQuery<?> other = (UnaryQuery<?>)object;\r
-        return id == other.id;\r
-    }\r
-    \r
-    @Override\r
-    final public Query getQuery() {\r
-        assert(!isDiscarded());\r
-        return this;\r
-    }\r
-    \r
-    @Override\r
-    public void recompute(ReadGraphImpl graph, Object provider, CacheEntry entry) {\r
-        recompute(graph, (QueryProcessor)provider);\r
-    }\r
-    \r
-    @Override\r
-    public void performFromCache(ReadGraphImpl graph, Object provider, Object procedure) {\r
-        performFromCache(graph, (QueryProcessor)provider, (Procedure)procedure);\r
-    }\r
-    \r
-    abstract public void recompute(ReadGraphImpl graph, QueryProcessor provider);\r
-    abstract public Object computeForEach(ReadGraphImpl graph, QueryProcessor provider, Procedure procedure, boolean store);\r
-    abstract public Object performFromCache(ReadGraphImpl graph, QueryProcessor provider, Procedure procedure);\r
-    abstract public void putEntry(QueryProcessor provider);\r
-    abstract public void removeEntry(QueryProcessor provider);\r
-    abstract public UnaryQuery<Procedure> getEntry(QueryProcessor provider);\r
-       \r
-    public Object get(ReadGraphImpl graph, QueryProcessor processor, Object procedure) throws Throwable {\r
-        if(procedure != null) {\r
-            performFromCache(graph, processor, procedure);\r
-        } else {\r
-            checkAndThrow();\r
-        }\r
-        return getResult();\r
-    }\r
-    \r
-    @Override\r
-    boolean isImmutable(ReadGraphImpl graph) throws DatabaseException {\r
-               return graph.processor.isImmutable(id);\r
-    }\r
-    \r
-}\r
+/*******************************************************************************
+ * Copyright (c) 2007, 2018 Association for Decentralized Information Management
+ * in Industry THTH ry.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.db.impl.query;
+
+import org.simantics.db.exception.DatabaseException;
+import org.simantics.db.impl.graph.ReadGraphImpl;
+import org.simantics.db.request.RequestFlags;
+
+import gnu.trove.list.array.TByteArrayList;
+
+public abstract class UnaryQuery<Procedure> extends CacheEntryBase<Procedure> implements Query {
+
+    final public int id;
+
+    public UnaryQuery(int r) {
+        assert(r != 0);
+       this.id = r;
+    }
+    
+    @Override
+    int makeHash() {
+       return id;
+    }
+    
+    @Override
+    public int type() {
+        return RequestFlags.INVALIDATE;
+    }
+    
+    @Override
+    final public boolean equals(Object object) {
+        if (this == object)
+            return true;
+        else if (object == null)
+            return false;
+        else if (getClass() != object.getClass())
+            return false;
+        UnaryQuery<?> other = (UnaryQuery<?>)object;
+        return id == other.id;
+    }
+    
+    @Override
+    final public Query getQuery() {
+        assert(!isDiscarded());
+        return this;
+    }
+    
+    abstract public void removeEntry(QueryProcessor provider);
+       
+    public Object get(ReadGraphImpl graph, Procedure procedure) throws Throwable {
+        if(procedure != null) {
+            performFromCache(graph, procedure);
+        } else {
+            checkAndThrow();
+        }
+        return getResult();
+    }
+    
+    @Override
+    boolean isImmutable(ReadGraphImpl graph) throws DatabaseException {
+        return graph.processor.isImmutable(id);
+    }
+    
+    @Override
+    public long cluster(QueryProcessor processor) {
+        return processor.cluster(id);
+    }
+    
+    @Override
+    public void serializeKey(QuerySerializer serializer) {
+        serializer.addResource(id);
+    }
+    
+}