wip

Author: hmottestad

core/sail/base/src/main/java/org/eclipse/rdf4j/sail/base/DelegatingSailSource.java

@@ -33,6 +33,9 @@ class DelegatingSailSource implements SailSource {
 	 * @param closing  if {@link #close()} should be delegated
 	 */
 	public DelegatingSailSource(SailSource delegate, boolean closing) {
+		if(delegate == null) {
+			System.out.println();
+		}
 		assert delegate != null;
 		this.delegate = delegate;
 		this.releasing = closing;

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

@@ -11,12 +11,6 @@
 
 package org.eclipse.rdf4j.sail.shacl.ast.planNodes;
 
-import java.util.ArrayDeque;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Objects;
-import java.util.function.Function;
-
 import org.apache.commons.text.StringEscapeUtils;
 import org.eclipse.rdf4j.common.iteration.CloseableIteration;
 import org.eclipse.rdf4j.model.Resource;
@@ -31,14 +25,20 @@
 import org.eclipse.rdf4j.sail.shacl.ast.constraintcomponents.ConstraintComponent;
 import org.eclipse.rdf4j.sail.shacl.wrapper.data.ConnectionsGroup;
 
+import java.util.ArrayDeque;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Objects;
+import java.util.function.Function;
+
 /**
  * @author Håvard Ottestad
- *         <p>
- *         This inner join algorithm assumes the left iterator is unique for tuple[0], eg. no two tuples have the same
- *         value at index 0. The right iterator is allowed to contain duplicates.
- *         <p>
- *         External means that this plan node can join the iterator from a plan node with an external source (Repository
- *         or SailConnection) based on a query or a predicate.
+ * <p>
+ * This inner join algorithm assumes the left iterator is unique for tuple[0], eg. no two tuples have the same
+ * value at index 0. The right iterator is allowed to contain duplicates.
+ * <p>
+ * External means that this plan node can join the iterator from a plan node with an external source (Repository
+ * or SailConnection) based on a query or a predicate.
  */
 public class BulkedExternalInnerJoin extends AbstractBulkJoinPlanNode {
 
@@ -59,10 +59,10 @@ public class BulkedExternalInnerJoin extends AbstractBulkJoinPlanNode {
 	private boolean printed = false;
 
 	public BulkedExternalInnerJoin(PlanNode leftNode, SailConnection connection, Resource[] dataGraph,
-			SparqlFragment query,
-			boolean skipBasedOnPreviousConnection, SailConnection previousStateConnection,
-			Function<BindingSet, ValidationTuple> mapper, ConnectionsGroup connectionsGroup,
-			List<StatementMatcher.Variable> vars) {
+								   SparqlFragment query,
+								   boolean skipBasedOnPreviousConnection, SailConnection previousStateConnection,
+								   Function<BindingSet, ValidationTuple> mapper, ConnectionsGroup connectionsGroup,
+								   List<StatementMatcher.Variable> vars) {
 		super(vars);
 		assert !skipBasedOnPreviousConnection || previousStateConnection != null;
 
@@ -79,7 +79,7 @@ public BulkedExternalInnerJoin(PlanNode leftNode, SailConnection connection, Res
 	}
 
 	public static Function<BindingSet, ValidationTuple> getMapper(String a, String c, ConstraintComponent.Scope scope,
-			Resource[] dataGraph) {
+																  Resource[] dataGraph) {
 		assert a.equals("a");
 		assert c.equals("c");
 		if (scope == ConstraintComponent.Scope.nodeShape && dataGraph.length == 0) {
@@ -159,6 +159,13 @@ public void localClose() {
 
 			@Override
 			protected boolean localHasNext() {
+				if (isClosed()) {
+					return false;
+				}
+				if (Thread.currentThread().isInterrupted()) {
+					close();
+					return false;
+				}
 				calculateNext();
 				return !joined.isEmpty();
 			}

core/sail/shacl/src/test/java/org/eclipse/rdf4j/sail/shacl/ShutdownDuringValidationTest.java

@@ -26,6 +26,7 @@
 import org.eclipse.rdf4j.model.vocabulary.DCAT;
 import org.eclipse.rdf4j.model.vocabulary.DCTERMS;
 import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
 import org.eclipse.rdf4j.repository.RepositoryException;
 import org.eclipse.rdf4j.repository.sail.SailRepository;
 import org.eclipse.rdf4j.repository.sail.SailRepositoryConnection;
@@ -128,10 +129,11 @@ public void shutdownDuringValidationTransactional(int sleepMillis) throws Interr
 
 		Thread thread;
 		try (var connection = repository.getConnection()) {
+			connection.begin();
 			ValueFactory vf = connection.getValueFactory();
-			BNode iri = vf.createBNode();
-			connection.add(iri, RDF.TYPE, DCAT.DATASET);
-			connection.add(iri, DCTERMS.ACCESS_RIGHTS, vf.createLiteral("valid"));
+			BNode bnode = vf.createBNode();
+			connection.add(bnode, RDF.TYPE, RDFS.RESOURCE);
+			connection.commit();
 		}
 
 		try (var connection = repository.getConnection()) {