working on new ID based join iterator

Author: hmottestad

core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/IdBindingInfo.java

@@ -11,6 +11,7 @@
 package org.eclipse.rdf4j.sail.lmdb;
 
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -101,6 +102,82 @@ public long getId(long[] record, String varName) {
 		return record[i];
 	}
 
+	public long[] createInitialBinding(BindingSet bindings, ValueStore valueStore) throws QueryEvaluationException {
+		long[] binding = new long[size()];
+		Arrays.fill(binding, LmdbValue.UNKNOWN_ID);
+		if (bindings == null || bindings.isEmpty()) {
+			return binding;
+		}
+
+		if (prepared != null) {
+			for (Entry entry : prepared) {
+				Value value = entry.getter.apply(bindings);
+				if (value == null) {
+					continue;
+				}
+				long id = resolveId(valueStore, value);
+				if (id == LmdbValue.UNKNOWN_ID) {
+					return null;
+				}
+				binding[entry.recordIndex] = id;
+			}
+			return binding;
+		}
+
+		if (bindings instanceof ArrayBindingSet) {
+			ArrayBindingSet abs = (ArrayBindingSet) bindings;
+			for (Map.Entry<String, Integer> entry : indexByVar.entrySet()) {
+				Function<ArrayBindingSet, Value> getter = abs.getDirectGetValue(entry.getKey());
+				if (getter == null) {
+					continue;
+				}
+				Value value = getter.apply(abs);
+				if (value == null) {
+					continue;
+				}
+				long id = resolveId(valueStore, value);
+				if (id == LmdbValue.UNKNOWN_ID) {
+					return null;
+				}
+				binding[entry.getValue()] = id;
+			}
+			return binding;
+		}
+
+		for (Map.Entry<String, Integer> entry : indexByVar.entrySet()) {
+			Value value = bindings.getValue(entry.getKey());
+			if (value == null) {
+				continue;
+			}
+			long id = resolveId(valueStore, value);
+			if (id == LmdbValue.UNKNOWN_ID) {
+				return null;
+			}
+			binding[entry.getValue()] = id;
+		}
+		return binding;
+	}
+
+	private static long resolveId(ValueStore valueStore, Value value) throws QueryEvaluationException {
+		if (value == null) {
+			return LmdbValue.UNKNOWN_ID;
+		}
+		if (value instanceof LmdbValue) {
+			LmdbValue lmdbValue = (LmdbValue) value;
+			if (lmdbValue.getValueStoreRevision().getValueStore() == valueStore) {
+				long id = lmdbValue.getInternalID();
+				if (id != LmdbValue.UNKNOWN_ID) {
+					return id;
+				}
+			}
+		}
+		try {
+			return valueStore.getId(value);
+		} catch (IOException e) {
+			throw new QueryEvaluationException(e);
+		}
+	}
+
 	@Override
 	public boolean applyRecord(long[] record, MutableBindingSet target, ValueStore valueStore)
 			throws QueryEvaluationException {

core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/join/LmdbIdBGPQueryEvaluationStep.java

@@ -147,7 +147,7 @@ public CloseableIteration<BindingSet> evaluate(BindingSet bindings) {
 			}
 
 			ValueStore valueStore = dataset.getValueStore();
-			long[] initialBinding = createInitialBinding(finalInfo, bindings, valueStore);
+			long[] initialBinding = finalInfo.createInitialBinding(bindings, valueStore);
 			if (initialBinding == null) {
 				return new EmptyIteration<>();
 			}
@@ -175,51 +175,6 @@ private LmdbEvaluationDataset resolveDataset() {
 				.orElseThrow(() -> new IllegalStateException("No active LMDB dataset available for join evaluation"));
 	}
 
-	private static long[] createInitialBinding(IdBindingInfo info, BindingSet bindings, ValueStore valueStore)
-			throws QueryEvaluationException {
-		long[] binding = new long[info.size()];
-		Arrays.fill(binding, LmdbValue.UNKNOWN_ID);
-		if (bindings == null || bindings.isEmpty()) {
-			return binding;
-		}
-		for (String name : info.getVariableNames()) {
-			Value value = bindings.getValue(name);
-			if (value == null) {
-				continue;
-			}
-			long id = resolveId(valueStore, value);
-			if (id == LmdbValue.UNKNOWN_ID) {
-				return null;
-			}
-			int index = info.getIndex(name);
-			if (index >= 0) {
-				binding[index] = id;
-			}
-		}
-		return binding;
-	}
-
-	private static long resolveId(ValueStore valueStore, Value value) throws QueryEvaluationException {
-		if (value == null) {
-			return LmdbValue.UNKNOWN_ID;
-		}
-		if (value instanceof LmdbValue) {
-			LmdbValue lmdbValue = (LmdbValue) value;
-			if (lmdbValue.getValueStoreRevision().getValueStore() == valueStore) {
-				long id = lmdbValue.getInternalID();
-				if (id != LmdbValue.UNKNOWN_ID) {
-					return id;
-				}
-			}
-		}
-		try {
-			long id = valueStore.getId(value);
-			return id;
-		} catch (IOException e) {
-			throw new QueryEvaluationException(e);
-		}
-	}
-
 	public static boolean flattenBGP(TupleExpr expr, List<StatementPattern> out) {
 		if (expr instanceof StatementPattern) {
 			out.add((StatementPattern) expr);