feat: query rewriters for Viatra

10 files changed, 41 insertions, 8 deletions

diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/ModelQueryBuilder.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/ModelQueryBuilder.java
index c62a95b5..332e6381 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/ModelQueryBuilder.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/ModelQueryBuilder.java
@@ -8,6 +8,7 @@ package tools.refinery.store.query;
 import tools.refinery.store.adapter.ModelAdapterBuilder;
 import tools.refinery.store.model.ModelStore;
 import tools.refinery.store.query.dnf.AnyQuery;
+import tools.refinery.store.query.rewriter.DnfRewriter;
 
 import java.util.Collection;
 import java.util.List;
@@ -25,6 +26,8 @@ public interface ModelQueryBuilder extends ModelAdapterBuilder {
 
         ModelQueryBuilder query(AnyQuery query);
 
+        ModelQueryBuilder rewriter(DnfRewriter rewriter);
+
         @Override
         ModelQueryStoreAdapter build(ModelStore store);
 }
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/ModelQueryStoreAdapter.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/ModelQueryStoreAdapter.java
index f0a950a6..8b67c5c1 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/ModelQueryStoreAdapter.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/ModelQueryStoreAdapter.java
@@ -8,6 +8,7 @@ package tools.refinery.store.query;
 import tools.refinery.store.adapter.ModelStoreAdapter;
 import tools.refinery.store.model.Model;
 import tools.refinery.store.query.dnf.AnyQuery;
+import tools.refinery.store.query.dnf.Query;
 import tools.refinery.store.query.view.AnySymbolView;
 
 import java.util.Collection;
@@ -17,6 +18,12 @@ public interface ModelQueryStoreAdapter extends ModelStoreAdapter {
 
         Collection<AnyQuery> getQueries();
 
+        default AnyQuery getCanonicalQuery(AnyQuery query) {
+                return getCanonicalQuery((Query<?>) query);
+        }
+
+        <T> Query<T> getCanonicalQuery(Query<T> query);
+
         @Override
         ModelQueryAdapter createModelAdapter(Model model);
 }
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/Query.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/Query.java
index 55f748da..83fe6ccd 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/Query.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/Query.java
@@ -44,6 +44,9 @@ public abstract sealed class Query<T> implements AnyQuery permits FunctionalQuer
         public abstract T defaultValue();
 
         public Query<T> withDnf(Dnf newDnf) {
+                if (dnf.equals(newDnf)) {
+                        return this;
+                }
                 int arity = dnf.arity();
                 if (newDnf.arity() != arity) {
                         throw new IllegalArgumentException("Arity of %s and %s do not match".formatted(dnf, newDnf));
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/AbstractResultSet.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/AbstractResultSet.java
index a710c64d..dcfe6cc5 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/AbstractResultSet.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/AbstractResultSet.java
@@ -28,7 +28,7 @@ public abstract class AbstractResultSet<T> implements ResultSet<T> {
         }
 
         @Override
-        public Query<T> getQuery() {
+        public Query<T> getCanonicalQuery() {
                 return query;
         }
 
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/AnyResultSet.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/AnyResultSet.java
index 02809477..5b75b103 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/AnyResultSet.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/AnyResultSet.java
@@ -11,7 +11,7 @@ import tools.refinery.store.query.dnf.AnyQuery;
 public sealed interface AnyResultSet permits ResultSet {
         ModelQueryAdapter getAdapter();
 
-        AnyQuery getQuery();
+        AnyQuery getCanonicalQuery();
 
         int size();
 }
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/EmptyResultSet.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/EmptyResultSet.java
index 2795a44b..991b1e32 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/EmptyResultSet.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/EmptyResultSet.java
@@ -18,7 +18,7 @@ public record EmptyResultSet<T>(ModelQueryAdapter adapter, Query<T> query) imple
         }
 
         @Override
-        public Query<T> getQuery() {
+        public Query<T> getCanonicalQuery() {
                 return query;
         }
 
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/OrderedResultSet.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/OrderedResultSet.java
index 39006d65..df12b967 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/OrderedResultSet.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/OrderedResultSet.java
@@ -17,7 +17,7 @@ public class OrderedResultSet<T> implements AutoCloseable, ResultSet<T> {
         private final ResultSet<T> resultSet;
         private final OrderStatisticTree<Tuple> tree = new OrderStatisticTree<>();
         private final ResultSetListener<T> listener = (key, fromValue, toValue) -> {
-                var defaultValue = getQuery().defaultValue();
+                var defaultValue = getCanonicalQuery().defaultValue();
                 if (Objects.equals(defaultValue, toValue)) {
                         tree.remove(key);
                 } else {
@@ -45,8 +45,8 @@ public class OrderedResultSet<T> implements AutoCloseable, ResultSet<T> {
         }
 
         @Override
-        public Query<T> getQuery() {
-                return resultSet.getQuery();
+        public Query<T> getCanonicalQuery() {
+                return resultSet.getCanonicalQuery();
         }
 
         @Override
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/ResultSet.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/ResultSet.java
index 33d1ea95..a6e99784 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/ResultSet.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/ResultSet.java
@@ -10,7 +10,7 @@ import tools.refinery.store.query.dnf.Query;
 import tools.refinery.store.tuple.Tuple;
 
 public non-sealed interface ResultSet<T> extends AnyResultSet {
-        Query<T> getQuery();
+        Query<T> getCanonicalQuery();
 
         T get(Tuple parameters);
 
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/rewriter/ClauseInputParameterResolver.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/rewriter/ClauseInputParameterResolver.java
index bdd07f19..aa06a05a 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/rewriter/ClauseInputParameterResolver.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/rewriter/ClauseInputParameterResolver.java
@@ -53,7 +53,7 @@ class ClauseInputParameterResolver {
                 }
                 boolean hasInputParameter = hasInputParameter(targetDnf);
                 if (!hasInputParameter) {
-                        targetDnf = rewriter.doRewrite(targetDnf);
+                        targetDnf = rewriter.rewrite(targetDnf);
                 }
                 if (inlinePositiveClause(abstractCallLiteral, targetDnf)) {
                         return;
diff --git a/subprojects/store-query/src/test/java/tools/refinery/store/query/rewriter/InputParameterResolverTest.java b/subprojects/store-query/src/test/java/tools/refinery/store/query/rewriter/InputParameterResolverTest.java
index ddb2a069..ef0077e4 100644
--- a/subprojects/store-query/src/test/java/tools/refinery/store/query/rewriter/InputParameterResolverTest.java
+++ b/subprojects/store-query/src/test/java/tools/refinery/store/query/rewriter/InputParameterResolverTest.java
@@ -18,6 +18,7 @@ import tools.refinery.store.representation.Symbol;
 import java.util.List;
 
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
 import static tools.refinery.store.query.literal.Literals.not;
 import static tools.refinery.store.query.tests.QueryMatchers.structurallyEqualTo;
 
@@ -205,4 +206,23 @@ class InputParameterResolverTest {
 
                 assertThat(actual.getDnf(), structurallyEqualTo(expected.getDnf()));
         }
+
+        @Test
+        void identityWhenNoWorkToDoTest() {
+                var dnf = Dnf.of("SubQuery", builder -> {
+                        var x = builder.parameter("x", ParameterDirection.OUT);
+                        builder.clause(
+                                        personView.call(x),
+                                        not(friendView.call(x, Variable.of()))
+                        );
+                });
+                var query = Query.of("Actual", (builder, p1) -> builder.clause(
+                                personView.call(p1),
+                                not(dnf.call(p1))
+                ));
+
+                var actual = sut.rewrite(query);
+
+                assertThat(actual, is(query));
+        }
 }