Viatra-specific code moved inside to QueriableModel

4 files changed, 40 insertions, 23 deletions

diff --git a/store/src/main/java/tools/refinery/store/query/internal/DNF2PQuery.java b/store/src/main/java/tools/refinery/store/query/internal/DNF2PQuery.java
index f0ac0276..7558424b 100644
--- a/store/src/main/java/tools/refinery/store/query/internal/DNF2PQuery.java
+++ b/store/src/main/java/tools/refinery/store/query/internal/DNF2PQuery.java
@@ -8,7 +8,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.eclipse.viatra.query.runtime.api.GenericPatternMatcher;
 import org.eclipse.viatra.query.runtime.api.GenericQuerySpecification;
 import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
 import org.eclipse.viatra.query.runtime.api.scope.QueryScope;
@@ -27,7 +26,6 @@ import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
 import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
 
-import tools.refinery.store.query.RelationalScope;
 import tools.refinery.store.query.building.DNFAnd;
 import tools.refinery.store.query.building.DNFAtom;
 import tools.refinery.store.query.building.DNFPredicate;
diff --git a/store/src/main/java/tools/refinery/store/query/internal/QueriableModelImpl.java b/store/src/main/java/tools/refinery/store/query/internal/QueriableModelImpl.java
index 5b96ba74..414ef2c8 100644
--- a/store/src/main/java/tools/refinery/store/query/internal/QueriableModelImpl.java
+++ b/store/src/main/java/tools/refinery/store/query/internal/QueriableModelImpl.java
@@ -14,16 +14,18 @@ import org.eclipse.viatra.query.runtime.api.IQueryGroup;
 import tools.refinery.store.map.Cursor;
 import tools.refinery.store.model.Model;
 import tools.refinery.store.model.ModelDiffCursor;
+import tools.refinery.store.model.Tuple;
 import tools.refinery.store.model.representation.DataRepresentation;
+import tools.refinery.store.model.representation.Relation;
 import tools.refinery.store.query.QueriableModel;
 import tools.refinery.store.query.QueriableModelStore;
