diff --git a/core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/LmdbContextIdIterator.java b/core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/LmdbContextIdIterator.java index 5e1a2269994..5a291ccfb23 100644 --- a/core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/LmdbContextIdIterator.java +++ b/core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/LmdbContextIdIterator.java @@ -45,8 +45,6 @@ class LmdbContextIdIterator implements Closeable { private final long txn; - private final int dbi; - private volatile boolean closed = false; private final MDBVal keyData; @@ -55,8 +53,6 @@ class LmdbContextIdIterator implements Closeable { private ByteBuffer minKeyBuf; - private int lastResult; - private final long[] record = new long[1]; private boolean fetchNext = false; @@ -70,7 +66,6 @@ class LmdbContextIdIterator implements Closeable { this.keyData = pool.getVal(); this.valueData = pool.getVal(); - this.dbi = dbi; this.txnRef = txnRef; this.txnLockManager = txnRef.lockManager(); @@ -102,6 +97,7 @@ public long[] next() { throw new SailException(e); } try { + int lastResult; if (txnRefVersion != txnRef.version()) { // cursor must be renewed E(mdb_cursor_renew(txn, cursor)); diff --git a/core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/LmdbRecordIterator.java b/core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/LmdbRecordIterator.java index 68c5352a73b..a6152d1a98f 100644 --- a/core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/LmdbRecordIterator.java +++ b/core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/LmdbRecordIterator.java @@ -75,8 +75,6 @@ class LmdbRecordIterator implements RecordIterator { private ByteBuffer maxKeyBuf; - private int lastResult; - private final long[] quad; private final long[] originalQuad; @@ -153,6 +151,7 @@ public long[] next() { return null; } + int lastResult; if (txnRefVersion != txnRef.version()) { // TODO: None of the tests in the LMDB Store cover this case! // cursor must be renewed diff --git a/core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/LmdbSailStore.java b/core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/LmdbSailStore.java index 6d87d4bc33e..2bdff8fc2b7 100644 --- a/core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/LmdbSailStore.java +++ b/core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/LmdbSailStore.java @@ -83,7 +83,7 @@ class LmdbSailStore implements SailStore { * * @param Type of elements within this buffer */ - final class CircularBuffer { + static final class CircularBuffer { private final T[] elements; private volatile int head = 0; @@ -139,7 +139,6 @@ interface Operation { class AddQuadOperation implements Operation { long s, p, o, c; boolean explicit; - Resource context; @Override public void execute() throws IOException { @@ -600,7 +599,6 @@ public void approveAll(Set approved, Set approvedContexts) q.p = valueStore.storeValue(pred); q.o = valueStore.storeValue(obj); q.c = context == null ? 0 : valueStore.storeValue(context); - q.context = context; q.explicit = explicit; if (multiThreadingActive) { @@ -744,7 +742,6 @@ private void addStatement(Resource subj, IRI pred, Value obj, boolean explicit, q.p = valueStore.storeValue(pred); q.o = valueStore.storeValue(obj); q.c = context == null ? 0 : valueStore.storeValue(context); - q.context = context; q.explicit = explicit; if (multiThreadingActive) { diff --git a/core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/MemoryOverflowModel.java b/core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/MemoryOverflowModel.java index 861a12233b4..e22da38664b 100644 --- a/core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/MemoryOverflowModel.java +++ b/core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/MemoryOverflowModel.java @@ -31,7 +31,6 @@ abstract class MemoryOverflowModel extends AbstractMemoryOverflowModel { final Logger logger = LoggerFactory.getLogger(MemoryOverflowModel.class); - private final boolean verifyAdditions; private transient File dataDir; @@ -39,7 +38,6 @@ abstract class MemoryOverflowModel extends AbstractMemoryOverflowModel extends AbstractSet { private static final Logger logger = LoggerFactory.getLogger(PersistentSet.class); - private PersistentSetFactory factory; + private final PersistentSetFactory factory; private final int dbi; private int size; @@ -192,7 +192,7 @@ private class ElementIterator implements Iterator { private final StampedLongAdderLockManager txnLockManager; private Txn txnRef; - private long txnRefVersion; + private final long txnRefVersion; private T next; private T current; diff --git a/core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/PersistentSetFactory.java b/core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/PersistentSetFactory.java index a7e04daea94..06eea13ffed 100644 --- a/core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/PersistentSetFactory.java +++ b/core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/PersistentSetFactory.java @@ -55,7 +55,7 @@ class PersistentSetFactory { TxnManager txnManager; long writeTxn; PointerBuffer writeTxnPp = PointerBuffer.allocateDirect(1); - private int defaultDbi; + private final int defaultDbi; private long mapSize = 1048576; // 1 MiB private long pageSize; diff --git a/core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/TripleStore.java b/core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/TripleStore.java index 059bb51e666..15edbb09b4a 100644 --- a/core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/TripleStore.java +++ b/core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/TripleStore.java @@ -163,9 +163,8 @@ class TripleStore implements Closeable { private final ValueStore valueStore; private long env; - private int contextsDbi; + private final int contextsDbi; private int pageSize; - private final boolean forceSync; private final boolean autoGrow; private long mapSize; private long writeTxn; @@ -196,7 +195,7 @@ public int compareRegion(ByteBuffer array1, int startIdx1, ByteBuffer array2, in TripleStore(File dir, LmdbStoreConfig config, ValueStore valueStore) throws IOException, SailException { this.dir = dir; - this.forceSync = config.getForceSync(); + boolean forceSync = config.getForceSync(); this.autoGrow = config.getAutoGrow(); this.valueStore = valueStore; diff --git a/core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/TxnManager.java b/core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/TxnManager.java index cf3d486b6fa..7b5ec043da3 100644 --- a/core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/TxnManager.java +++ b/core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/TxnManager.java @@ -162,7 +162,7 @@ enum Mode { class Txn implements Closeable, AutoCloseable { - private long txn; + private final long txn; private long version; Txn(long txn) { diff --git a/core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/TxnRecordCache.java b/core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/TxnRecordCache.java index 9974f6a2df2..374e395dcd9 100644 --- a/core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/TxnRecordCache.java +++ b/core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/TxnRecordCache.java @@ -179,11 +179,9 @@ protected class RecordCacheIterator { private final MDBVal valueData = MDBVal.malloc(); private long txn; private final long cursor; - private final int dbi; private final long[] quad = new long[4]; protected RecordCacheIterator(int dbi) throws IOException { - this.dbi = dbi; try (MemoryStack stack = MemoryStack.stackPush()) { PointerBuffer pp = stack.mallocPointer(1); diff --git a/core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/ValueStore.java b/core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/ValueStore.java index d068f67db98..e6174ae9230 100644 --- a/core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/ValueStore.java +++ b/core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/ValueStore.java @@ -493,9 +493,6 @@ LmdbValue cachedValue(long id) { return null; } - long prevId; - long prevPrevId; - /** * Cache value by ID. *

diff --git a/core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/util/GroupMatcher.java b/core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/util/GroupMatcher.java index 016090b949f..1fcaf80dda1 100644 --- a/core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/util/GroupMatcher.java +++ b/core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/util/GroupMatcher.java @@ -51,7 +51,6 @@ public GroupMatcher(byte[] valueArray, boolean[] shouldMatch) { this.cmp0 = Bytes.capturedComparator(valueArray, 0, len); } else { this.cmp0 = NULL_REGION_COMPARATOR; - ; } baseOffset += len;