Merge main into develop (#4877)

Author: hmottestad

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

@@ -16,6 +16,7 @@
 import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.NoSuchElementException;
 import java.util.Set;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
@@ -80,6 +81,7 @@ public ArrayBindingSet(BindingSet toCopy, Set<String> names, String[] namesArray
 			}
 		}
 		this.empty = toCopy.isEmpty();
+		assert !this.empty || size() == 0;
 
 	}
 
@@ -90,6 +92,7 @@ public ArrayBindingSet(ArrayBindingSet toCopy, String... names) {
 		this.whichBindingsHaveBeenSet = Arrays.copyOf(toCopy.whichBindingsHaveBeenSet,
 				toCopy.whichBindingsHaveBeenSet.length);
 		this.empty = toCopy.empty;
+		assert !this.empty || size() == 0;
 	}
 
 	/**
@@ -182,6 +185,10 @@ private int getIndex(String bindingName) {
 
 	@Override
 	public Set<String> getBindingNames() {
+		if (isEmpty()) {
+			return Collections.emptySet();
+		}
+
 		if (bindingNamesSetCache == null) {
 			int size = size();
 			if (size == 0) {
@@ -210,6 +217,10 @@ public Set<String> getBindingNames() {
 
 	@Override
 	public Value getValue(String bindingName) {
+		if (isEmpty()) {
+			return null;
+		}
+
 		for (int i = 0; i < bindingNames.length; i++) {
 			if (bindingNames[i] == bindingName && whichBindingsHaveBeenSet[i]) {
 				return values[i];
@@ -226,6 +237,10 @@ public Value getValue(String bindingName) {
 
 	@Override
 	public Binding getBinding(String bindingName) {
+		if (isEmpty()) {
+			return null;
+		}
+
 		Value value = getValue(bindingName);
 
 		if (value != null) {
@@ -237,6 +252,10 @@ public Binding getBinding(String bindingName) {
 
 	@Override
 	public boolean hasBinding(String bindingName) {
+		if (isEmpty()) {
+			return false;
+		}
+
 		int index = getIndex(bindingName);
 		if (index == -1) {
 			return false;
@@ -246,14 +265,19 @@ public boolean hasBinding(String bindingName) {
 
 	@Override
 	public Iterator<Binding> iterator() {
+		if (isEmpty()) {
+			return Collections.emptyIterator();
+		}
+
 		return new ArrayBindingSetIterator();
 	}
 
 	@Override
 	public int size() {
-		if (empty) {
+		if (isEmpty()) {
 			return 0;
 		}
+
 		int size = 0;
 
 		for (boolean value : whichBindingsHaveBeenSet) {
@@ -268,6 +292,7 @@ public int size() {
 	List<String> sortedBindingNames = null;
 
 	public List<String> getSortedBindingNames() {
+
 		if (sortedBindingNames == null) {
 			int size = size();
 
@@ -292,50 +317,6 @@ public List<String> getSortedBindingNames() {
 		return sortedBindingNames;
 	}
 
-	/*------------------------------------*
-	 * Inner class ArrayBindingSetIterator *
-	 *------------------------------------*/
-
-	private class ArrayBindingSetIterator implements Iterator<Binding> {
-
-		private int index = 0;
-
-		public ArrayBindingSetIterator() {
-		}
-
-		@Override
-		public boolean hasNext() {
-			for (; index < values.length; index++) {
-				if (whichBindingsHaveBeenSet[index] && values[index] != null) {
-					return true;
-				}
-			}
-			return false;
-		}
-
-		@Override
-		public Binding next() {
-			for (; index < values.length; index++) {
-				if (whichBindingsHaveBeenSet[index] && values[index] != null) {
-					break;
-				}
-			}
-
-			String name = bindingNames[index];
-			Value value = values[index++];
-			if (value != null) {
-				return new SimpleBinding(name, value);
-			} else {
-				return null;
-			}
-		}
-
-		@Override
-		public void remove() {
-			throw new UnsupportedOperationException();
-		}
-	}
-
 	@Override
 	public void addBinding(Binding binding) {
 		int index = getIndex(binding.getName());
@@ -350,8 +331,8 @@ public void addBinding(Binding binding) {
 		assert !this.whichBindingsHaveBeenSet[index];
 		this.values[index] = binding.getValue();
 		this.whichBindingsHaveBeenSet[index] = true;
+		empty = false;
 		clearCache();
-
 	}
 
 	@Override
@@ -362,6 +343,7 @@ public void setBinding(Binding binding) {
 		}
 		this.values[index] = binding.getValue();
 		this.whichBindingsHaveBeenSet[index] = true;
+		empty = false;
 		clearCache();
 	}
 
