Merge "Multiple reader thread support for db client"

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

diff --git 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
index 710895cff44e086d709675252ded264885bb7035..d699ea825d9823cfb8c1f3454f13115ff4518455 100644 (file)
--- 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
@@ -1,86 +1,69 @@
-/*******************************************************************************\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.impl.graph.ReadGraphImpl;\r
-import org.simantics.db.request.RequestFlags;\r
-\r
-\r
-abstract public class BinaryQuery<Procedure> extends CacheEntryBase implements Query {\r
-\r
-       final public long id;\r
-\r
-       public BinaryQuery(final long r1, final long r2) {\r
-        assert(r1 != 0);\r
-        assert(r2 != 0);\r
-        id = id(r1,r2);\r
-        assert(id != 0);\r
-    }\r
-       \r
-       @Override\r
-       int makeHash() {\r
-               return r1() ^ r2();\r
-       }\r
-       \r
-    final public int r1() {\r
-        return (int)(id>>>32);\r
-    }\r
-    \r
-    final public int r2() {\r
-        return (int)id;\r
-    }\r
-    \r
-    final protected static long id(long r1, long r2) {\r
-        long result = (r1<<32) | (r2 & 0xffffffffL); \r
-        return result;\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
-        BinaryQuery<?> other = (BinaryQuery<?>)object;\r
-        return id == other.id;\r
-    }\r
-       \r
-    @Override\r
-    final public Query getQuery() {\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 void computeForEach(ReadGraphImpl graph, QueryProcessor provider, Procedure procedure, boolean store);\r
-    abstract public void performFromCache(ReadGraphImpl graph, QueryProcessor provider, Procedure procedure);\r
-    abstract public void putEntry(QueryProcessor provider);\r
-    abstract public void removeEntry(QueryProcessor provider);\r
-    abstract public BinaryQuery<Procedure> getEntry(QueryProcessor provider);\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.request.RequestFlags;
+
+public abstract class BinaryQuery<Procedure> extends CacheEntryBase<Procedure> implements Query {
+
+       final public long id;
+
+       public BinaryQuery(final long r1, final long r2) {
+        assert(r1 != 0);
+        assert(r2 != 0);
+        id = id(r1,r2);
+        assert(id != 0);
+    }
+       
+       @Override
+       int makeHash() {
+               return r1() ^ r2();
+       }
+       
+    final public int r1() {
+        return (int)(id>>>32);
+    }
+    
+    final public int r2() {
+        return (int)id;
+    }
+    
+    final protected static long id(long r1, long r2) {
+        long result = (r1<<32) | (r2 & 0xffffffffL); 
+        return result;
+    }
+    
+    @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;
+        BinaryQuery<?> other = (BinaryQuery<?>)object;
+        return id == other.id;
+    }
+       
+    @Override
+    final public Query getQuery() {
+        return this;
+    }
+
+    abstract public void removeEntry(QueryProcessor provider);
+
+}