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

Replace sinks with references when needed

Browse Source
This commit is contained in:
Andrea Cavalli 2021-10-26 00:02:08 +02:00
parent 1899ef1723
commit da2b302d1b
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,6 +12,7 @@ import java.util.concurrent.ForkJoinPool;
import java.util.concurrent.Phaser; import java.util.concurrent.Phaser;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException; import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.SearcherFactory; import org.apache.lucene.search.SearcherFactory;
@ -43,8 +44,8 @@ public class CachedIndexSearcherManager implements IndexSearcherManager {
private final LoadingCache<LLSnapshot, Mono<Send<LLIndexSearcher>>> cachedSnapshotSearchers; private final LoadingCache<LLSnapshot, Mono<Send<LLIndexSearcher>>> cachedSnapshotSearchers;
private final Mono<Send<LLIndexSearcher>> cachedMainSearcher; private final Mono<Send<LLIndexSearcher>> cachedMainSearcher;
private final Empty<Void> closeRequested = Sinks.empty(); private final AtomicBoolean closeRequested = new AtomicBoolean();
private final Empty<Void> refresherClosed = Sinks.empty(); private final Empty<Void> closeRequestedMono = Sinks.empty();
private final Mono<Void> closeMono; private final Mono<Void> closeMono;
public CachedIndexSearcherManager(IndexWriter indexWriter, public CachedIndexSearcherManager(IndexWriter indexWriter,
@ -59,6 +60,7 @@ public class CachedIndexSearcherManager implements IndexSearcherManager {
this.searcherManager = new SearcherManager(indexWriter, applyAllDeletes, writeAllDeletes, SEARCHER_FACTORY); this.searcherManager = new SearcherManager(indexWriter, applyAllDeletes, writeAllDeletes, SEARCHER_FACTORY);
Empty<Void> refresherClosed = Sinks.empty();
Mono Mono
.fromRunnable(() -> { .fromRunnable(() -> {
try { try {
@ -69,7 +71,7 @@ public class CachedIndexSearcherManager implements IndexSearcherManager {
}) })
.subscribeOn(Schedulers.boundedElastic()) .subscribeOn(Schedulers.boundedElastic())
.repeatWhen(s -> s.delayElements(queryRefreshDebounceTime)) .repeatWhen(s -> s.delayElements(queryRefreshDebounceTime))
.takeUntilOther(closeRequested.asMono()) .takeUntilOther(closeRequestedMono.asMono())
.doAfterTerminate(refresherClosed::tryEmitEmpty) .doAfterTerminate(refresherClosed::tryEmitEmpty)
.subscribe(); .subscribe();
@ -88,7 +90,8 @@ public class CachedIndexSearcherManager implements IndexSearcherManager {
this.closeMono = Mono this.closeMono = Mono
.fromRunnable(() -> { .fromRunnable(() -> {
logger.info("Closing IndexSearcherManager..."); logger.info("Closing IndexSearcherManager...");
this.closeRequested.tryEmitEmpty(); this.closeRequested.set(true);
this.closeRequestedMono.tryEmitEmpty();
}) })
.then(refresherClosed.asMono()) .then(refresherClosed.asMono())
.then(Mono.<Void>fromRunnable(() -> { .then(Mono.<Void>fromRunnable(() -> {
@ -127,10 +130,9 @@ public class CachedIndexSearcherManager implements IndexSearcherManager {
private Mono<Send<LLIndexSearcher>> generateCachedSearcher(@Nullable LLSnapshot snapshot) { private Mono<Send<LLIndexSearcher>> generateCachedSearcher(@Nullable LLSnapshot snapshot) {
// todo: check if defer is really needed // todo: check if defer is really needed
return Mono.defer(() -> { return Mono.defer(() -> {
var onClose = this.closeRequested.asMono(); if (closeRequested.get()) {
var onQueryRefresh = Mono.delay(queryRefreshDebounceTime).then(); return Mono.empty();
var onInvalidateCache = Mono.firstWithSignal(onClose, onQueryRefresh).doOnNext(s -> System.err.println("Invalidation triggered")); }
return Mono.fromCallable(() -> { return Mono.fromCallable(() -> {
activeSearchers.register(); activeSearchers.register();
IndexSearcher indexSearcher; IndexSearcher indexSearcher;
@ -146,7 +148,6 @@ public class CachedIndexSearcherManager implements IndexSearcherManager {
assert indexSearcher.getIndexReader().getRefCount() > 0; assert indexSearcher.getIndexReader().getRefCount() > 0;
return new LLIndexSearcher(indexSearcher, decRef, this::dropCachedIndexSearcher).send(); return new LLIndexSearcher(indexSearcher, decRef, this::dropCachedIndexSearcher).send();
}) })
.takeUntilOther(onClose)
.doOnDiscard(Send.class, Send::close); .doOnDiscard(Send.class, Send::close);
}); });
} }