From 5157656a2c8b21df3a7ffc5332fd4c0ad56e22f5 Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Sun, 12 Dec 2021 18:52:50 +0100 Subject: [PATCH] Don't use official searcher for production queries --- .../dbengine/lucene/searcher/AdaptiveLocalSearcher.java | 8 ++++---- .../dbengine/lucene/searcher/AdaptiveMultiSearcher.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/it/cavallium/dbengine/lucene/searcher/AdaptiveLocalSearcher.java b/src/main/java/it/cavallium/dbengine/lucene/searcher/AdaptiveLocalSearcher.java index 388420e..1514d95 100644 --- a/src/main/java/it/cavallium/dbengine/lucene/searcher/AdaptiveLocalSearcher.java +++ b/src/main/java/it/cavallium/dbengine/lucene/searcher/AdaptiveLocalSearcher.java @@ -16,7 +16,7 @@ public class AdaptiveLocalSearcher implements LocalSearcher { private static final OfficialSearcher officialSearcher = new OfficialSearcher(); - private static final LocalSearcher localPagedSearcher = new PagedLocalSearcher(); + private static final LocalSearcher scoredPaged = new PagedLocalSearcher(); private static final LocalSearcher countSearcher = new CountMultiSearcher(); @@ -72,7 +72,7 @@ public class AdaptiveLocalSearcher implements LocalSearcher { return countSearcher.collect(indexSearcher, queryParams, keyFieldName, transformer); } else if (queryParams.isSorted() || queryParams.needsScores()) { if (realLimit <= maxAllowedInMemoryLimit) { - return localPagedSearcher.collect(indexSearcher, queryParams, keyFieldName, transformer); + return scoredPaged.collect(indexSearcher, queryParams, keyFieldName, transformer); } else { if ((queryParams.isSorted() && !queryParams.isSortedByScore())) { if (queryParams.limitLong() < MAX_IN_MEMORY_SIZE) { @@ -81,7 +81,7 @@ public class AdaptiveLocalSearcher implements LocalSearcher { if (sortedScoredFull != null) { return sortedScoredFull.collect(indexSearcher, queryParams, keyFieldName, transformer); } else { - return officialSearcher.collect(indexSearcher, queryParams, keyFieldName, transformer); + return scoredPaged.collect(indexSearcher, queryParams, keyFieldName, transformer); } } else { if (queryParams.limitLong() < MAX_IN_MEMORY_SIZE) { @@ -90,7 +90,7 @@ public class AdaptiveLocalSearcher implements LocalSearcher { if (unsortedScoredFull != null) { return unsortedScoredFull.collect(indexSearcher, queryParams, keyFieldName, transformer); } else { - return officialSearcher.collect(indexSearcher, queryParams, keyFieldName, transformer); + return scoredPaged.collect(indexSearcher, queryParams, keyFieldName, transformer); } } } diff --git a/src/main/java/it/cavallium/dbengine/lucene/searcher/AdaptiveMultiSearcher.java b/src/main/java/it/cavallium/dbengine/lucene/searcher/AdaptiveMultiSearcher.java index ae0aa08..cf193cc 100644 --- a/src/main/java/it/cavallium/dbengine/lucene/searcher/AdaptiveMultiSearcher.java +++ b/src/main/java/it/cavallium/dbengine/lucene/searcher/AdaptiveMultiSearcher.java @@ -69,7 +69,7 @@ public class AdaptiveMultiSearcher implements MultiSearcher { if (sortedScoredFull != null) { return sortedScoredFull.collectMulti(indexSearchersMono, queryParams, keyFieldName, transformer); } else { - return officialSearcher.collectMulti(indexSearchersMono, queryParams, keyFieldName, transformer); + return scoredPaged.collectMulti(indexSearchersMono, queryParams, keyFieldName, transformer); } } else { if (queryParams.limitLong() < MAX_IN_MEMORY_SIZE) { @@ -78,7 +78,7 @@ public class AdaptiveMultiSearcher implements MultiSearcher { if (unsortedScoredFull != null) { return unsortedScoredFull.collectMulti(indexSearchersMono, queryParams, keyFieldName, transformer); } else { - return officialSearcher.collectMulti(indexSearchersMono, queryParams, keyFieldName, transformer); + return scoredPaged.collectMulti(indexSearchersMono, queryParams, keyFieldName, transformer); } } }