@@ -382,6 +364,8 @@ public void setBinding(String name, Value value) {
 					break;
 				}
 			}
+		} else {
+			this.empty = false;
 		}
 		clearCache();
 	}
@@ -418,4 +402,46 @@ public void addAll(ArrayBindingSet other) {
 
 	}
 
+	private class ArrayBindingSetIterator implements Iterator<Binding> {
+
+		private int index = 0;
+
+		public ArrayBindingSetIterator() {
+		}
+
+		@Override
+		public boolean hasNext() {
+			while (index < values.length) {
+				if (whichBindingsHaveBeenSet[index]) {
+					return true;
+				}
+				index++;
+			}
+			return false;
+		}
+
+		@Override
+		public Binding next() {
+			while (index < values.length) {
+				if (whichBindingsHaveBeenSet[index]) {
+					String name = bindingNames[index];
+					Value value = values[index++];
+					if (value != null) {
+						return new SimpleBinding(name, value);
+					} else {
+						return null;
+					}
+				}
+				index++;
+			}
+
+			throw new NoSuchElementException();
+		}
+
+		@Override
+		public void remove() {
+			throw new UnsupportedOperationException();
+		}
+	}
+
 }

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

@@ -57,7 +57,7 @@ public final class ArrayBindingBasedQueryEvaluationContext implements QueryEvalu
 	private final BiConsumer<Value, MutableBindingSet>[] addBinding;
 	private final Comparator<Value> comparator;
 
