working on new ID based join iterator

Author: hmottestad

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

@@ -85,31 +85,26 @@ RecordIterator get(long[] quadReuse, ByteBuffer minKeyBuf, ByteBuffer maxKeyBuf,
 	private int lastResult;
 	private boolean closed = true;
 
-	private RecordIterator fallback;
-	private FallbackSupplier fallbackSupplier;
-
 	LmdbDupRecordIterator(DupIndex index, long subj, long pred,
-			boolean explicit, Txn txnRef, FallbackSupplier fallbackSupplier) throws IOException {
-		initialize(index, subj, pred, explicit, txnRef, null, fallbackSupplier);
+			boolean explicit, Txn txnRef) throws IOException {
+		initialize(index, subj, pred, explicit, txnRef, null);
 	}
 
 	LmdbDupRecordIterator(DupIndex index, long subj, long pred,
-			boolean explicit, Txn txnRef, long[] quadReuse, FallbackSupplier fallbackSupplier) throws IOException {
-		initialize(index, subj, pred, explicit, txnRef, quadReuse, fallbackSupplier);
+			boolean explicit, Txn txnRef, long[] quadReuse) throws IOException {
+		initialize(index, subj, pred, explicit, txnRef, quadReuse);
 	}
 
-	void initialize(DupIndex index, long subj, long pred, boolean explicit, Txn txnRef, long[] quadReuse,
-			FallbackSupplier fallbackSupplier) throws IOException {
-		if (!closed || fallback != null) {
+	void initialize(DupIndex index, long subj, long pred, boolean explicit, Txn txnRef, long[] quadReuse)
+			throws IOException {
+		if (!closed) {
 			throw new IllegalStateException("Cannot initialize LMDB dup iterator while it is open");
 		}
 
 		this.index = index;
 		this.dupDbi = index.getDupDB(explicit);
 		this.txnRef = txnRef;
 		this.txnLockManager = txnRef.lockManager();
-		this.fallbackSupplier = fallbackSupplier;
-		this.fallback = null;
 
 		this.prefixSubj = subj;
 		this.prefixPred = pred;
@@ -165,21 +160,16 @@ void initialize(DupIndex index, long subj, long pred, boolean explicit, Txn txnR
 			}
 			if (!positioned) {
 				closeInternal(false);
-				fallbackIterator = createFallback();
+				// TODO: We must be empty????
 			}
 		} finally {
 			txnLockManager.unlockRead(readStamp);
 		}
 
-		this.fallback = fallbackIterator;
 	}
 
 	@Override
 	public long[] next() {
-		if (fallback != null) {
-			return fallback.next();
-		}
-
 		long readStamp;
 		try {
 			readStamp = txnLockManager.readLock();
@@ -402,14 +392,7 @@ private void closeInternal(boolean maybeCalledAsync) {
 
 	@Override
 	public void close() {
-		if (fallback != null) {
-			fallback.close();
-			fallback = null;
-			fallbackSupplier = null;
-		} else {
-			closeInternal(true);
-			fallbackSupplier = null;
-		}
+		closeInternal(true);
 		txnLockManager = null;
 		txnRef = null;
 	}
@@ -433,10 +416,4 @@ private long openCursor(long txn, int dbi, boolean tryReuse) throws IOException
 		}
 	}
 
-	private RecordIterator createFallback() throws IOException {
-		if (fallbackSupplier == null) {
-			return null;
-		}
-		return fallbackSupplier.get(quad, null, null, null);
-	}
 }

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

@@ -618,15 +618,7 @@ public RecordIterator getTriples(Txn txn, long subj, long pred, long obj, long c
 		TripleIndex index = getBestIndex(subj, pred, obj, context);
 		// System.out.println("get triples: " + Arrays.asList(subj, pred, obj,context));
 		boolean doRangeSearch = index.getPatternScore(subj, pred, obj, context) > 0;
-		LmdbDupRecordIterator.FallbackSupplier fallbackSupplier = (quad, minBuf, maxBuf, reuse) -> {
-			if (reuse != null) {
-				reuse.initialize(index, null, doRangeSearch, subj, pred, obj, context, explicit, txn, quad, minBuf,
-						maxBuf);
-				return reuse;
-			}
-			return new LmdbRecordIterator(index, null, doRangeSearch, subj, pred, obj, context, explicit, txn, quad,
-					minBuf, maxBuf);
-		};
+
 		LmdbRecordIterator recordReuse = iteratorReuse instanceof LmdbRecordIterator
 				? (LmdbRecordIterator) iteratorReuse
 				: null;
@@ -635,17 +627,35 @@ public RecordIterator getTriples(Txn txn, long subj, long pred, long obj, long c
 				: null;
 		if (dupsortRead && subjectPredicateIndex != null && subj >= 0 && pred >= 0 && obj == -1 && context == -1) {
 			assert context == -1 && obj == -1 : "subject-predicate index can only be used for (s,p,?,?) patterns";
+
+//			LmdbDupRecordIterator.FallbackSupplier fallbackSupplier = (quad, minBuf, maxBuf, reuse) -> {
+//				if (reuse != null) {
+//					reuse.initialize(index, null, doRangeSearch, subj, pred, obj, context, explicit, txn, quad, minBuf,
+//							maxBuf);
+//					return reuse;
+//				}
+//				return new LmdbRecordIterator(index, null, doRangeSearch, subj, pred, obj, context, explicit, txn, quad,
+//						minBuf, maxBuf);
+//			};
+
 			// Use SP dup iterator, but union with the standard iterator to guard against any edge cases
 			// in SP storage/retrieval; de-duplicate at the record level.
 			if (dupReuse != null) {
-				dupReuse.initialize(subjectPredicateIndex, subj, pred, explicit, txn, quadReuse, fallbackSupplier);
+				dupReuse.initialize(subjectPredicateIndex, subj, pred, explicit, txn, quadReuse);
 				return dupReuse;
 			}
-			return new LmdbDupRecordIterator(subjectPredicateIndex, subj, pred, explicit, txn, quadReuse,
-					fallbackSupplier);
+			return new LmdbDupRecordIterator(subjectPredicateIndex, subj, pred, explicit, txn, quadReuse);
 		}
-		return getTriplesUsingIndex(txn, subj, pred, obj, context, explicit, index, doRangeSearch, fallbackSupplier,
-				minKeyBuf, maxKeyBuf, quadReuse, recordReuse);
+
+		if (recordReuse != null) {
+			recordReuse.initialize(index, null, doRangeSearch, subj, pred, obj, context, explicit, txn, quadReuse,
+					minKeyBuf,
+					maxKeyBuf);
+			return recordReuse;
+		}
+		return new LmdbRecordIterator(index, null, doRangeSearch, subj, pred, obj, context, explicit, txn, quadReuse,
+				minKeyBuf, maxKeyBuf);
+
 	}
 
 	boolean hasTriples(boolean explicit) throws IOException {

core/sail/lmdb/src/test/java/org/eclipse/rdf4j/sail/lmdb/LmdbIdJoinEvaluationTest.java

@@ -54,8 +54,6 @@
 import org.eclipse.rdf4j.sail.base.SailDataset;
 import org.eclipse.rdf4j.sail.base.SailDatasetTripleSource;
 import org.eclipse.rdf4j.sail.base.SailSource;
-import org.eclipse.rdf4j.sail.lmdb.LmdbEvaluationDataset;
-import org.eclipse.rdf4j.sail.lmdb.LmdbEvaluationDataset.KeyRangeBuffers;
 import org.eclipse.rdf4j.sail.lmdb.join.LmdbIdJoinQueryEvaluationStep;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;