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

Remove stream executor

Browse Source
This commit is contained in:
Andrea Cavalli 2021-11-09 02:14:21 +01:00
parent 7fb8183c63
commit d4dae4667d
3 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,6 +9,7 @@ import it.cavallium.dbengine.database.LLSnapshot;
import java.io.IOException; import java.io.IOException;
import java.time.Duration; import java.time.Duration;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
import java.util.concurrent.ForkJoinPool; 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;
@ -24,6 +25,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.warp.commonutils.log.Logger; import org.warp.commonutils.log.Logger;
import org.warp.commonutils.log.LoggerFactory; import org.warp.commonutils.log.LoggerFactory;
import org.warp.commonutils.type.ShortNamedThreadFactory;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
import reactor.core.publisher.Sinks; import reactor.core.publisher.Sinks;
import reactor.core.publisher.Sinks.Empty; import reactor.core.publisher.Sinks.Empty;
@ -32,8 +34,9 @@ import reactor.core.scheduler.Schedulers;
public class CachedIndexSearcherManager implements IndexSearcherManager { public class CachedIndexSearcherManager implements IndexSearcherManager {
private static final Logger logger = LoggerFactory.getLogger(CachedIndexSearcherManager.class); private static final Logger logger = LoggerFactory.getLogger(CachedIndexSearcherManager.class);
private static final Executor SEARCH_EXECUTOR = ForkJoinPool.commonPool(); private final Executor SEARCH_EXECUTOR = Executors
private static final SearcherFactory SEARCHER_FACTORY = new ExecutorSearcherFactory(SEARCH_EXECUTOR); .newFixedThreadPool(Runtime.getRuntime().availableProcessors(), new ShortNamedThreadFactory("lucene-search"));
private final SearcherFactory SEARCHER_FACTORY = new ExecutorSearcherFactory(SEARCH_EXECUTOR);
private final SnapshotsManager snapshotsManager; private final SnapshotsManager snapshotsManager;
private final Similarity similarity; private final Similarity similarity;

1
src/main/java/it/cavallium/dbengine/lucene/collector/ReactiveLeafCollector.java
View File

@ -1,7 +1,6 @@
package it.cavallium.dbengine.lucene.collector; package it.cavallium.dbengine.lucene.collector;
import it.cavallium.dbengine.database.LLUtils; import it.cavallium.dbengine.database.LLUtils;
import java.util.concurrent.CancellationException;
import java.util.concurrent.locks.LockSupport; import java.util.concurrent.locks.LockSupport;
import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.search.CollectionTerminatedException; import org.apache.lucene.search.CollectionTerminatedException;

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

@ -8,7 +8,6 @@ import it.cavallium.dbengine.database.disk.LLIndexSearchers;
import it.cavallium.dbengine.lucene.LuceneUtils; import it.cavallium.dbengine.lucene.LuceneUtils;
import it.cavallium.dbengine.lucene.collector.ReactiveCollectorMultiManager; import it.cavallium.dbengine.lucene.collector.ReactiveCollectorMultiManager;
import it.cavallium.dbengine.lucene.searcher.LLSearchTransformer.TransformerInput; import it.cavallium.dbengine.lucene.searcher.LLSearchTransformer.TransformerInput;
import java.util.concurrent.CancellationException;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
@ -21,9 +20,6 @@ import reactor.core.publisher.Mono;
public class UnsortedUnscoredStreamingMultiSearcher implements MultiSearcher { public class UnsortedUnscoredStreamingMultiSearcher implements MultiSearcher {
private static final ExecutorService EXECUTOR_SERVICE
= Executors.newCachedThreadPool(new ShortNamedThreadFactory("StreamingExecutor"));
@Override @Override
public Mono<LuceneSearchResult> collectMulti(Mono<Send<LLIndexSearchers>> indexSearchersMono, public Mono<LuceneSearchResult> collectMulti(Mono<Send<LLIndexSearchers>> indexSearchersMono,
LocalQueryParams queryParams, LocalQueryParams queryParams,
@ -64,26 +60,22 @@ public class UnsortedUnscoredStreamingMultiSearcher implements MultiSearcher {
int mutableShardIndex = 0; int mutableShardIndex = 0;
for (IndexSearcher shard : shards) { for (IndexSearcher shard : shards) {
int shardIndex = mutableShardIndex++; int shardIndex = mutableShardIndex++;
EXECUTOR_SERVICE.execute(() -> { try {
try { var collector = cmm.get(shardIndex);
var collector = cmm.get(shardIndex); assert queryParams.complete() == cmm.scoreMode().isExhaustive();
assert queryParams.complete() == cmm.scoreMode().isExhaustive(); assert queryParams
assert queryParams .getScoreModeOptional()
.getScoreModeOptional() .map(scoreMode -> scoreMode == cmm.scoreMode())
.map(scoreMode -> scoreMode == cmm.scoreMode()) .orElse(true);
.orElse(true);
shard.search(localQueryParams.query(), collector); shard.search(localQueryParams.query(), collector);
} catch (Throwable e) { } catch (Throwable e) {
if (!(e instanceof CancellationException)) { scoreDocsSink.error(e);
scoreDocsSink.error(e); } finally {
} if (runningTasks.decrementAndGet() <= 0) {
} finally { scoreDocsSink.complete();
if (runningTasks.decrementAndGet() <= 0) {
scoreDocsSink.complete();
}
} }
}); }
} }
}, OverflowStrategy.BUFFER); }, OverflowStrategy.BUFFER);