eclipse-rdf4j/rdf4j#1354 simple support in StandardisedPlanHelper

Signed-off-by: Håvard Ottestad <[email protected]>
eclipse-rdf4j · Mar 18, 2019 · 8017f87 · 8017f87
1 parent 8b5525f
commit 8017f87
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/AST/PathPropertyShape.java b/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/AST/PathPropertyShape.java
@@ -49,8 +49,7 @@ public PlanNode getPlan(ShaclSailConnection shaclSailConnection, NodeShape nodeS
 
 	@Override
 	public PlanNode getPlanAddedStatements(ShaclSailConnection shaclSailConnection, NodeShape nodeShape) {
-		return shaclSailConnection.getCachedNodeFor(
-				new Select(shaclSailConnection.getAddedStatements(), path.getQuery("?a", "?c", null), "*"));
+		return shaclSailConnection.getCachedNodeFor(new Select(shaclSailConnection.getAddedStatements(), path.getQuery("?a", "?c", null), "*"));
 
 	}
 

diff --git a/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/AST/StandardisedPlanHelper.java b/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/AST/StandardisedPlanHelper.java
@@ -14,6 +14,7 @@
 import org.eclipse.rdf4j.sail.shacl.planNodes.FilterPlanNode;
 import org.eclipse.rdf4j.sail.shacl.planNodes.InnerJoin;
 import org.eclipse.rdf4j.sail.shacl.planNodes.LoggingNode;
+import org.eclipse.rdf4j.sail.shacl.planNodes.ModifyTuple;
 import org.eclipse.rdf4j.sail.shacl.planNodes.PlanNode;
 import org.eclipse.rdf4j.sail.shacl.planNodes.UnBufferedPlanNode;
 import org.eclipse.rdf4j.sail.shacl.planNodes.UnionNode;
@@ -34,6 +35,17 @@ static public PlanNode getGenericSingleObjectPlan(ShaclSailConnection shaclSailC
 					filterAttacher.attachFilter(bulkedExternalInnerJoin).getFalseNode(UnBufferedPlanNode.class), "");
 		}
 
+		if(pathPropertyShape.path == null){
+
+			PlanNode targets = new ModifyTuple(new LoggingNode(nodeShape.getPlanAddedStatements(shaclSailConnection, nodeShape), ""), t -> {
+				t.line.add(t.line.get(0));
+				return t;
+			});
+
+			return new LoggingNode(filterAttacher.attachFilter(targets).getFalseNode(UnBufferedPlanNode.class), "");
+
+		}
+
 		PlanNode addedByPath = new LoggingNode(pathPropertyShape.getPlanAddedStatements(shaclSailConnection, nodeShape),
 				"");