From e2b5432b8def6d4fee0ba0d4ab4cf52692a056b6 Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Thu, 8 Jul 2021 17:04:53 +0200 Subject: [PATCH] Fix npe --- .../lucene/searcher/ScoredSimpleLuceneShardSearcher.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/it/cavallium/dbengine/lucene/searcher/ScoredSimpleLuceneShardSearcher.java b/src/main/java/it/cavallium/dbengine/lucene/searcher/ScoredSimpleLuceneShardSearcher.java index 6a3817b..ed51e25 100644 --- a/src/main/java/it/cavallium/dbengine/lucene/searcher/ScoredSimpleLuceneShardSearcher.java +++ b/src/main/java/it/cavallium/dbengine/lucene/searcher/ScoredSimpleLuceneShardSearcher.java @@ -78,7 +78,7 @@ class ScoredSimpleLuceneShardSearcher implements LuceneShardSearcher { i++; } } - result = TopDocs.merge(queryParams.sort(), LuceneUtils.safeLongToInt(paginationInfo.firstPageOffset()), + result = LuceneUtils.mergeTopDocs(queryParams.sort(), LuceneUtils.safeLongToInt(paginationInfo.firstPageOffset()), LuceneUtils.safeLongToInt(paginationInfo.firstPageLimit()), topDocs, TIE_BREAKER @@ -148,7 +148,7 @@ class ScoredSimpleLuceneShardSearcher implements LuceneShardSearcher { .map(topFieldDocs -> topFieldDocs.toArray(TopFieldDocs[]::new)) .flatMap(topFieldDocs -> Mono.fromCallable(() -> { if (queryParams.isSorted()) { - return TopDocs.merge(queryParams.sort(), 0, s.currentPageLimit(), + return LuceneUtils.mergeTopDocs(queryParams.sort(), 0, s.currentPageLimit(), topFieldDocs, TIE_BREAKER );