-import tools.refinery.store.query.RelationalScope;
 import tools.refinery.store.query.building.DNFPredicate;
 
 public class QueriableModelImpl implements QueriableModel {
         protected final QueriableModelStore store;
         protected final Model model;
-
+        
+        protected final RelationalScope scope;
         protected final AdvancedViatraQueryEngine engine;
         protected final Map<DNFPredicate, RawPatternMatcher> predicate2Matcher;
 
@@ -31,15 +33,11 @@ public class QueriableModelImpl implements QueriableModel {
                         Map<DNFPredicate, GenericQuerySpecification<RawPatternMatcher>> predicates2PQuery) {
                 this.store = store;
                 this.model = model;
-                this.engine = initEngine(store, model);
+                this.scope = new RelationalScope(model, store.getViews());
+                this.engine = AdvancedViatraQueryEngine.createUnmanagedEngine(scope);
                 this.predicate2Matcher = initMatchers(engine, predicates2PQuery);
         }
 
-        private AdvancedViatraQueryEngine initEngine(QueriableModelStore store, Model model) {
-                RelationalScope scope = new RelationalScope(model, store.getViews());
-                return AdvancedViatraQueryEngine.createUnmanagedEngine(scope);
-        }
-
         private Map<DNFPredicate, RawPatternMatcher> initMatchers(AdvancedViatraQueryEngine engine,
                         Map<DNFPredicate, GenericQuerySpecification<RawPatternMatcher>> predicates2pQuery) {
                 // 1. prepare group
@@ -75,16 +73,30 @@ public class QueriableModelImpl implements QueriableModel {
                 return model.getAll(representation);
         }
 
+        @SuppressWarnings("unchecked")
         @Override
         public <K, V> V put(DataRepresentation<K, V> representation, K key, V value) {
-                // TODO Auto-generated method stub
-                return null;
+                V oldValue = this.model.put(representation, key, value);
+                if(representation instanceof Relation<?> relation) {
+                        this.scope.processUpdate((Relation<V>)relation, (Tuple)key, oldValue, value);
+                }
+                return oldValue;
         }
 
         @Override
         public <K, V> void putAll(DataRepresentation<K, V> representation, Cursor<K, V> cursor) {
-                // TODO Auto-generated method stub
-
+                if(representation instanceof Relation<?>) {
+                        @SuppressWarnings("unchecked")
+                        Relation<V> relation = (Relation<V>) representation;
+                        while(cursor.move()) {
+                                Tuple key = (Tuple) cursor.getKey();
+                                V newValue = cursor.getValue();
+                                V oldValue = this.model.put(relation, key, newValue);
+                                this.scope.processUpdate(relation, key, oldValue, newValue);
+                        }
+                } else {
+                        this.model.putAll(representation, cursor);
+                }
         }
 
         @Override
@@ -155,8 +167,7 @@ public class QueriableModelImpl implements QueriableModel {
         }
         @Override
         public void flushChanges() {
-                // TODO Auto-generated method stub
-                
+                this.scope.flush();
         }
 
         @Override
diff --git a/store/src/main/java/tools/refinery/store/query/RelationalScope.java b/store/src/main/java/tools/refinery/store/query/internal/RelationalScope.java
index e37fdb95..e8d45356 100644
--- a/store/src/main/java/tools/refinery/store/query/RelationalScope.java
+++ b/store/src/main/java/tools/refinery/store/query/internal/RelationalScope.java
@@ -1,4 +1,4 @@
-package tools.refinery.store.query;
+package tools.refinery.store.query.internal;
 
 import java.util.Set;
 
@@ -9,8 +9,8 @@ import org.eclipse.viatra.query.runtime.api.scope.IIndexingErrorListener;
 import org.eclipse.viatra.query.runtime.api.scope.QueryScope;
 
 import tools.refinery.store.model.Model;
-import tools.refinery.store.query.internal.ModelUpdateListener;
-import tools.refinery.store.query.internal.RelationalEngineContext;
+import tools.refinery.store.model.Tuple;
+import tools.refinery.store.model.representation.Relation;
 import tools.refinery.store.query.view.RelationView;
 
 public class RelationalScope extends QueryScope{
@@ -23,10 +23,18 @@ public class RelationalScope extends QueryScope{
                 //this.changeListener = new 
         }
         
-//      public <D> void processUpdate(RelationView<D> relationView, Tuple key, D oldValue, D newValue) {
-//              updateListener.processChange(relationView, key, oldValue, newValue);
-//      }
+        public <D> void processUpdate(Relation<D> relation, Tuple key, D oldValue, D newValue) {
+                updateListener.addUpdate(relation, key, oldValue, newValue);
+        }
+        
+        public boolean hasChange() {
+                return updateListener.hasChange();
+        }
 
+        public void flush() {
+                updateListener.flush();
+        }
+        
         @Override
         protected IEngineContext createEngineContext(ViatraQueryEngine engine, IIndexingErrorListener errorListener,
                         Logger logger) {
diff --git a/store/src/test/java/tools/refinery/store/query/test/QueryTest.java b/store/src/test/java/tools/refinery/store/query/test/QueryTest.java
index beb50bf3..63714538 100644
--- a/store/src/test/java/tools/refinery/store/query/test/QueryTest.java
+++ b/store/src/test/java/tools/refinery/store/query/test/QueryTest.java
@@ -20,7 +20,6 @@ import tools.refinery.store.model.ModelStoreImpl;
 import tools.refinery.store.model.Tuple;
 import tools.refinery.store.model.representation.Relation;
 import tools.refinery.store.model.representation.TruthValue;
-import tools.refinery.store.query.RelationalScope;
 import tools.refinery.store.query.building.DNFAnd;
 import tools.refinery.store.query.building.DNFPredicate;
 import tools.refinery.store.query.building.EquivalenceAtom;
@@ -29,6 +28,7 @@ import tools.refinery.store.query.building.RelationAtom;
 import tools.refinery.store.query.building.Variable;
 import tools.refinery.store.query.internal.DNF2PQuery;
 import tools.refinery.store.query.internal.RawPatternMatcher;
+import tools.refinery.store.query.internal.RelationalScope;
 import tools.refinery.store.query.view.FilteredRelationView;
 import tools.refinery.store.query.view.KeyOnlyRelationView;
 import tools.refinery.store.query.view.RelationView;