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

Update

Browse Source
This commit is contained in:
Andrea Cavalli 2021-11-09 01:54:24 +01:00
parent adbbbaa646
commit 7fb8183c63
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/it/cavallium/dbengine/lucene/collector/OptimizedTopDocsCollector.java → src/main/java/it/cavallium/dbengine/lucene/collector/TopDocsCollectorMultiManager.java
View File

@ -23,7 +23,7 @@ import org.apache.lucene.search.TopFieldDocs;
import org.apache.lucene.search.TopScoreDocCollector; import org.apache.lucene.search.TopScoreDocCollector;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
public class OptimizedTopDocsCollector implements CollectorMultiManager<TopDocs, TopDocs> { public class TopDocsCollectorMultiManager implements CollectorMultiManager<TopDocs, TopDocs> {
private final Sort luceneSort; private final Sort luceneSort;
private final int limit; private final int limit;
@ -35,7 +35,7 @@ public class OptimizedTopDocsCollector implements CollectorMultiManager<TopDocs,
private final int topDocsOffset; private final int topDocsOffset;
private final int topDocsCount; private final int topDocsCount;
public OptimizedTopDocsCollector(Sort luceneSort, public TopDocsCollectorMultiManager(Sort luceneSort,
int limit, int limit,
ScoreDoc after, ScoreDoc after,
int totalHitsThreshold, int totalHitsThreshold,

7
src/main/java/it/cavallium/dbengine/lucene/searcher/PagedLocalSearcher.java
View File

@ -10,17 +10,14 @@ import it.cavallium.dbengine.database.LLUtils;
import it.cavallium.dbengine.database.disk.LLIndexSearcher; import it.cavallium.dbengine.database.disk.LLIndexSearcher;
import it.cavallium.dbengine.database.disk.LLIndexSearchers; 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.OptimizedTopDocsCollector; import it.cavallium.dbengine.lucene.collector.TopDocsCollectorMultiManager;
import it.cavallium.dbengine.lucene.searcher.LLSearchTransformer.TransformerInput; import it.cavallium.dbengine.lucene.searcher.LLSearchTransformer.TransformerInput;
import java.io.IOException; import java.io.IOException;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import org.apache.lucene.search.Collector;
import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.ScoreDoc;
import org.apache.lucene.search.TopDocs; import org.apache.lucene.search.TopDocs;
import org.apache.lucene.search.TopDocsCollector;
import org.apache.lucene.search.TopFieldCollector;
import org.apache.lucene.search.TotalHits; import org.apache.lucene.search.TotalHits;
import org.apache.lucene.search.TotalHits.Relation; import org.apache.lucene.search.TotalHits.Relation;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
@ -184,7 +181,7 @@ public class PagedLocalSearcher implements LocalSearcher {
} else if (s.pageIndex() == 0 || (s.last() != null && s.remainingLimit() > 0)) { } else if (s.pageIndex() == 0 || (s.last() != null && s.remainingLimit() > 0)) {
TopDocs pageTopDocs; TopDocs pageTopDocs;
try { try {
var cmm = new OptimizedTopDocsCollector(queryParams.sort(), var cmm = new TopDocsCollectorMultiManager(queryParams.sort(),
currentPageLimit, s.last(), queryParams.getTotalHitsThresholdInt(), currentPageLimit, s.last(), queryParams.getTotalHitsThresholdInt(),
allowPagination, queryParams.needsScores(), resultsOffset, currentPageLimit); allowPagination, queryParams.needsScores(), resultsOffset, currentPageLimit);