eclipse-rdf4j
diff --git a/‎PLANS.md‎
Lines changed: 1 addition & 0 deletions b/‎PLANS.md‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎core/repository/sparql/src/main/java/org/eclipse/rdf4j/repository/sparql/federation/RepositoryFederatedService.java‎
Lines changed: 33 additions & 3 deletions b/‎core/repository/sparql/src/main/java/org/eclipse/rdf4j/repository/sparql/federation/RepositoryFederatedService.java‎
Lines changed: 33 additions & 3 deletions
diff --git a/‎core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/PropertyShape.java‎
Lines changed: 12 additions & 11 deletions b/‎core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/PropertyShape.java‎
Lines changed: 12 additions & 11 deletions
diff --git a/‎core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/ShaclShapeParsingException.java‎
Lines changed: 4 additions & 0 deletions b/‎core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/ShaclShapeParsingException.java‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/Shape.java‎
Lines changed: 128 additions & 21 deletions b/‎core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/Shape.java‎
Lines changed: 128 additions & 21 deletions
diff --git a/‎core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/constraintcomponents/AbstractConstraintComponent.java‎
Lines changed: 19 additions & 0 deletions b/‎core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/constraintcomponents/AbstractConstraintComponent.java‎
Lines changed: 19 additions & 0 deletions
@@ -150,3 +150,4 @@ In crates/foo/planner.rs, define:
 If you follow the guidance above, a single, stateless agent -- or a human novice -- can read your ExecPlan from top to bottom and produce a working, observable result. That is the bar: SELF-CONTAINED, SELF-SUFFICIENT, NOVICE-GUIDING, OUTCOME-FOCUSED.
 
 When you revise a plan, you must ensure your changes are comprehensively reflected across all sections, including the living document sections, and you must write a note at the bottom of the plan describing the change and the reason why. ExecPlans must describe not just the what but the why for almost everything.
+
@@ -16,6 +16,9 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
 
 import org.eclipse.rdf4j.common.iteration.CloseableIteration;
 import org.eclipse.rdf4j.common.iteration.EmptyIteration;
