Close iterators

src/main/java/it/cavallium/dbengine/database/LLUtils.java

@@ -74,7 +74,6 @@ public class LLUtils {
 	private static final byte[] RESPONSE_FALSE_BUF = new byte[]{0};
 	public static final byte[][] LEXICONOGRAPHIC_ITERATION_SEEKS = new byte[256][1];
 	public static final boolean MANUAL_READAHEAD = false;
-	public static final boolean ALLOW_STATIC_OPTIONS = false;
 
 	public static final boolean FORCE_DISABLE_CHECKSUM_VERIFICATION
 			= Boolean.parseBoolean(System.getProperty("it.cavallium.dbengine.checksum.disable.force", "false"));

src/main/java/it/cavallium/dbengine/database/disk/LLLocalDictionary.java

@@ -1,6 +1,5 @@
 package it.cavallium.dbengine.database.disk;
 
-import static it.cavallium.dbengine.database.LLUtils.ALLOW_STATIC_OPTIONS;
 import static it.cavallium.dbengine.database.LLUtils.MARKER_ROCKSDB;
 import static it.cavallium.dbengine.database.LLUtils.isBoundedRange;
 import static it.cavallium.dbengine.database.LLUtils.mapList;
@@ -32,7 +31,6 @@ import it.cavallium.dbengine.database.SerializedKey;
 import it.cavallium.dbengine.database.UpdateMode;
 import it.cavallium.dbengine.database.UpdateReturnMode;
 import it.cavallium.dbengine.database.disk.rocksdb.LLReadOptions;
-import it.cavallium.dbengine.database.disk.rocksdb.LLSlice;
 import it.cavallium.dbengine.database.disk.rocksdb.LLWriteOptions;
 import it.cavallium.dbengine.database.serialization.KVSerializationFunction;
 import it.cavallium.dbengine.database.serialization.SerializationFunction;
@@ -57,12 +55,9 @@ import org.jetbrains.annotations.Nullable;
 import org.rocksdb.ColumnFamilyHandle;
 import org.rocksdb.CompactRangeOptions;
 import org.rocksdb.FlushOptions;
-import org.rocksdb.ReadOptions;
 import org.rocksdb.RocksDBException;
-import org.rocksdb.Slice;
 import org.rocksdb.Snapshot;
 import org.rocksdb.WriteBatch;
-import org.rocksdb.WriteOptions;
 
 public class LLLocalDictionary implements LLDictionary {
 
@@ -72,7 +67,6 @@ public class LLLocalDictionary implements LLDictionary {
 	static final long MAX_WRITE_BATCH_SIZE = 1024L * 1024L * 1024L; // 1GiB
 	static final int CAPPED_WRITE_BATCH_CAP = 50000; // 50K operations
 	static final int MULTI_GET_WINDOW = 16;
-	private static final LLReadOptions EMPTY_READ_OPTIONS = LLUtils.ALLOW_STATIC_OPTIONS ? new LLReadOptions() : null;
 	static final boolean PREFER_AUTO_SEEK_BOUND = false;
 	/**
 	 * It used to be false,
@@ -103,10 +97,6 @@ public class LLLocalDictionary implements LLDictionary {
 	private static final boolean USE_NUM_ENTRIES_PRECISE_COUNTER = true;
 
 	private static final byte[] FIRST_KEY = new byte[]{};
-	/**
-	 * 1KiB dummy buffer, write only, used for debugging purposes
-	 */
-	private static final ByteBuffer DUMMY_WRITE_ONLY_BYTE_BUFFER = ByteBuffer.allocateDirect(1024);
 
 	private final RocksDBColumn db;
 	private final ColumnFamilyHandle cfh;
@@ -198,38 +188,16 @@ public class LLLocalDictionary implements LLDictionary {
 		return columnName;
 	}
 
-	@NotNull
-	private LLReadOptions generateReadOptionsOrStatic(LLSnapshot snapshot) {
-		var resolved = generateReadOptions(snapshot != null ? snapshotResolver.apply(snapshot) : null, true);
-		if (resolved != null) {
-			return resolved;
-		} else {
-			return new LLReadOptions();
-		}
-	}
-
-	@Nullable
-	private LLReadOptions generateReadOptionsOrNull(LLSnapshot snapshot) {
-		return generateReadOptions(snapshot != null ? snapshotResolver.apply(snapshot) : null, false);
-	}
-
 	@NotNull
 	private LLReadOptions generateReadOptionsOrNew(LLSnapshot snapshot) {
-		var result = generateReadOptions(snapshot != null ? snapshotResolver.apply(snapshot) : null, false);
+		return generateReadOptions(snapshot != null ? snapshotResolver.apply(snapshot) : null);
-		if (result != null) {
-			return result;
-		} else {
-			return new LLReadOptions();
-		}
 	}
 
-	private LLReadOptions generateReadOptions(Snapshot snapshot, boolean orStaticOpts) {
+	private LLReadOptions generateReadOptions(Snapshot snapshot) {
 		if (snapshot != null) {
 			return new LLReadOptions().setSnapshot(snapshot);
-		} else if (ALLOW_STATIC_OPTIONS && orStaticOpts) {
-			return EMPTY_READ_OPTIONS;
 		} else {
-			return null;
+			return new LLReadOptions();
 		}
 	}
 
@@ -241,18 +209,14 @@ public class LLLocalDictionary implements LLDictionary {
 	private Buf getSync(LLSnapshot snapshot, Buf key) {
 		logger.trace(MARKER_ROCKSDB, "Reading {}", () -> toStringSafe(key));
 		try {
-			var readOptions = generateReadOptionsOrStatic(snapshot);
 			Buf result;
 			startedGet.increment();
-			try {
+			try (var readOptions = generateReadOptionsOrNew(snapshot)) {
 				var initTime = System.nanoTime();
 				result = db.get(readOptions, key);
 				getTime.record(Duration.ofNanos(System.nanoTime() - initTime));
 			} finally {
 				endedGet.increment();
-				if (readOptions != EMPTY_READ_OPTIONS) {
-					readOptions.close();
-				}
 			}
 			logger.trace(MARKER_ROCKSDB, "Read {}: {}", () -> toStringSafe(key), () -> toStringSafe(result));
 			return result;
@@ -272,7 +236,7 @@ public class LLLocalDictionary implements LLDictionary {
 				} else {
 					// Temporary resources to release after finished
 
-					try (var readOpts = LLUtils.generateCustomReadOptions(generateReadOptionsOrNull(snapshot),
+					try (var readOpts = LLUtils.generateCustomReadOptions(generateReadOptionsOrNew(snapshot),
 							true,
 							isBoundedRange(range),
 							true
@@ -304,13 +268,8 @@ public class LLLocalDictionary implements LLDictionary {
 		startedContains.increment();
 		try {
 			var result = containsTime.recordCallable(() -> {
-				var readOptions = generateReadOptionsOrStatic(snapshot);
+				try (var readOptions = generateReadOptionsOrNew(snapshot)) {
-				try {
 					return db.exists(readOptions, key);
-				} finally {
-					if (readOptions != EMPTY_READ_OPTIONS) {
-						readOptions.close();
-					}
 				}
 			});
 			assert result != null;
@@ -375,15 +334,12 @@ public class LLLocalDictionary implements LLDictionary {
 		};
 		UpdateAtomicResult result = null;
 		try {
-			var readOptions = generateReadOptionsOrStatic(null);
 			startedUpdates.increment();
-			try (var writeOptions = new LLWriteOptions()) {
+			try (var readOptions = generateReadOptionsOrNew(null);
+					var writeOptions = new LLWriteOptions()) {
 				result = updateTime.recordCallable(() -> db.updateAtomic(readOptions, writeOptions, key, updater, returnMode));
 			} finally {
 				endedUpdates.increment();
-				if (readOptions != EMPTY_READ_OPTIONS) {
-					readOptions.close();
-				}
 			}
 			assert result != null;
 			return switch (updateReturnMode) {
@@ -410,18 +366,19 @@ public class LLLocalDictionary implements LLDictionary {
 					+ "safe atomic operations");
 		}
 
-		UpdateAtomicResultDelta result = null;
+		UpdateAtomicResultDelta result;
 		try {
-			var readOptions = generateReadOptionsOrStatic(null);
 			startedUpdates.increment();
-			try (var writeOptions = new LLWriteOptions()) {
+			try (var readOptions = generateReadOptionsOrNew(null);
-				result = updateTime.recordCallable(() ->
+					var writeOptions = new LLWriteOptions()) {
-						(UpdateAtomicResultDelta) db.updateAtomic(readOptions, writeOptions, key, updater, DELTA));
+				result = updateTime.recordCallable(() -> (UpdateAtomicResultDelta) db.updateAtomic(readOptions,
+						writeOptions,
+						key,
+						updater,
+						DELTA
+				));
 			} finally {
 				endedUpdates.increment();
-				if (readOptions != EMPTY_READ_OPTIONS) {
-					readOptions.close();
-				}
 			}
 			assert result != null;
 			return result.delta();
@@ -462,13 +419,8 @@ public class LLLocalDictionary implements LLDictionary {
 				case PREVIOUS_VALUE -> {
 					assert !LLUtils.isInNonBlockingThread() : "Called getPreviousData in a nonblocking thread";
 					Buf result;
-					var readOptions = generateReadOptionsOrStatic(null);
+					try (var readOptions = generateReadOptionsOrNew(null)) {
-					try {
 						result = db.get(readOptions, key);
-					} finally {
-						if (readOptions != EMPTY_READ_OPTIONS) {
-							readOptions.close();
-						}
 					}
 					logger.trace(MARKER_ROCKSDB, "Read {}: {}", () -> toStringSafe(key), () -> toStringSafe(result));
 					yield result;
@@ -532,31 +484,24 @@ public class LLLocalDictionary implements LLDictionary {
 						}
 						ArrayList<MappedInput<K>> mappedInputs;
 						{
-							var readOptions = generateReadOptionsOrStatic(null);
+							try (var readOptions = generateReadOptionsOrNew(null)) {
-							try {
 								var inputs = db.multiGetAsList(readOptions, mapList(keyBufsWindow, Buf::asArray));
 								mappedInputs = new ArrayList<>(inputs.size());
 								for (int i = 0; i < inputs.size(); i++) {
 									var val = inputs.get(i);
 									if (val != null) {
 										inputs.set(i, null);
-										mappedInputs.add(new MappedInput<>(
+										mappedInputs.add(new MappedInput<>(entriesWindow.get(i).key(),
-												entriesWindow.get(i).key(),
 												keyBufsWindow.get(i),
 												OptionalBuf.of(Buf.wrap(val))
 										));
 									} else {
-										mappedInputs.add(new MappedInput<>(
+										mappedInputs.add(new MappedInput<>(entriesWindow.get(i).key(),
-												entriesWindow.get(i).key(),
 												keyBufsWindow.get(i),
 												OptionalBuf.empty()
 										));
 									}
 								}
-							} finally {
-								if (readOptions != EMPTY_READ_OPTIONS) {
-									readOptions.close();
-								}
 							}
 						}
 						var updatedValuesToWrite = new ArrayList<Buf>(mappedInputs.size());
@@ -640,7 +585,7 @@ public class LLLocalDictionary implements LLDictionary {
 			boolean smallRange) {
 		return new LLLocalEntryReactiveRocksIterator(db,
 				range,
-				() -> generateReadOptionsOrNull(snapshot),
+				() -> generateReadOptionsOrNew(snapshot),
 				reverse,
 				smallRange
 		).stream();
@@ -651,7 +596,7 @@ public class LLLocalDictionary implements LLDictionary {
 		return new LLLocalGroupedEntryReactiveRocksIterator(db,
 				prefixLength,
 				range,
-				() -> generateReadOptionsOrNull(snapshot),
+				() -> generateReadOptionsOrNew(snapshot),
 				smallRange
 		).stream();
 	}
@@ -676,7 +621,7 @@ public class LLLocalDictionary implements LLDictionary {
 		return new LLLocalGroupedKeyReactiveRocksIterator(db,
 				prefixLength,
 				range,
-				() -> generateReadOptionsOrNull(snapshot),
+				() -> generateReadOptionsOrNew(snapshot),
 				smallRange
 		).stream();
 	}
@@ -729,7 +674,7 @@ public class LLLocalDictionary implements LLDictionary {
 		return new LLLocalKeyPrefixReactiveRocksIterator(db,
 				prefixLength,
 				range,
-				() -> generateReadOptionsOrNull(snapshot),
+				() -> generateReadOptionsOrNew(snapshot),
 				true,
 				smallRange
 		).stream();
@@ -753,7 +698,7 @@ public class LLLocalDictionary implements LLDictionary {
 			boolean smallRange) {
 		return new LLLocalKeyReactiveRocksIterator(db,
 				range,
-				() -> generateReadOptionsOrNull(snapshot),
+				() -> generateReadOptionsOrNew(snapshot),
 				reverse,
 				smallRange
 		).stream();
@@ -950,7 +895,7 @@ public class LLLocalDictionary implements LLDictionary {
 			if (range.isAll()) {
 				return fast ? fastSizeAll(snapshot) : exactSizeAll(snapshot);
 			} else {
-				try (var readOpts = LLUtils.generateCustomReadOptions(generateReadOptionsOrNull(snapshot),
+				try (var readOpts = LLUtils.generateCustomReadOptions(generateReadOptionsOrNew(snapshot),
 						false,
 						isBoundedRange(range),
 						false
@@ -985,7 +930,7 @@ public class LLLocalDictionary implements LLDictionary {
 	public LLEntry getOne(@Nullable LLSnapshot snapshot, LLRange range) {
 		try {
 			assert !LLUtils.isInNonBlockingThread() : "Called getOne in a nonblocking thread";
-			try (var readOpts = LLUtils.generateCustomReadOptions(generateReadOptionsOrNull(snapshot), true, true, true)) {
+			try (var readOpts = LLUtils.generateCustomReadOptions(generateReadOptionsOrNew(snapshot), true, true, true)) {
 				try (var rocksIterator = db.newIterator(readOpts, range.getMin(), range.getMax())) {
 					if (!LLLocalDictionary.PREFER_AUTO_SEEK_BOUND && range.hasMin()) {
 						rocksIterator.seekTo(range.getMin());
@@ -1010,7 +955,7 @@ public class LLLocalDictionary implements LLDictionary {
 	public Buf getOneKey(@Nullable LLSnapshot snapshot, LLRange range) {
 		try {
 			assert !LLUtils.isInNonBlockingThread() : "Called getOneKey in a nonblocking thread";
-			try (var readOpts = LLUtils.generateCustomReadOptions(generateReadOptionsOrNull(snapshot), true, true, true)) {
+			try (var readOpts = LLUtils.generateCustomReadOptions(generateReadOptionsOrNew(snapshot), true, true, true)) {
 				try (var rocksIterator = db.newIterator(readOpts, range.getMin(), range.getMax())) {
 					if (!LLLocalDictionary.PREFER_AUTO_SEEK_BOUND && range.hasMin()) {
 						rocksIterator.seekTo(range.getMin());
@@ -1075,7 +1020,7 @@ public class LLLocalDictionary implements LLDictionary {
 		if (LLUtils.isInNonBlockingThread()) {
 			throw new UnsupportedOperationException("Called exactSizeAll in a nonblocking thread");
 		}
-		try (var readOpts = LLUtils.generateCustomReadOptions(generateReadOptionsOrNull(snapshot), false, false, false)) {
+		try (var readOpts = LLUtils.generateCustomReadOptions(generateReadOptionsOrNew(snapshot), false, false, false)) {
 			if (LLUtils.MANUAL_READAHEAD) {
 				readOpts.setReadaheadSize(128 * 1024); // 128KiB
 			}

src/main/java/it/cavallium/dbengine/database/disk/LLLocalGroupedReactiveRocksIterator.java

@@ -53,21 +53,12 @@ public abstract class LLLocalGroupedReactiveRocksIterator<T> {
 	}
 
 	public final Stream<List<T>> stream() {
-		var readOptions = generateCustomReadOptions(this.readOptions.get(), canFillCache, isBoundedRange(range), smallRange);
+		return StreamUtils.<List<T>>streamWhileNonNull(() -> {
+			try (var readOptions = generateCustomReadOptions(this.readOptions.get(), canFillCache, isBoundedRange(range), smallRange);
+					var rocksIterator = db.newRocksIterator(readOptions, range, false)) {
 				if (logger.isTraceEnabled()) {
 					logger.trace(MARKER_ROCKSDB, "Range {} started", LLUtils.toStringSafe(range));
 				}
-
-		RocksIteratorObj rocksIterator;
-		try {
-			rocksIterator = db.newRocksIterator(readOptions, range, false);
-		} catch (RocksDBException e) {
-			readOptions.close();
-			throw new DBException("Failed to iterate the range", e);
-		}
-
-		return StreamUtils.<List<T>>streamWhileNonNull(() -> {
-			try {
 				ObjectArrayList<T> values = new ObjectArrayList<>();
 				Buf firstGroupKey = null;
 				while (rocksIterator.isValid()) {
@@ -113,9 +104,6 @@ public abstract class LLLocalGroupedReactiveRocksIterator<T> {
 				}
 				throw new CompletionException(new DBException("Range failed", ex));
 			}
-		}).onClose(() -> {
-			rocksIterator.close();
-			readOptions.close();
 		});
 	}
 

src/main/java/it/cavallium/dbengine/database/disk/LLLocalKeyPrefixReactiveRocksIterator.java

@@ -50,16 +50,12 @@ public class LLLocalKeyPrefixReactiveRocksIterator {
 
 
 	public Stream<Buf> stream() {
-		try {
+		return streamWhileNonNull(() -> {
-			var readOptions
+			try (var readOptions = generateCustomReadOptions(this.readOptions.get(), canFillCache, isBoundedRange(range), smallRange);
-					= generateCustomReadOptions(this.readOptions.get(), canFillCache, isBoundedRange(range), smallRange);
+					var rocksIterator = db.newRocksIterator(readOptions, range, false)) {
 				if (logger.isTraceEnabled()) {
 					logger.trace(MARKER_ROCKSDB, "Range {} started", LLUtils.toStringSafe(range));
 				}
-			var rocksIterator = db.newRocksIterator(readOptions, range, false);
-
-			return streamWhileNonNull(() -> {
-				try {
 				Buf firstGroupKey = null;
 				while (rocksIterator.isValid()) {
 					// Note that the underlying array is subject to changes!
@@ -108,13 +104,7 @@ public class LLLocalKeyPrefixReactiveRocksIterator {
 				}
 				throw new CompletionException(new DBException("Range failed", ex));
 			}
-			}).onClose(() -> {
-				rocksIterator.close();
-				readOptions.close();
 		});
-		} catch (RocksDBException e) {
-			throw new DBException("Failed to open stream", e);
-		}
 	}
 
 }

src/main/java/it/cavallium/dbengine/database/disk/LLLocalMigrationReactiveRocksIterator.java

@@ -34,14 +34,9 @@ public final class LLLocalMigrationReactiveRocksIterator {
 	}
 
 	public Stream<LLEntry> stream() {
-		var readOptions = generateCustomReadOptions(this.readOptions.get(), false, false, false);
-		RocksIteratorObj rocksIterator;
-		try {
-			rocksIterator = db.newRocksIterator(readOptions, range, false);
-		} catch (RocksDBException e) {
-			throw new DBException("Failed to open iterator", e);
-		}
 		return streamWhileNonNull(() -> {
+			try (var readOptions = generateCustomReadOptions(this.readOptions.get(), false, false, false);
+					var rocksIterator = db.newRocksIterator(readOptions, range, false)) {
 				if (rocksIterator.isValid()) {
 					var key = rocksIterator.keyBuf().copy();
 					var value = rocksIterator.valueBuf().copy();
@@ -50,9 +45,9 @@ public final class LLLocalMigrationReactiveRocksIterator {
 				} else {
 					return null;
 				}
-		}).onClose(() -> {
+			} catch (RocksDBException e) {
-			rocksIterator.close();
+				throw new DBException("Failed to open iterator", e);
-			readOptions.close();
+			}
 		});
 	}
 }

src/main/java/it/cavallium/dbengine/database/disk/LLLocalReactiveRocksIterator.java

@@ -48,21 +48,12 @@ public abstract class LLLocalReactiveRocksIterator<T> {
 	}
 
 	public final Stream<T> stream() {
-		var readOptions = generateCustomReadOptions(this.readOptions.get(), true, isBoundedRange(range), smallRange);
+		return streamWhileNonNull(() -> {
+			try (var readOptions = generateCustomReadOptions(this.readOptions.get(), true, isBoundedRange(range), smallRange);
+					var rocksIterator = db.newRocksIterator(readOptions, range, reverse)) {
 				if (logger.isTraceEnabled()) {
 					logger.trace(MARKER_ROCKSDB, "Range {} started", LLUtils.toStringSafe(range));
 				}
-
-		RocksIteratorObj rocksIterator;
-		try {
-			rocksIterator = db.newRocksIterator(readOptions, range, reverse);
-		} catch (RocksDBException e) {
-			readOptions.close();
-			throw new DBException("Failed to iterate the range", e);
-		}
-
-		return streamWhileNonNull(() -> {
-			try {
 				if (rocksIterator.isValid()) {
 					// Note that the underlying array is subject to changes!
 					Buf key;
@@ -102,9 +93,6 @@ public abstract class LLLocalReactiveRocksIterator<T> {
 				}
 				throw new CompletionException(ex);
 			}
-		}).onClose(() -> {
-			rocksIterator.close();
-			readOptions.close();
 		});
 	}