Fix handling of filters in KVIN and AAS query optimizers.

linkedfactory · Mar 5, 2024 · a00536f · a00536f
1 parent 886e2c7
commit a00536f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/...ry.core/src/main/java/io/github/linkedfactory/core/rdf4j/aas/query/AasFetchOptimizer.java b/...ry.core/src/main/java/io/github/linkedfactory/core/rdf4j/aas/query/AasFetchOptimizer.java
@@ -28,12 +28,15 @@ public void process(TupleExpr expr) throws RDF4JException {
     @Override
     public void meet(Filter node) throws RDF4JException {
         TupleExpr arg = node.getArg();
+        // TODO check if this condition is really required
         if (arg instanceof StatementPattern) {
             StatementPattern stmt = (StatementPattern) arg;
             Parameters params = scanner.getParameters(stmt.getObjectVar());
             if (params != null) {
                 node.setArg(new AasFetch(stmt, scanner.getParameters(stmt)));
             }
+        } else {
+            node.visitChildren(this);
         }
     }
 

diff --git a/....core/src/main/java/io/github/linkedfactory/core/rdf4j/kvin/query/KvinFetchOptimizer.java b/....core/src/main/java/io/github/linkedfactory/core/rdf4j/kvin/query/KvinFetchOptimizer.java
@@ -32,12 +32,15 @@ public void process(TupleExpr expr) throws RDF4JException {
     @Override
     public void meet(Filter node) throws RDF4JException {
         TupleExpr arg = node.getArg();
+        // TODO check if this condition is really required
         if (arg instanceof StatementPattern) {
             StatementPattern stmt = (StatementPattern) arg;
             Parameters params = scanner.getParameters(stmt.getObjectVar());
             if (params != null) {
                 node.setArg(new KvinFetch(stmt, scanner.getParameters(stmt)));
             }
+        } else {
+            node.visitChildren(this);
         }
     }