andreacavalli/CavalliumDBEngine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

StreamUtils Try-Catch for streams, Remove old unused flags

Browse Source
This commit is contained in:
Andrea Cavalli 2023-05-24 01:44:06 +02:00
parent bee2fe1bf5
commit 2a817cbc58
9 changed files with 317 additions and 200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/it/cavallium/dbengine/database/collections/DatabaseMapDictionary.java
View File

@ -1,5 +1,7 @@
package it.cavallium.dbengine.database.collections;
import static it.cavallium.dbengine.utils.StreamUtils.resourceStream;
import it.cavallium.buffer.Buf;
import it.cavallium.buffer.BufDataInput;
import it.cavallium.buffer.BufDataOutput;
@ -535,8 +537,10 @@ public class DatabaseMapDictionary<T, U> extends DatabaseMapDictionaryDeep<T, U,
@Override
public Stream<Entry<T, U>> setAllEntriesAndGetPrevious(Stream<Entry<T, U>> entries) {
return getAllEntries(null, false)
.onClose(() -> dictionary.setRange(range, entries.map(entry -> serializeEntry(entry)), false));
return resourceStream(
() -> getAllEntries(null, false),
() -> dictionary.setRange(range, entries.map(entry -> serializeEntry(entry)), false)
);
}
@Override

5
src/main/java/it/cavallium/dbengine/database/collections/DatabaseMapDictionaryDeep.java
View File

@ -1,5 +1,7 @@
package it.cavallium.dbengine.database.collections;
import static it.cavallium.dbengine.utils.StreamUtils.resourceStream;
import it.cavallium.buffer.Buf;
import it.cavallium.buffer.BufDataInput;
import it.cavallium.buffer.BufDataOutput;
@ -16,6 +18,7 @@ import it.cavallium.dbengine.database.collections.DatabaseEmpty.Nothing;
import it.cavallium.dbengine.database.serialization.SerializationException;
import it.cavallium.dbengine.database.serialization.Serializer;
import it.cavallium.dbengine.database.serialization.SerializerFixedBinaryLength;
import it.cavallium.dbengine.utils.StreamUtils;
import it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap;
import java.util.Map.Entry;
import java.util.Optional;
@ -304,7 +307,7 @@ public class DatabaseMapDictionaryDeep<T, U, US extends DatabaseStage<U>> implem
@Override
public Stream<Entry<T, U>> setAllEntriesAndGetPrevious(Stream<Entry<T, U>> entries) {
return this.getAllEntries(null, false).onClose(() -> setAllEntries(entries));
return resourceStream(() -> this.getAllEntries(null, false), () -> setAllEntries(entries));
}
@Override

19
src/main/java/it/cavallium/dbengine/database/disk/LLLocalDictionary.java
View File

