diff options
author | 2021-10-23 16:25:46 +0200 | |
---|---|---|
committer | 2021-10-23 16:25:46 +0200 | |
commit | 094a696ef7f36d15cb65987083ebd67171ffdb18 (patch) | |
tree | 0c0d4cb577ed9abb03efad2ee535a0107f9fa00c /store/src/main/java | |
parent | QueryableModel restoring with Replay and Reinitialization. (diff) | |
download | refinery-094a696ef7f36d15cb65987083ebd67171ffdb18.tar.gz refinery-094a696ef7f36d15cb65987083ebd67171ffdb18.tar.zst refinery-094a696ef7f36d15cb65987083ebd67171ffdb18.zip |
minor fixes
Diffstat (limited to 'store/src/main/java')
3 files changed, 6 insertions, 9 deletions
diff --git a/store/src/main/java/tools/refinery/store/query/QueriableModelStoreImpl.java b/store/src/main/java/tools/refinery/store/query/QueriableModelStoreImpl.java index 3902e013..6a340589 100644 --- a/store/src/main/java/tools/refinery/store/query/QueriableModelStoreImpl.java +++ b/store/src/main/java/tools/refinery/store/query/QueriableModelStoreImpl.java | |||
@@ -17,6 +17,7 @@ import tools.refinery.store.query.building.DNFPredicate; | |||
17 | import tools.refinery.store.query.building.PredicateAtom; | 17 | import tools.refinery.store.query.building.PredicateAtom; |
18 | import tools.refinery.store.query.building.RelationAtom; | 18 | import tools.refinery.store.query.building.RelationAtom; |
19 | import tools.refinery.store.query.internal.DNF2PQuery; | 19 | import tools.refinery.store.query.internal.DNF2PQuery; |
20 | import tools.refinery.store.query.internal.QueriableModelImpl; | ||
20 | import tools.refinery.store.query.internal.RawPatternMatcher; | 21 | import tools.refinery.store.query.internal.RawPatternMatcher; |
21 | import tools.refinery.store.query.view.RelationView; | 22 | import tools.refinery.store.query.view.RelationView; |
22 | 23 | ||
@@ -105,23 +106,21 @@ public class QueriableModelStoreImpl implements QueriableModelStore { | |||
105 | 106 | ||
106 | @Override | 107 | @Override |
107 | public QueriableModel createModel() { | 108 | public QueriableModel createModel() { |
108 | // TODO Auto-generated method stub | 109 | return new QueriableModelImpl(this, this.store.createModel(), predicates); |
109 | return null; | ||
110 | } | 110 | } |
111 | 111 | ||
112 | @Override | 112 | @Override |
113 | public QueriableModel createModel(long state) { | 113 | public QueriableModel createModel(long state) { |
114 | // TODO Auto-generated method stub | 114 | return new QueriableModelImpl(this, this.store.createModel(state), predicates); |
115 | return null; | ||
116 | } | 115 | } |
117 | 116 | ||
118 | @Override | 117 | @Override |
119 | public Set<Long> getStates() { | 118 | public synchronized Set<Long> getStates() { |
120 | return this.store.getStates(); | 119 | return this.store.getStates(); |
121 | } | 120 | } |
122 | 121 | ||
123 | @Override | 122 | @Override |
124 | public ModelDiffCursor getDiffCursor(long from, long to) { | 123 | public synchronized ModelDiffCursor getDiffCursor(long from, long to) { |
125 | return this.store.getDiffCursor(from, to); | 124 | return this.store.getDiffCursor(from, to); |
126 | } | 125 | } |
127 | } | 126 | } |
diff --git a/store/src/main/java/tools/refinery/store/query/internal/ModelUpdateListener.java b/store/src/main/java/tools/refinery/store/query/internal/ModelUpdateListener.java index 425ae8f7..c784cb3c 100644 --- a/store/src/main/java/tools/refinery/store/query/internal/ModelUpdateListener.java +++ b/store/src/main/java/tools/refinery/store/query/internal/ModelUpdateListener.java | |||
@@ -86,9 +86,6 @@ public class ModelUpdateListener { | |||
86 | typedBuffer.addChange(key, oldValue, newValue); | 86 | typedBuffer.addChange(key, oldValue, newValue); |
87 | } | 87 | } |
88 | } | 88 | } |
89 | } else { | ||
90 | throw new IllegalArgumentException( | ||
91 | "Relation " + relation.getName() + " is not in the scope of the update listener."); | ||
92 | } | 89 | } |
93 | } | 90 | } |
94 | 91 | ||
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 0f4d609f..f30b947a 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 | |||
@@ -174,6 +174,7 @@ public class QueriableModelImpl implements QueriableModel { | |||
174 | } | 174 | } |
175 | @Override | 175 | @Override |
176 | public void flushChanges() { | 176 | public void flushChanges() { |
177 | //this.initEngine(); | ||
177 | this.scope.flush(); | 178 | this.scope.flush(); |
178 | } | 179 | } |
179 | 180 | ||