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

Reduce the number of threads

Browse Source
This commit is contained in:
Andrea Cavalli 2021-12-15 16:04:33 +01:00
parent c59655e844
commit 8ad622db0a
4 changed files with 48 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,8 +34,7 @@ import reactor.core.scheduler.Schedulers;
public class CachedIndexSearcherManager implements IndexSearcherManager {
private static final Logger logger = LoggerFactory.getLogger(CachedIndexSearcherManager.class);
private final Executor SEARCH_EXECUTOR = Executors
.newCachedThreadPool(new ShortNamedThreadFactory("lucene-search"));
private final Executor SEARCH_EXECUTOR = command -> Schedulers.boundedElastic().schedule(command);
private final SearcherFactory SEARCHER_FACTORY = new ExecutorSearcherFactory(SEARCH_EXECUTOR);
private final SnapshotsManager snapshotsManager;
@ -128,7 +127,7 @@ public class CachedIndexSearcherManager implements IndexSearcherManager {
logger.info("Closed active searchers");
cachedSnapshotSearchers.invalidateAll();
cachedSnapshotSearchers.cleanUp();
})).cache();
}).subscribeOn(Schedulers.boundedElastic())).cache();
}
private Mono<Send<LLIndexSearcher>> generateCachedSearcher(@Nullable LLSnapshot snapshot) {

14
src/main/java/it/cavallium/dbengine/database/disk/LLLocalLuceneIndex.java
View File

@ -277,8 +277,7 @@ public class LLLocalLuceneIndex implements LLLuceneIndex {
}
private <V> Mono<V> runSafe(Callable<V> callable) {
return Mono.<V>create(sink -> {
var future = SAFE_EXECUTOR.submit(() -> {
return Mono.create(sink -> Schedulers.boundedElastic().schedule(() -> {
try {
var result = callable.call();
if (result != null) {
@ -289,23 +288,18 @@ public class LLLocalLuceneIndex implements LLLuceneIndex {
} catch (Throwable e) {
sink.error(e);
}
});
sink.onDispose(() -> future.cancel(false));
});
}));
}
private <V> Mono<V> runSafe(IORunnable runnable) {
return Mono.create(sink -> {
var future = SAFE_EXECUTOR.submit(() -> {
return Mono.create(sink -> Schedulers.boundedElastic().schedule(() -> {
try {
runnable.run();
sink.success();
} catch (Throwable e) {
sink.error(e);
}
});
sink.onDispose(() -> future.cancel(false));
});
}));
}
@Override

10
src/main/java/it/cavallium/dbengine/lucene/collector/ReactiveCollectorMultiManager.java
View File

@ -15,15 +15,13 @@ import reactor.core.publisher.Sinks.Many;
public class ReactiveCollectorMultiManager implements CollectorMultiManager<Void, Void> {
private final FluxSink<ScoreDoc> scoreDocsSink;
private final LongSemaphore requested;
public ReactiveCollectorMultiManager(FluxSink<ScoreDoc> scoreDocsSink, LongSemaphore requested) {
this.scoreDocsSink = scoreDocsSink;
this.requested = requested;
public ReactiveCollectorMultiManager() {
}
public CollectorManager<Collector, Void> get(int shardIndex) {
public CollectorManager<Collector, Void> get(LongSemaphore requested,
FluxSink<ScoreDoc> scoreDocsSink,
int shardIndex) {
return new CollectorManager<>() {
@Override

56
src/main/java/it/cavallium/dbengine/lucene/searcher/UnsortedUnscoredStreamingMultiSearcher.java
View File

@ -1,5 +1,8 @@
package it.cavallium.dbengine.lucene.searcher;
import static java.lang.Math.toIntExact;
import static java.util.Objects.requireNonNull;
import io.net5.buffer.api.Send;
import it.cavallium.dbengine.client.query.current.data.TotalHitsCount;
import it.cavallium.dbengine.database.LLKeyScore;
@ -11,8 +14,10 @@ import it.cavallium.dbengine.lucene.searcher.LLSearchTransformer.TransformerInpu
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionException;
import java.util.concurrent.Executor;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
@ -28,12 +33,10 @@ import reactor.core.publisher.FluxSink.OverflowStrategy;
import reactor.core.publisher.Mono;
import reactor.core.scheduler.Scheduler;
import reactor.core.scheduler.Schedulers;
import reactor.util.function.Tuples;
public class UnsortedUnscoredStreamingMultiSearcher implements MultiSearcher {
private static final ExecutorService SCHEDULER = Executors.newCachedThreadPool(new ShortNamedThreadFactory(
"UnscoredStreamingSearcher"));
@Override
public Mono<LuceneSearchResult> collectMulti(Mono<Send<LLIndexSearchers>> indexSearchersMono,
LocalQueryParams queryParams,
@ -61,47 +64,32 @@ public class UnsortedUnscoredStreamingMultiSearcher implements MultiSearcher {
}
var shards = indexSearchers.shards();
Flux<ScoreDoc> scoreDocsFlux = Flux.<ScoreDoc>create(scoreDocsSink -> {
var cmm = new ReactiveCollectorMultiManager();
Flux<ScoreDoc> scoreDocsFlux = Flux.fromIterable(shards)
.index()
.flatMap(tuple -> Flux.<ScoreDoc>create(scoreDocsSink -> {
LLUtils.ensureBlocking();
var index = toIntExact(requireNonNull(tuple.getT1()));
var shard = tuple.getT2();
var requested = new LongSemaphore(0);
var cmm = new ReactiveCollectorMultiManager(scoreDocsSink, requested);
var collectorManager = cmm.get(requested, scoreDocsSink, index);
assert queryParams.computePreciseHitsCount() == cmm.scoreMode().isExhaustive();
scoreDocsSink.onRequest(requested::release);
int mutableShardIndex = 0;
CompletableFuture<?>[] futures = new CompletableFuture<?>[shards.size()];
for (IndexSearcher shard : shards) {
int shardIndex = mutableShardIndex++;
assert queryParams.computePreciseHitsCount() == cmm.scoreMode().isExhaustive();
var future = CompletableFuture.runAsync(() -> {
try {
LLUtils.ensureBlocking();
var collectorManager = cmm.get(shardIndex);
shard.search(localQueryParams.query(), collectorManager.newCollector());
} catch (IOException e) {
throw new CompletionException(e);
}
}, SCHEDULER);
futures[shardIndex] = future;
}
var combinedFuture = CompletableFuture.allOf(futures).whenCompleteAsync((result, ex) -> {
if (ex != null) {
scoreDocsSink.error(ex);
} else {
scoreDocsSink.complete();
} catch (IOException e) {
scoreDocsSink.error(e);
}
});
scoreDocsSink.onDispose(() -> {
for (CompletableFuture<?> future : futures) {
future.cancel(true);
}
combinedFuture.cancel(true);
});
}, OverflowStrategy.BUFFER).subscribeOn(Schedulers.boundedElastic()).publishOn(Schedulers.boundedElastic());
}, OverflowStrategy.BUFFER).subscribeOn(Schedulers.boundedElastic()));
Flux<LLKeyScore> resultsFlux = LuceneUtils.convertHits(scoreDocsFlux, shards, keyFieldName, false);
Flux<LLKeyScore> resultsFlux = LuceneUtils
.convertHits(scoreDocsFlux.publishOn(Schedulers.boundedElastic()), shards, keyFieldName, false);
var totalHitsCount = new TotalHitsCount(0, false);
Flux<LLKeyScore> mergedFluxes = resultsFlux