GH-4758 support for union of data graphs as well as union of shape graphs (#4760)

Author: hmottestad

core/model-vocabulary/src/main/java/org/eclipse/rdf4j/model/vocabulary/RSX.java

@@ -39,10 +39,14 @@ public class RSX {
 
 	/** <var>http://rdf4j.org/shacl-extensions#targetShape</var> */
 	public final static IRI targetShape = create("targetShape");
+
 	public final static IRI dataGraph = create("dataGraph");
 	public final static IRI shapesGraph = create("shapesGraph");
+
 	public final static IRI valueConformsToXsdDatatypeFunction = create("valueConformsToXsdDatatypeFunction");
 
+	public final static IRI DataAndShapesGraphLink = create("DataAndShapesGraphLink");
+
 	private static IRI create(String localName) {
 		return Vocabularies.createIRI(RSX.NAMESPACE, localName);
 	}

core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ShaclSail.java

@@ -39,6 +39,7 @@
 import org.eclipse.rdf4j.model.vocabulary.DASH;
 import org.eclipse.rdf4j.model.vocabulary.RDF4J;
 import org.eclipse.rdf4j.model.vocabulary.RSX;
+import org.eclipse.rdf4j.model.vocabulary.SESAME;
 import org.eclipse.rdf4j.model.vocabulary.SHACL;
 import org.eclipse.rdf4j.repository.Repository;
 import org.eclipse.rdf4j.repository.RepositoryConnection;
@@ -327,7 +328,9 @@ public static List<IRI> getSupportedShaclPredicates() {
 				SHACL.NAMESPACE_PROP,
 				SHACL.SEVERITY_PROP,
 				DASH.hasValueIn,
-				RSX.targetShape
+				RSX.targetShape,
+				RSX.dataGraph,
+				RSX.shapesGraph
 		);
 	}
 
@@ -374,6 +377,9 @@ public void init() throws SailException {
 						if (g.equals(RDF4J.NIL)) {
 							return null;
 						}
+						if (g.equals(SESAME.NIL)) {
+							return null;
+						}
 						return g;
 					})
 					.toArray(IRI[]::new);

core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ShaclSailConnection.java

@@ -36,6 +36,7 @@
 import org.eclipse.rdf4j.model.Statement;
 import org.eclipse.rdf4j.model.Value;
 import org.eclipse.rdf4j.model.vocabulary.RDF4J;
+import org.eclipse.rdf4j.model.vocabulary.SESAME;
 import org.eclipse.rdf4j.repository.sail.SailRepositoryConnection;
 import org.eclipse.rdf4j.sail.NotifyingSailConnection;
 import org.eclipse.rdf4j.sail.Sail;
@@ -189,6 +190,9 @@ public void begin(IsolationLevel level) throws SailException {
 			if (g.equals(RDF4J.NIL)) {
 				return null;
 			}
+			if (g.equals(SESAME.NIL)) {
+				return null;
+			}
 			return g;
 		}).toArray(IRI[]::new);
 

core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ShaclValidator.java

@@ -11,6 +11,7 @@
 
 package org.eclipse.rdf4j.sail.shacl;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -66,6 +67,14 @@ public static ValidationReport validate(Sail dataRepo, Sail shapesRepo) {
 
 				shapes = Shape.Factory.getShapes(parsed).stream().distinct().collect(Collectors.toList());
 
+				if (logger.isDebugEnabled()) {
+					for (ContextWithShape shape : shapes) {
+						logger.debug("Using data graph(s) {} and shape graph(s) {} with shape {}",
+								Arrays.toString(shape.getDataGraph()), Arrays.toString(shape.getShapeGraph()),
+								shape.getShape());
+					}
+				}
+
 			}
 			shapesConnection.commit();
 		}

core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/ContextWithShape.java

@@ -12,13 +12,15 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.model.Resource;
 import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.Value;
 import org.eclipse.rdf4j.model.impl.DynamicModel;
 import org.eclipse.rdf4j.model.impl.DynamicModelFactory;
 