-	boolean initialized;
+	private final boolean initialized;
 
 	ArrayBindingBasedQueryEvaluationContext(QueryEvaluationContext context, String[] allVariables,
 			Comparator<Value> comparator) {
@@ -118,7 +118,12 @@ public Predicate<BindingSet> hasBinding(String variableName) {
 
 		assert variableName != null && !variableName.isEmpty();
 		Function<ArrayBindingSet, Boolean> directHasVariable = defaultArrayBindingSet.getDirectHasBinding(variableName);
-		return new HasBinding(variableName, directHasVariable);
+		if (directHasVariable != null) {
+			return new HasBinding(variableName, directHasVariable);
+		} else {
+			// If the variable is not in the default set, it can never be part of this array binding
+			return (bs) -> false;
+		}
 	}
 
 	static private class HasBinding implements Predicate<BindingSet> {
@@ -156,16 +161,19 @@ public Function<BindingSet, Binding> getBinding(String variableName) {
 
 		Function<ArrayBindingSet, Binding> directAccessForVariable = defaultArrayBindingSet
 				.getDirectGetBinding(variableName);
-		return bs -> {
-			if (bs.isEmpty()) {
-				return null;
-			}
-			if (bs instanceof ArrayBindingSet) {
-				return directAccessForVariable.apply((ArrayBindingSet) bs);
-			} else {
-				return bs.getBinding(variableName);
-			}
-		};
+		if (directAccessForVariable != null) {
+			return (bs) -> {
+				if (bs.isEmpty()) {
+					return null;
+				} else if (bs instanceof ArrayBindingSet) {
+					return directAccessForVariable.apply((ArrayBindingSet) bs);
+				} else {
+					return bs.getBinding(variableName);
+				}
+			};
+		} else {
+			return (bs) -> null;
+		}
 	}
 
 	@Override
@@ -180,7 +188,12 @@ public Function<BindingSet, Value> getValue(String variableName) {
 
 		Function<ArrayBindingSet, Value> directAccessForVariable = defaultArrayBindingSet
 				.getDirectGetValue(variableName);
-		return new ValueGetter(variableName, directAccessForVariable);
+		if (directAccessForVariable != null) {
+			return new ValueGetter(variableName, directAccessForVariable);
+		} else {
+			// If the variable is not in the default set, it can never be part of this array binding
+			return (bs) -> null;
+		}
 	}
 
 	private static class ValueGetter implements Function<BindingSet, Value> {
@@ -219,13 +232,17 @@ public BiConsumer<Value, MutableBindingSet> setBinding(String variableName) {
 
 		BiConsumer<Value, ArrayBindingSet> directAccessForVariable = defaultArrayBindingSet
 				.getDirectSetBinding(variableName);
-		return (val, bs) -> {
-			if (bs instanceof ArrayBindingSet) {
-				directAccessForVariable.accept(val, (ArrayBindingSet) bs);
-			} else {
-				bs.setBinding(variableName, val);
-			}
-		};
+		if (directAccessForVariable != null) {
+			return (val, bs) -> {
+				if (bs instanceof ArrayBindingSet) {
+					directAccessForVariable.accept(val, (ArrayBindingSet) bs);
+				} else {
+					bs.setBinding(variableName, val);
+				}
+			};
+		} else {
+			return (val, bs) -> bs.setBinding(variableName, val);
+		}
 	}
 
 	@Override
@@ -240,13 +257,17 @@ public BiConsumer<Value, MutableBindingSet> addBinding(String variableName) {
 
 		BiConsumer<Value, ArrayBindingSet> wrapped = defaultArrayBindingSet
 				.getDirectAddBinding(variableName);
-		return (val, bs) -> {
-			if (bs instanceof ArrayBindingSet) {
-				wrapped.accept(val, (ArrayBindingSet) bs);
-			} else {
-				bs.addBinding(variableName, val);
-			}
-		};
+		if (wrapped != null) {
+			return (val, bs) -> {
+				if (bs instanceof ArrayBindingSet) {
+					wrapped.accept(val, (ArrayBindingSet) bs);
+				} else {
+					bs.addBinding(variableName, val);
+				}
+			};
+		} else {
+			return (val, bs) -> bs.addBinding(variableName, val);
+		}
 	}
 
 	@Override

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

@@ -17,6 +17,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.BiFunction;
 import java.util.function.Consumer;
+import java.util.function.Predicate;
 import java.util.function.Supplier;
 
 import org.eclipse.rdf4j.collection.factory.api.CollectionFactory;
@@ -616,29 +617,8 @@ protected QueryEvaluationStep prepare(Service service, QueryEvaluationContext co
 
 	protected QueryEvaluationStep prepare(Filter node, QueryEvaluationContext context) throws QueryEvaluationException {
 
-		QueryEvaluationStep arg = precompile(node.getArg(), context);
-		QueryValueEvaluationStep ves;
-		try {
-			ves = precompile(node.getCondition(), context);
-		} catch (QueryEvaluationException e) {
-			// If we have a failed compilation we always return false.
-			// Which means empty. so let's short circuit that.
-//			ves = new QueryValueEvaluationStep.ConstantQueryValueEvaluationStep(BooleanLiteral.FALSE);
-			return bs -> QueryEvaluationStep.EMPTY_ITERATION;
-		}
-		return bs -> {
-			CloseableIteration<BindingSet> evaluate = null;
-			try {
-				evaluate = arg.evaluate(bs);
-				return new FilterIterator(evaluate, ves, DefaultEvaluationStrategy.this);
-			} catch (Throwable t) {
-				if (evaluate != null) {
-					evaluate.close();
-				}
-				throw t;
-			}
+		return FilterIterator.supply(node, DefaultEvaluationStrategy.this, context);
 
-		};
 	}
 
 	protected QueryEvaluationStep prepare(Order node, QueryEvaluationContext context) throws QueryEvaluationException {
@@ -939,12 +919,13 @@ protected QueryValueEvaluationStep prepare(Var var, QueryEvaluationContext conte
 			return new ConstantQueryValueEvaluationStep(value);
 		} else {
 			java.util.function.Function<BindingSet, Value> getValue = context.getValue(var.getName());
+			Predicate<BindingSet> hasValue = context.hasBinding(var.getName());
 			return bindings -> {
-				Value value1 = getValue.apply(bindings);
-				if (value1 == null) {
+				if (hasValue.test(bindings)) {
+					return getValue.apply(bindings);
+				} else {
 					throw new ValueExprEvaluationException();
 				}
-				return value1;
 			};
 		}