@ -10,6 +10,7 @@ import static it.cavallium.dbengine.utils.StreamUtils.ROCKSDB_POOL;
import static it.cavallium.dbengine.utils.StreamUtils.collectOn;
import static it.cavallium.dbengine.utils.StreamUtils.executing;
import static it.cavallium.dbengine.utils.StreamUtils.fastSummingLong;
import static it.cavallium.dbengine.utils.StreamUtils.resourceStream;
import static it.cavallium.dbengine.utils.StreamUtils.streamWhileNonNull;
import static java.util.Objects.requireNonNull;
import static it.cavallium.dbengine.utils.StreamUtils.batches;
@ -629,11 +630,9 @@ public class LLLocalDictionary implements LLDictionary {
@Override
public Stream<BadBlock> badBlocks(LLRange range) {
try {
var ro = LLUtils.generateCustomReadOptions(null,
false,
isBoundedRange(range),
false
);
return resourceStream(
() -> LLUtils.generateCustomReadOptions(null, false, isBoundedRange(range), false),
ro -> {
ro.setFillCache(false);
if (!range.isSingle()) {
if (LLUtils.MANUAL_READAHEAD) {
@ -641,14 +640,8 @@ public class LLLocalDictionary implements LLDictionary {
}
}
ro.setVerifyChecksums(true);
var rocksIterator = db.newRocksIterator(ro, range, false);
try {
return resourceStream(() -> db.newRocksIterator(ro, range, false), rocksIterator -> {
rocksIterator.seekToFirst();
} catch (Exception ex) {
rocksIterator.close();
ro.close();
throw new DBException("Failed to open rocksdb iterator", ex);
}
return streamWhileNonNull(() -> {
if (!rocksIterator.isValid()) return null;
Buf rawKey = null;
@ -663,6 +656,8 @@ public class LLLocalDictionary implements LLDictionary {
rocksIterator.close();
ro.close();
});
});
});
} catch (RocksDBException e) {
throw new DBException("Failed to get bad blocks", e);
}

27
src/main/java/it/cavallium/dbengine/database/disk/LLLocalGroupedReactiveRocksIterator.java
View File

@ -3,6 +3,7 @@ package it.cavallium.dbengine.database.disk;
import static it.cavallium.dbengine.database.LLUtils.MARKER_ROCKSDB;
import static it.cavallium.dbengine.database.LLUtils.generateCustomReadOptions;
import static it.cavallium.dbengine.database.LLUtils.isBoundedRange;
import static it.cavallium.dbengine.utils.StreamUtils.resourceStream;
import it.cavallium.buffer.Buf;
import it.cavallium.dbengine.database.LLRange;
@ -20,6 +21,7 @@ import java.util.function.Supplier;
import java.util.stream.Stream;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.rocksdb.ReadOptions;
import org.rocksdb.RocksDBException;
@ -53,9 +55,13 @@ public abstract class LLLocalGroupedReactiveRocksIterator<T> {
}
public final Stream<List<T>> stream() {
return StreamUtils.<List<T>>streamWhileNonNull(() -> {
try (var readOptions = generateCustomReadOptions(this.readOptions.get(), canFillCache, isBoundedRange(range), smallRange);
var rocksIterator = db.newRocksIterator(readOptions, range, false)) {
try {
return resourceStream(
() -> generateCustomReadOptions(this.readOptions.get(), canFillCache, isBoundedRange(range), smallRange),
readOptions -> StreamUtils.resourceStream(
() -> db.newRocksIterator(readOptions, range, false),
rocksIterator -> StreamUtils.streamWhileNonNull(() -> {
try {
if (logger.isTraceEnabled()) {
logger.trace(MARKER_ROCKSDB, "Range {} started", LLUtils.toStringSafe(range));
}
@ -99,12 +105,21 @@ public abstract class LLLocalGroupedReactiveRocksIterator<T> {
return null;
}
} catch (RocksDBException ex) {
throw new CompletionException(generateRangeFailedException(ex));
}
})
)
);
} catch (RocksDBException ex) {
throw generateRangeFailedException(ex);
}
}
private DBException generateRangeFailedException(RocksDBException ex) {
if (logger.isTraceEnabled()) {
logger.trace(MARKER_ROCKSDB, "Range {} failed", LLUtils.toStringSafe(range));
}
throw new CompletionException(new DBException("Range failed", ex));
}
});
throw new DBException("Range failed", ex);
}
/**

26
src/main/java/it/cavallium/dbengine/database/disk/LLLocalKeyPrefixReactiveRocksIterator.java
View File

@ -3,6 +3,7 @@ package it.cavallium.dbengine.database.disk;
import static it.cavallium.dbengine.database.LLUtils.MARKER_ROCKSDB;
import static it.cavallium.dbengine.database.LLUtils.generateCustomReadOptions;
import static it.cavallium.dbengine.database.LLUtils.isBoundedRange;
import static it.cavallium.dbengine.utils.StreamUtils.resourceStream;
import static it.cavallium.dbengine.utils.StreamUtils.streamWhileNonNull;
import com.google.common.collect.Iterators;
@ -50,9 +51,13 @@ public class LLLocalKeyPrefixReactiveRocksIterator {
public Stream<Buf> stream() {
return streamWhileNonNull(() -> {
try (var readOptions = generateCustomReadOptions(this.readOptions.get(), canFillCache, isBoundedRange(range), smallRange);
var rocksIterator = db.newRocksIterator(readOptions, range, false)) {
try {
return resourceStream(
() -> generateCustomReadOptions(this.readOptions.get(), canFillCache, isBoundedRange(range), smallRange),
readOptions -> resourceStream(
() -> db.newRocksIterator(readOptions, range, false),
rocksIterator -> streamWhileNonNull(() -> {
try {
if (logger.isTraceEnabled()) {
logger.trace(MARKER_ROCKSDB, "Range {} started", LLUtils.toStringSafe(range));
}
@ -99,12 +104,21 @@ public class LLLocalKeyPrefixReactiveRocksIterator {
return null;
}
} catch (RocksDBException ex) {
throw new CompletionException(generateRangeFailedException(ex));
}
}
))
);
} catch (RocksDBException e) {
throw generateRangeFailedException(e);
}
}
private DBException generateRangeFailedException(RocksDBException ex) {
if (logger.isTraceEnabled()) {
logger.trace(MARKER_ROCKSDB, "Range {} failed", LLUtils.toStringSafe(range));
}
throw new CompletionException(new DBException("Range failed", ex));
}
});
throw new DBException("Range failed", ex);
}
}

23
src/main/java/it/cavallium/dbengine/database/disk/LLLocalMigrationReactiveRocksIterator.java
View File

@ -1,6 +1,7 @@
package it.cavallium.dbengine.database.disk;
import static it.cavallium.dbengine.database.LLUtils.generateCustomReadOptions;
import static it.cavallium.dbengine.utils.StreamUtils.resourceStream;
import static it.cavallium.dbengine.utils.StreamUtils.streamWhileNonNull;
import it.cavallium.buffer.Buf;
@ -34,20 +35,26 @@ public final class LLLocalMigrationReactiveRocksIterator {
}
public Stream<LLEntry> stream() {
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();
rocksIterator.next(false);
try {
return resourceStream(
// Create the read options
() -> generateCustomReadOptions(this.readOptions.get(), false, false, false),
readOptions -> resourceStream(
// Create the iterator
() -> db.newRocksIterator(readOptions, range, false),
// Stream the iterator values until null is returned
iterator -> streamWhileNonNull(() -> {
if (iterator.isValid()) {
var key = iterator.keyBuf().copy();
var value = iterator.valueBuf().copy();
iterator.next(false);
return LLEntry.of(key, value);
} else {
return null;
}
})));
} catch (RocksDBException e) {
throw new DBException("Failed to open iterator", e);
}
});
}
}

4
src/main/java/it/cavallium/dbengine/database/disk/LLLocalMultiLuceneIndex.java
View File

@ -67,10 +67,6 @@ import org.jetbrains.annotations.Nullable;
public class LLLocalMultiLuceneIndex extends SimpleResource implements LLLuceneIndex, LuceneCloseable {
private static final Logger LOG = LogManager.getLogger(LLLuceneIndex.class);
private static final boolean BYPASS_GROUPBY_BUG = Boolean.parseBoolean(System.getProperty(
"it.cavallium.dbengine.bypassGroupByBug",
"false"
));
private final String clusterName;
private final boolean lowMemory;

26
src/main/java/it/cavallium/dbengine/database/disk/LLLocalReactiveRocksIterator.java
View File

@ -3,6 +3,7 @@ package it.cavallium.dbengine.database.disk;
import static it.cavallium.dbengine.database.LLUtils.MARKER_ROCKSDB;
import static it.cavallium.dbengine.database.LLUtils.generateCustomReadOptions;
import static it.cavallium.dbengine.database.LLUtils.isBoundedRange;
import static it.cavallium.dbengine.utils.StreamUtils.resourceStream;
import static it.cavallium.dbengine.utils.StreamUtils.streamWhileNonNull;
import it.cavallium.buffer.Buf;
@ -48,9 +49,13 @@ public abstract class LLLocalReactiveRocksIterator<T> {
}
public final Stream<T> stream() {
return streamWhileNonNull(() -> {
try (var readOptions = generateCustomReadOptions(this.readOptions.get(), true, isBoundedRange(range), smallRange);
var rocksIterator = db.newRocksIterator(readOptions, range, reverse)) {
try {
return resourceStream(
() -> generateCustomReadOptions(this.readOptions.get(), true, isBoundedRange(range), smallRange),
readOptions -> resourceStream(
() -> db.newRocksIterator(readOptions, range, reverse),
rocksIterator -> streamWhileNonNull(() -> {
try {
if (logger.isTraceEnabled()) {
logger.trace(MARKER_ROCKSDB, "Range {} started", LLUtils.toStringSafe(range));
}
@ -88,12 +93,21 @@ public abstract class LLLocalReactiveRocksIterator<T> {
return null;
}
} catch (RocksDBException ex) {
throw new CompletionException(generateRangeFailedException(ex));
}
})
)
);
} catch (RocksDBException ex) {
throw generateRangeFailedException(ex);
}
}
private DBException generateRangeFailedException(RocksDBException ex) {
if (logger.isTraceEnabled()) {
logger.trace(MARKER_ROCKSDB, "Range {} failed", LLUtils.toStringSafe(range));
}
throw new CompletionException(ex);
}
});
throw new DBException("Range failed", ex);
}
/**

69
src/main/java/it/cavallium/dbengine/utils/StreamUtils.java
View File

@ -32,6 +32,8 @@ import java.util.stream.Collector;
import java.util.stream.Collector.Characteristics;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;
import org.apache.commons.lang3.function.FailableFunction;
import org.apache.commons.lang3.function.FailableSupplier;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@ -324,6 +326,57 @@ public class StreamUtils {
return Streams.mapWithIndex(stream, mapper::apply);
}
/**
* Checks if stream.onClose() will be called during the stream lifetime
*/
public static <T> Stream<T> resourceStream(Stream<T> stream) {
var sr = new StreamResource(null);
return stream.onClose(sr::close);
}
/**
* Checks if stream.onClose() will be called during the stream lifetime
*/
public static <SR extends SimpleResource, T, EX extends Exception> Stream<T> resourceStream(
FailableSupplier<SR, ? extends EX> resourceInitializer,
FailableFunction<SR, ? extends Stream<T>, ? extends EX> streamInitializer) throws EX {
SR resource = resourceInitializer.get();
var sr = new StreamResource(resource::close);
try {
Stream<T> stream = streamInitializer.apply(resource);
return stream.onClose(sr::close);
} catch (Throwable ex) {
sr.close();
throw ex;
}
}
/**
* Checks if stream.onClose() will be called during the stream lifetime
*/
public static <T> Stream<T> resourceStream(Stream<T> stream, Runnable finalization) {
var sr = new StreamResource(finalization);
try {
return stream.onClose(sr::close);
} catch (Throwable ex) {
sr.close();
throw ex;
}
}
/**
* Checks if stream.onClose() will be called during the stream lifetime
*/
public static <T> Stream<T> resourceStream(Supplier<Stream<T>> stream, Runnable finalization) {
var sr = new StreamResource(finalization);
try {
return stream.get().onClose(sr::close);
} catch (Throwable ex) {
sr.close();
throw ex;
}
}
private record BatchSpliterator<E>(Spliterator<E> base, int batchSize) implements Spliterator<List<E>> {
@Override
@ -556,4 +609,20 @@ public class StreamUtils {
return worker;
}
}
private static class StreamResource extends SimpleResource {
private final Runnable finalization;
public StreamResource(Runnable finalization) {
this.finalization = finalization;
}
@Override
protected void onClose() {
if (finalization != null) {
finalization.run();
}
}
}
}