@@ -31,7 +33,8 @@ public class ContextWithShape {
 	public ContextWithShape(Resource[] dataGraph, Resource[] shapeGraph, Shape shape) {
 		this.shapeGraph = shapeGraph;
 		this.dataGraph = dataGraph;
-		Arrays.sort(this.dataGraph);
+		Arrays.sort(this.dataGraph, Comparator.comparing(v -> v != null ? v.stringValue() : "null"));
+		Arrays.sort(this.shapeGraph, Comparator.comparing(v -> v != null ? v.stringValue() : "null"));
 		this.shape = shape;
 	}
 

core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/ShaclParsingException.java

@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2023 Eclipse RDF4J contributors.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Distribution License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ ******************************************************************************/
+
+package org.eclipse.rdf4j.sail.shacl.ast;
+
+import org.eclipse.rdf4j.common.exception.RDF4JException;
+import org.eclipse.rdf4j.model.Resource;
+
+/**
+ * An exception indicating that something went wrong when parsing the SHACL statements, but without a specific shape
+ * being the cause.
+ */
+public class ShaclParsingException extends RDF4JException {
+
+	public ShaclParsingException(String msg) {
+		super(msg);
+	}
+}

core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/planNodes/UnorderedSelect.java

@@ -13,6 +13,7 @@
 
 import java.util.Arrays;
 import java.util.Objects;
+import java.util.function.BiFunction;
 import java.util.function.Function;
 
 import org.apache.commons.text.StringEscapeUtils;
@@ -41,13 +42,13 @@ public class UnorderedSelect implements PlanNode {
 	private final IRI predicate;
 	private final Value object;
 	private final Resource[] dataGraph;
-	private final Function<Statement, ValidationTuple> mapper;
+	private final BiFunction<Statement, Resource[], ValidationTuple> mapper;
 
 	private boolean printed = false;
 	private ValidationExecutionLogger validationExecutionLogger;
 
 	public UnorderedSelect(SailConnection connection, Resource subject, IRI predicate, Value object,
-			Resource[] dataGraph, Function<Statement, ValidationTuple> mapper) {
+			Resource[] dataGraph, BiFunction<Statement, Resource[], ValidationTuple> mapper) {
 		this.connection = connection;
 		assert this.connection != null;
 		this.subject = subject;
@@ -83,7 +84,7 @@ protected boolean localHasNext() {
 
 			@Override
 			protected ValidationTuple loggingNext() {
-				return mapper.apply(statements.next());
+				return mapper.apply(statements.next(), dataGraph);
 			}
 
 		};
@@ -188,7 +189,7 @@ public int hashCode() {
 	}
 
 	public static class Mapper {
-		public static class SubjectScopedMapper implements Function<Statement, ValidationTuple> {
+		public static class SubjectScopedMapper implements BiFunction<Statement, Resource[], ValidationTuple> {
 
 			private final ConstraintComponent.Scope scope;
 
@@ -202,8 +203,8 @@ private SubjectScopedMapper(ConstraintComponent.Scope scope) {
 			static SubjectScopedMapper noneInstance = new SubjectScopedMapper(ConstraintComponent.Scope.none);
 
 			@Override
-			public ValidationTuple apply(Statement s) {
-				return new ValidationTuple(s.getSubject(), scope, false, s.getContext());
+			public ValidationTuple apply(Statement s, Resource[] dataGraph) {
+				return new ValidationTuple(s.getSubject(), scope, false, dataGraph);
 			}
 
 			@Override
@@ -232,7 +233,7 @@ public static SubjectScopedMapper getFunction(ConstraintComponent.Scope scope) {
 
 		}
 
-		public static class ObjectScopedMapper implements Function<Statement, ValidationTuple> {
+		public static class ObjectScopedMapper implements BiFunction<Statement, Resource[], ValidationTuple> {
 
 			private final ConstraintComponent.Scope scope;
 
@@ -246,8 +247,8 @@ private ObjectScopedMapper(ConstraintComponent.Scope scope) {
 			static ObjectScopedMapper noneInstance = new ObjectScopedMapper(ConstraintComponent.Scope.none);
 
 			@Override
-			public ValidationTuple apply(Statement s) {
-				return new ValidationTuple(s.getObject(), scope, false, s.getContext());
+			public ValidationTuple apply(Statement s, Resource[] dataGraph) {
+				return new ValidationTuple(s.getObject(), scope, false, dataGraph);
 			}
 
 			@Override
@@ -276,17 +277,18 @@ public static ObjectScopedMapper getFunction(ConstraintComponent.Scope scope) {
 
 		}
 
-		public static class SubjectObjectPropertyShapeMapper implements Function<Statement, ValidationTuple> {
+		public static class SubjectObjectPropertyShapeMapper
+				implements BiFunction<Statement, Resource[], ValidationTuple> {
 
 			private SubjectObjectPropertyShapeMapper() {
 			}
 
 			static SubjectObjectPropertyShapeMapper instance = new SubjectObjectPropertyShapeMapper();
 
 			@Override
-			public ValidationTuple apply(Statement s) {
+			public ValidationTuple apply(Statement s, Resource[] dataGraph) {
 				return new ValidationTuple(s.getSubject(), s.getObject(), ConstraintComponent.Scope.propertyShape,
-						true, s.getContext());
+						true, dataGraph);
 			}
 
 			@Override

core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/planNodes/ValidationTuple.java

@@ -87,10 +87,6 @@ public ValidationTuple(Value[] chain, ConstraintComponent.Scope scope, boolean h
 		this.contexts = contexts;
 	}
 
-	public ValidationTuple(Value a, Value c, ConstraintComponent.Scope scope, boolean hasValue, Resource context) {
-		this(a, c, scope, hasValue, context == null ? NULL_CONTEXT : new Resource[] { context });
-	}
-
 	public ValidationTuple(Value a, Value c, ConstraintComponent.Scope scope, boolean hasValue, Resource[] contexts) {
 		chain = new Value[] { a, c };
 
@@ -101,10 +97,6 @@ public ValidationTuple(Value a, Value c, ConstraintComponent.Scope scope, boolea
 		this.contexts = contexts;
 	}
 
-	public ValidationTuple(Value subject, ConstraintComponent.Scope scope, boolean hasValue, Resource context) {
-		this(subject, scope, hasValue, new Resource[] { context });
-	}
-
 	public ValidationTuple(Value subject, ConstraintComponent.Scope scope, boolean hasValue, Resource[] contexts) {
 		chain = new Value[] { subject };
 		this.scope = scope;

core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/planNodes/ValuesBackedNode.java

@@ -39,9 +39,9 @@ public class ValuesBackedNode implements PlanNode {
 	boolean printed = false;
 	private ValidationExecutionLogger validationExecutionLogger;
 
-	public ValuesBackedNode(SortedSet<Value> values, ConstraintComponent.Scope scope, Resource[] contexts) {
+	public ValuesBackedNode(SortedSet<Value> values, ConstraintComponent.Scope scope, Resource[] dataGraph) {
 		this.tuples = values.stream()
-				.map(c -> new ValidationTuple(c, scope, false, contexts))
+				.map(c -> new ValidationTuple(c, scope, false, dataGraph))
 				.collect(Collectors.toList());
 		this.values = values;
 		this.scope = scope;

core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/targets/EffectiveTarget.java

@@ -512,18 +512,18 @@ public boolean hasStatements() {
 	static class ActiveTargetTupleMapper implements Function<ValidationTuple, ValidationTuple> {
 		private final ConstraintComponent.Scope scope;
 		private final boolean includePropertyShapeValues;
-		private final Resource[] contexts;
+		private final Resource[] dataGraph;
 
 		public ActiveTargetTupleMapper(ConstraintComponent.Scope scope, boolean includePropertyShapeValues,
-				Resource[] contexts) {
+				Resource[] dataGraph) {
 			this.scope = scope;
 			this.includePropertyShapeValues = includePropertyShapeValues;
-			this.contexts = contexts;
+			this.dataGraph = dataGraph;
 		}
 
 		@Override
 		public ValidationTuple apply(ValidationTuple validationTuple) {
-			return new ValidationTuple(validationTuple.getActiveTarget(), scope, includePropertyShapeValues, contexts);
+			return new ValidationTuple(validationTuple.getActiveTarget(), scope, includePropertyShapeValues, dataGraph);
 		}
 
 		@Override