Skip to content

Merge main into develop #5377

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hmottestad merged 3 commits into from
Jul 17, 2025
Merged

Merge main into develop #5377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d4c6ab4
GH-5374 check if the LmdbRecordIterator is closed after getting the r…
hmottestad Jul 16, 2025
e9719f7
code cleanup
hmottestad Jul 17, 2025
400a468
GH-5374 check if the LmdbRecordIterator is closed after getting the r…
hmottestad Jul 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions core/sail/base/src/main/java/org/eclipse/rdf4j/sail/TripleSourceIterationWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,6 @@ public boolean hasNext() throws QueryEvaluationException {
} catch (QueryEvaluationException e) {
throw e;
} catch (Exception e) {
if (e instanceof InterruptedException) {
Thread.currentThread().interrupt();
}
throw new QueryEvaluationException(e);
}
}
Expand All @@ -75,9 +72,6 @@ public T next() throws QueryEvaluationException {
} catch (IllegalStateException | QueryEvaluationException e) {
throw e;
} catch (Exception e) {
if (e instanceof InterruptedException) {
Thread.currentThread().interrupt();
}
throw new QueryEvaluationException(e);
}
}
Expand Down
9 changes: 8 additions & 1 deletion core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/LmdbRecordIterator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,20 @@
import java.nio.ByteBuffer;
import java.util.concurrent.locks.StampedLock;

import org.eclipse.rdf4j.sail.SailException;
import org.eclipse.rdf4j.sail.lmdb.TripleStore.TripleIndex;
import org.eclipse.rdf4j.sail.lmdb.TxnManager.Txn;
import org.eclipse.rdf4j.sail.lmdb.Varint.GroupMatcher;
import org.lwjgl.PointerBuffer;
import org.lwjgl.system.MemoryStack;
import org.lwjgl.util.lmdb.MDBVal;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
* A record iterator that wraps a native LMDB iterator.
*/
class LmdbRecordIterator implements RecordIterator {
private static final Logger log = LoggerFactory.getLogger(LmdbRecordIterator.class);
private final Pool pool;

private final TripleIndex index;
Expand Down Expand Up @@ -126,6 +128,11 @@ class LmdbRecordIterator implements RecordIterator {
public long[] next() {
long stamp = txnLock.readLock();
try {
if (closed) {
log.debug("Calling next() on an LmdbRecordIterator that is already closed, returning null");
return null;
}

if (txnRefVersion != txnRef.version()) {
// cursor must be renewed
mdb_cursor_renew(txn, cursor);
Expand Down
2 changes: 0 additions & 2 deletions core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/LmdbUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

import static org.lwjgl.system.MemoryStack.stackPush;
import static org.lwjgl.system.MemoryUtil.NULL;
import static org.lwjgl.util.lmdb.LMDB.MDB_DBS_FULL;
import static org.lwjgl.util.lmdb.LMDB.MDB_KEYEXIST;
import static org.lwjgl.util.lmdb.LMDB.MDB_NOTFOUND;
import static org.lwjgl.util.lmdb.LMDB.MDB_RDONLY;
Expand All @@ -32,7 +31,6 @@
import java.nio.ByteBuffer;
import java.nio.IntBuffer;
import java.util.Comparator;
import java.util.concurrent.ConcurrentHashMap;

import org.lwjgl.PointerBuffer;
import org.lwjgl.system.MemoryStack;
Expand Down
1 change: 0 additions & 1 deletion core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/TxnRecordCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
import java.nio.file.Path;

import org.apache.commons.io.FileUtils;
import org.eclipse.rdf4j.sail.SailException;
import org.lwjgl.PointerBuffer;
import org.lwjgl.system.MemoryStack;
import org.lwjgl.util.lmdb.MDBStat;
Expand Down
2 changes: 1 addition & 1 deletion core/sail/lmdb/src/test/java/org/eclipse/rdf4j/sail/lmdb/benchmark/QueryBenchmark.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public class QueryBenchmark {

public static void main(String[] args) throws RunnerException {
Options opt = new OptionsBuilder()
.include("QueryBenchmark") // adapt to run other benchmark tests
.include("QueryBenchmark.*") // adapt to run other benchmark tests
.forks(1)
.build();

Expand Down
Loading