@@ -62,6 +65,10 @@ private class BatchingServiceIteration extends JoinExecutorBase<BindingSet> {
 
 		private final Service service;
 
+		private final ExecutorService threadExecutor = Executors.newSingleThreadExecutor();
+
+		private final Future<?> querySubmissionTask;
+
 		/**
 		 * @param inputBindings
 		 * @throws QueryEvaluationException
@@ -71,13 +78,26 @@ public BatchingServiceIteration(CloseableIteration<BindingSet> inputBindings,
 			super(inputBindings, null, EmptyBindingSet.getInstance());
 			this.blockSize = blockSize;
 			this.service = service;
-			run();
+
+			// Set up a consumer task to send HTTP requests in parallel. This must be done in a
+			// separate thread, because submitting HTTP requests may block if the HTTP pool is full.
+			// In that case, we would enter a deadlock, with the main thread waiting for both the
+			// pool to yield, and the consumer of the bindings to read from the queue.
+			// See: https://github.com/eclipse-rdf4j/rdf4j/discussions/5120
+			// Test case: https://github.com/tkuhn/rdf4j-timeout-test
+			try {
+				querySubmissionTask = threadExecutor.submit(this::run);
+			} catch (Exception e) {
+				throw new QueryEvaluationException("Failed to start a thread for batched federated query submission",
+						e);
+			}
 		}
 
 		@Override
 		protected void handleBindings() throws Exception {
+			// Note: any exceptions here will be intercepted by the caller and tossed asynchronously
+			// via the rightQueue.
 			while (!isClosed() && leftIter.hasNext()) {
-
 				ArrayList<BindingSet> blockBindings = new ArrayList<>(blockSize);
 				for (int i = 0; i < blockSize; i++) {
 					if (!leftIter.hasNext()) {
@@ -87,9 +107,19 @@ protected void handleBindings() throws Exception {
 				}
 				CloseableIteration<BindingSet> materializedIter = new CollectionIteration<>(
 						blockBindings);
+				// evaluateInternal is BLOCKING if the HTTP pool is exhausted
 				addResult(evaluateInternal(service, materializedIter, service.getBaseURI()));
 			}
 		}
+
+		@Override
+		public void handleClose() throws QueryEvaluationException {
+			super.handleClose();
+			if (querySubmissionTask != null) {
+				querySubmissionTask.cancel(true);
+			}
+			threadExecutor.shutdownNow();
+		}
 	}
 
 	/**
@@ -631,4 +661,4 @@ private static void closeQuietly(RepositoryConnection conn) {
 			logger.debug("Details: ", t);
 		}
 	}
-}
+}
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.rdf4j.sail.shacl.ast;
 
+import java.util.IdentityHashMap;
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
@@ -344,14 +345,8 @@ public SourceConstraintComponent getConstraintComponent() {
 	}
 
 	@Override
-	public boolean equals(Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		if (!super.equals(o)) {
+	public boolean equals(ConstraintComponent o, IdentityHashMap<Shape, Shape> kvIdentityHashMap) {
+		if (!(o instanceof PropertyShape)) {
 			return false;
 		}
 
@@ -369,12 +364,18 @@ public boolean equals(Object o) {
 		if (!Objects.equals(group, that.group)) {
 			return false;
 		}
-		return Objects.equals(path, that.path);
+
+		if (!Objects.equals(path, that.path)) {
+			return false;
+		}
+
+		return super.equals(o, kvIdentityHashMap);
+
 	}
 
 	@Override
-	public int hashCode() {
-		int result = super.hashCode();
+	public int hashCode(IdentityHashMap<Shape, Boolean> cycleDetection) {
+		int result = super.hashCode(cycleDetection);
 		result = 31 * result + (name != null ? name.hashCode() : 0);
 		result = 31 * result + (description != null ? description.hashCode() : 0);
 		result = 31 * result + (defaultValue != null ? defaultValue.hashCode() : 0);
 
@@ -32,6 +32,10 @@ public ShaclShapeParsingException(String msg, Throwable t, Resource id) {
 		this.id = id;
 	}
 
+	public ShaclShapeParsingException(String msg, Throwable t) {
+		super(msg, t);
+	}
+
 	public ShaclShapeParsingException(Throwable t, Resource id) {
 		super(t.getMessage() + " - Caused by shape with id: " + resourceToString(id), t);
 		this.id = id;
 
@@ -14,13 +14,15 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
+import java.util.IdentityHashMap;
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import org.eclipse.rdf4j.common.annotation.InternalUseOnly;
+import org.eclipse.rdf4j.common.exception.RDF4JException;
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Literal;
 import org.eclipse.rdf4j.model.Model;
@@ -43,6 +45,7 @@
 import org.eclipse.rdf4j.sail.shacl.SourceConstraintComponent;
 import org.eclipse.rdf4j.sail.shacl.ValidationSettings;
 import org.eclipse.rdf4j.sail.shacl.ast.StatementMatcher.Variable;
+import org.eclipse.rdf4j.sail.shacl.ast.constraintcomponents.AbstractConstraintComponent;
 import org.eclipse.rdf4j.sail.shacl.ast.constraintcomponents.AndConstraintComponent;
 import org.eclipse.rdf4j.sail.shacl.ast.constraintcomponents.ClassConstraintComponent;
 import org.eclipse.rdf4j.sail.shacl.ast.constraintcomponents.ClosedConstraintComponent;
@@ -201,7 +204,7 @@ public void toModel(Resource subject, IRI predicate, Model model, Set<Resource>
 		modelBuilder.subject(getId());
 
 		if (deactivated) {
-			modelBuilder.add(SHACL.DEACTIVATED, deactivated);
+			modelBuilder.add(SHACL.DEACTIVATED, true);
 		}
 
 		for (Literal literal : message) {
@@ -530,16 +533,32 @@ public List<Literal> getDefaultMessage() {
 	}
 
 	@Override
-	public boolean equals(Object o) {
+	public final boolean equals(Object o) {
 		if (this == o) {
 			return true;
 		}
 		if (!(o instanceof Shape)) {
 			return false;
 		}
 
+		return equals((Shape) o, new IdentityHashMap<>());
+	}
+
+	@Override
+	public boolean equals(ConstraintComponent o, IdentityHashMap<Shape, Shape> comparisonGuard) {
+		Object alreadyComparing = comparisonGuard.get(this);
+		if (alreadyComparing == o) {
+			return true;
+		}
+
+		if (!(o instanceof Shape)) {
+			return false;
+		}
+
 		Shape shape = (Shape) o;
 
+		comparisonGuard.put(this, shape);
+
 		if (produceValidationReports != shape.produceValidationReports) {
 			return false;
 		}
@@ -555,47 +574,130 @@ public boolean equals(Object o) {
 		if (severity != shape.severity) {
 			return false;
 		}
-		if (!Objects.equals(constraintComponents, shape.constraintComponents)) {
+
+		if (constraintComponents.size() != shape.constraintComponents.size()) {
 			return false;
 		}
+
+		boolean[] matchedRightSide = new boolean[shape.constraintComponents.size()];
+
+		for (int i = 0; i < constraintComponents.size(); i++) {
+			ConstraintComponent left = constraintComponents.get(i);
+
+			if (left == null) {
+				continue;
+			}
+
+			int matchIndex = -1;
+
+			if (!matchedRightSide[i]) {
+				ConstraintComponent right = shape.constraintComponents.get(i);
+				if (left.equals(right, comparisonGuard)) {
+					matchIndex = i;
+				}
+			}
+
+			if (matchIndex == -1) {
+				for (int j = 0; j < shape.constraintComponents.size(); j++) {
+					if (matchedRightSide[j]) {
+						continue;
+					}
+					ConstraintComponent candidate = shape.constraintComponents.get(j);
+					if (left.equals(candidate, comparisonGuard)) {
+						matchIndex = j;
+						break;
+					}
+				}
+			}
+
+			if (matchIndex == -1) {
+				return false;
+			}
+
+			matchedRightSide[matchIndex] = true;
+		}
+
 		return true;
 	}
 
 	@Override
-	public int hashCode() {
+	public final int hashCode() {
+		return hashCode(new IdentityHashMap<>());
+	}
+
+	@Override
+	public int hashCode(IdentityHashMap<Shape, Boolean> cycleDetection) {
+		if (cycleDetection.put(this, Boolean.TRUE) != null) {
+			throw new ShaclShapeParsingException("Recursive shape definition detected while computing hashCode",
+					getId());
+		}
+
 		int result = (produceValidationReports ? 1 : 0);
 		result = 31 * result + (target != null ? target.hashCode() : 0);
 		result = 31 * result + (deactivated ? 1 : 0);
 		result = 31 * result + (message != null ? message.hashCode() : 0);
 		result = 31 * result + (severity != null ? severity.hashCode() : 0);
-		result = 31 * result + (constraintComponents != null ? constraintComponents.hashCode() : 0);
+
+		long temp = 0;
+
+		for (ConstraintComponent constraintComponent : constraintComponents) {
+			int componentHash;
+			if (constraintComponent instanceof Shape) {
+				componentHash = constraintComponent.hashCode(cycleDetection);
+			} else if (constraintComponent instanceof AbstractConstraintComponent) {
+				componentHash = constraintComponent.hashCode(cycleDetection);
+			} else {
+				componentHash = constraintComponent != null ? constraintComponent.hashCode() : 0;
+			}
+			temp += componentHash;
+		}
+
+		result = 31 * result + Long.hashCode(temp);
+
+		cycleDetection.remove(this);
 		return result;
 	}
 
 	public static class Factory {
 
 		public static List<ContextWithShape> getShapes(ShapeSource shapeSource, ParseSettings parseSettings) {
 
-			List<ContextWithShape> parsed = parse(shapeSource, parseSettings);
-
-			return getShapes(parsed);
+			try {
+				List<ContextWithShape> parsed = parse(shapeSource, parseSettings);
+				return getShapes(parsed);
+			} catch (RDF4JException e) {
+				logger.error(e.getMessage(), e);
+				throw e;
+			} catch (Throwable e) {
+				logger.error("Unexpected error while parsing shapes", e);
+				throw new ShaclShapeParsingException("Unexpected error while parsing shapes", e);
+			}
 
 		}
 
 		public static List<ContextWithShape> getShapes(List<ContextWithShape> parsed) {
-			return parsed.stream()
-					.flatMap(contextWithShapes -> {
-						List<Shape> split = split(contextWithShapes.getShape());
-						calculateTargetChain(split);
-						calculateIfProducesValidationResult(split);
-						return split.stream().map(s -> {
-							return new ContextWithShape(contextWithShapes.getDataGraph(),
-									contextWithShapes.getShapeGraph(), s);
-						});
-					})
-					.filter(ContextWithShape::hasShape)
-					.distinct()
-					.collect(Collectors.toList());
+			try {
+				return parsed.stream()
+						.flatMap(contextWithShapes -> {
+							List<Shape> split = split(contextWithShapes.getShape());
+							calculateTargetChain(split);
+							calculateIfProducesValidationResult(split);
+							return split.stream().map(s -> {
+								return new ContextWithShape(contextWithShapes.getDataGraph(),
+										contextWithShapes.getShapeGraph(), s);
+							});
+						})
+						.filter(ContextWithShape::hasShape)
+						.distinct()
+						.peek(a -> a.getShape().verifyNotRecursive())
+						.collect(Collectors.toList());
+			} catch (RDF4JException e) {
+				logger.error(e.getMessage(), e);
+				throw e;
+			} catch (Throwable e) {
+				logger.error("Unexpected error while parsing shapes", e);
+				throw new ShaclShapeParsingException("Unexpected error while parsing shapes", e);
+			}
 		}
 
 		private static void calculateIfProducesValidationResult(List<Shape> split) {
@@ -757,6 +859,11 @@ public static List<ContextWithShape> getShapesInContext(ShapeSource shapeSource,
 
 	}
 
+	private void verifyNotRecursive() {
+		// calling hashCode will throw an exception if recursion is detected
+		int i = hashCode(new IdentityHashMap<>());
+	}
+
 	@Override
 	public String toString() {
 		Model statements = toModel(new DynamicModel(new LinkedHashModelFactory()));
 
@@ -11,6 +11,8 @@
 
 package org.eclipse.rdf4j.sail.shacl.ast.constraintcomponents;
 
+import java.util.IdentityHashMap;
+
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Literal;
 import org.eclipse.rdf4j.model.Resource;
@@ -178,4 +180,21 @@ static PlanNode getAllTargetsIncludingThoseAddedByPath(ConnectionsGroup connecti
 		return allTargets;
 	}
 
+	@Override
+	public final int hashCode() {
+		return hashCode(new IdentityHashMap<>());
+	}
+
+	@Override
+	public final boolean equals(Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+
+		return equals(((AbstractConstraintComponent) o), new IdentityHashMap<>());
+	}
+
 }
Original file line number	Diff line number	Diff line change
`@@ -150,3 +150,4 @@ In crates/foo/planner.rs, define:`
`150`	`150`	`If you follow the guidance above, a single, stateless agent -- or a human novice -- can read your ExecPlan from top to bottom and produce a working, observable result. That is the bar: SELF-CONTAINED, SELF-SUFFICIENT, NOVICE-GUIDING, OUTCOME-FOCUSED.`
`151`	`151`
`152`	`152`	`When you revise a plan, you must ensure your changes are comprehensively reflected across all sections, including the living document sections, and you must write a note at the bottom of the plan describing the change and the reason why. ExecPlans must describe not just the what but the why for almost everything.`
	`153`	`+`