bug fix

Author: hmottestad

core/queryalgebra/evaluation/src/main/java/org/eclipse/rdf4j/query/algebra/evaluation/impl/evaluationsteps/StatementPatternQueryEvaluationStep.java

@@ -531,18 +531,20 @@ private DirectLookupResult cacheDirectLookupIfSmall(DirectLookupKey directLookup
 			return new DirectLookupResult(iteration, -1);
 		}
 
-		List<Statement> statements = new ArrayList<>(DIRECT_LOOKUP_CACHE_MAX_STATEMENTS);
-		while (iteration.hasNext()) {
-			if (statements.size() == DIRECT_LOOKUP_CACHE_MAX_STATEMENTS) {
-				iteration.close();
-				return new DirectLookupResult(reopenUncachedIteration(subject, predicate, object, contexts), -1);
+		try (iteration) {
+			List<Statement> statements = new ArrayList<>(DIRECT_LOOKUP_CACHE_MAX_STATEMENTS);
+			while (iteration.hasNext()) {
+				if (statements.size() == DIRECT_LOOKUP_CACHE_MAX_STATEMENTS) {
+					return new DirectLookupResult(reopenUncachedIteration(subject, predicate, object, contexts), -1);
+				}
+				statements.add(iteration.next());
 			}
-			statements.add(iteration.next());
-		}
 
-		statements = List.copyOf(statements);
-		putCachedDirectLookup(directLookupKey, DirectLookupCacheEntry.statements(statements));
-		return new DirectLookupResult(new CloseableIteratorIteration<>(statements.iterator()), statements.size());
+			statements = List.copyOf(statements);
+
+			putCachedDirectLookup(directLookupKey, DirectLookupCacheEntry.statements(statements));
+			return new DirectLookupResult(new CloseableIteratorIteration<>(statements.iterator()), statements.size());
+		}
 	}
 
 	private CloseableIteration<? extends Statement> reopenUncachedIteration(Resource subject, IRI predicate,

core/queryalgebra/evaluation/src/test/java/org/eclipse/rdf4j/query/algebra/evaluation/impl/evaluationsteps/StatementPatternQueryEvaluationStepDirectLookupCacheTest.java

@@ -0,0 +1,107 @@
+/*******************************************************************************
+ * Copyright (c) 2026 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
+ *******************************************************************************/
+// Some portions generated by Codex
+package org.eclipse.rdf4j.query.algebra.evaluation.impl.evaluationsteps;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.rdf4j.common.iteration.AbstractCloseableIteration;
+import org.eclipse.rdf4j.common.iteration.CloseableIteration;
+import org.eclipse.rdf4j.model.IRI;
+import org.eclipse.rdf4j.model.Resource;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.Value;
+import org.eclipse.rdf4j.model.ValueFactory;
+import org.eclipse.rdf4j.model.impl.SimpleValueFactory;
+import org.eclipse.rdf4j.query.BindingSet;
+import org.eclipse.rdf4j.query.Dataset;
+import org.eclipse.rdf4j.query.MutableBindingSet;
+import org.eclipse.rdf4j.query.QueryEvaluationException;
+import org.eclipse.rdf4j.query.algebra.StatementPattern;
+import org.eclipse.rdf4j.query.algebra.Var;
+import org.eclipse.rdf4j.query.algebra.evaluation.TripleSource;
+import org.eclipse.rdf4j.query.algebra.evaluation.impl.QueryEvaluationContext;
+import org.junit.jupiter.api.Test;
+
+class StatementPatternQueryEvaluationStepDirectLookupCacheTest {
+
+	@Test
+	void cachedFullyBoundEvaluateClosesDrainedSourceIteration() {
+		QueryEvaluationContext context = new QueryEvaluationContext.Minimal((Dataset) null);
+		TrackingFullyBoundTripleSource tripleSource = new TrackingFullyBoundTripleSource();
+		StatementPattern statementPattern = new StatementPattern(new Var("s"), new Var("p"), new Var("o"));
+		StatementPatternQueryEvaluationStep evaluationStep = new StatementPatternQueryEvaluationStep(
+				statementPattern,
+				context,
+				tripleSource);
+
+		MutableBindingSet bindings = context.createBindingSet();
+		bindings.addBinding("s", tripleSource.statement.getSubject());
+		bindings.addBinding("p", tripleSource.statement.getPredicate());
+		bindings.addBinding("o", tripleSource.statement.getObject());
+
+		try (CloseableIteration<BindingSet> iteration = evaluationStep.evaluate(bindings)) {
+			assertThat(iteration.hasNext()).isTrue();
+			assertThat(iteration.next()).isSameAs(bindings);
+			assertThat(iteration.hasNext()).isFalse();
+		}
+
+		assertThat(tripleSource.lastIteration.isClosed()).isTrue();
+	}
+
+	private static final class TrackingFullyBoundTripleSource implements TripleSource {
+
+		private final ValueFactory valueFactory = SimpleValueFactory.getInstance();
+		private final Statement statement = valueFactory.createStatement(
+				valueFactory.createIRI("urn:subj"),
+				valueFactory.createIRI("urn:pred"),
+				valueFactory.createLiteral("obj"));
+		private TrackingStatementIteration lastIteration;
+
+		@Override
+		public CloseableIteration<? extends Statement> getStatements(Resource subj, IRI pred, Value obj,
+				Resource... contexts) throws QueryEvaluationException {
+			lastIteration = new TrackingStatementIteration(List.of(statement));
+			return lastIteration;
+		}
+
+		@Override
+		public ValueFactory getValueFactory() {
+			return valueFactory;
+		}
+	}
+
+	private static final class TrackingStatementIteration extends AbstractCloseableIteration<Statement> {
+
+		private final Iterator<Statement> iterator;
+
+		private TrackingStatementIteration(List<Statement> statements) {
+			iterator = statements.iterator();
+		}
+
+		@Override
+		public boolean hasNext() {
+			return iterator.hasNext();
+		}
+
+		@Override
+		public Statement next() {
+			return iterator.next();
+		}
+
+		@Override
+		protected void handleClose() {
+		}
+	}
+}