Skip to content

Commit 148aa31

Browse files
committed
GH-5247 fix issue with LeftJoinIterator when a condition is used
1 parent 4fc9558 commit 148aa31

File tree

3 files changed

+1
-6
lines changed

3 files changed

+1
-6
lines changed

core/queryalgebra/evaluation/src/main/java/org/eclipse/rdf4j/query/algebra/evaluation/iterator/LeftJoinIterator.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,6 @@ protected BindingSet getNextElement() throws QueryEvaluationException {
175175
// Join failed, return left arg's bindings
176176
return leftBindings;
177177
}
178-
179-
return null;
180178
}
181179
} catch (NoSuchElementException ignore) {
182180
// probably, one of the iterations has been closed concurrently in

core/queryalgebra/evaluation/src/main/java/org/eclipse/rdf4j/query/algebra/evaluation/optimizer/ConjunctiveConstraintSplitterOptimizer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public void meet(LeftJoin node) {
6969
super.meet(node);
7070

7171
if (node.getCondition() != null) {
72-
List<ValueExpr> conjunctiveConstraints = new ArrayList<>(16);
72+
List<ValueExpr> conjunctiveConstraints = new ArrayList<>();
7373
getConjunctiveConstraints(node.getCondition(), conjunctiveConstraints);
7474

7575
TupleExpr arg = node.getRightArg();

testsuites/repository/src/main/java/org/eclipse/rdf4j/testsuite/repository/TupleQueryResultTest.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -389,9 +389,6 @@ public void testLeftJoinWithJoinCondition() throws IOException {
389389
con.begin();
390390
try (TupleQueryResult evaluate = tupleQuery.evaluate()) {
391391
assertTrue(evaluate.hasNext());
392-
while (evaluate.hasNext()) {
393-
System.out.println(evaluate.next());
394-
}
395392
}
396393
con.commit();
397394

0 commit comments

Comments
 (0)