From 0bc86e576a6c0a3ae16251694e6a3e9286bf4e07 Mon Sep 17 00:00:00 2001 From: Nikolaj Brask-Nielsen Date: Fri, 28 Jul 2023 07:51:16 +0200 Subject: [PATCH] refactor: Solve merge conflicts --- .../Search/LuceneSearchExecutor.cs | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/Examine.Lucene/Search/LuceneSearchExecutor.cs b/src/Examine.Lucene/Search/LuceneSearchExecutor.cs index 37394f32..e35a97a5 100644 --- a/src/Examine.Lucene/Search/LuceneSearchExecutor.cs +++ b/src/Examine.Lucene/Search/LuceneSearchExecutor.cs @@ -119,7 +119,6 @@ public ISearchResults Execute() TopDocs topDocs; ICollector topDocsCollector; - var facetsCollector = _facetFields.Any() ? new FacetsCollector() : null; bool trackMaxScore = _luceneQueryOptions == null ? false : _luceneQueryOptions.TrackDocumentMaxScore; bool trackDocScores = _luceneQueryOptions == null ? false : _luceneQueryOptions.TrackDocumentScores; @@ -196,23 +195,22 @@ public ISearchResults Execute() } } - private static FieldDoc GetScoreDocAfter(LuceneQueryOptions luceneQueryOptions) + private static FieldDoc GetScoreDocAfter(SearchAfterOptions searchAfterOptions) { FieldDoc scoreDocAfter; - var searchAfter = luceneQueryOptions.SearchAfter; - object[] searchAfterSortFields = new object[0]; - if (luceneQueryOptions.SearchAfter.Fields != null && luceneQueryOptions.SearchAfter.Fields.Length > 0) + + if (searchAfterOptions.Fields != null && searchAfterOptions.Fields.Length > 0) { - searchAfterSortFields = luceneQueryOptions.SearchAfter.Fields; + searchAfterSortFields = searchAfterOptions.Fields; } - if (searchAfter.ShardIndex != null) + if (searchAfterOptions.ShardIndex != null) { - scoreDocAfter = new FieldDoc(searchAfter.DocumentId, searchAfter.DocumentScore, searchAfterSortFields, searchAfter.ShardIndex.Value); + scoreDocAfter = new FieldDoc(searchAfterOptions.DocumentId, searchAfterOptions.DocumentScore, searchAfterSortFields, searchAfterOptions.ShardIndex.Value); } else { - scoreDocAfter = new FieldDoc(searchAfter.DocumentId, searchAfter.DocumentScore, searchAfterSortFields); + scoreDocAfter = new FieldDoc(searchAfterOptions.DocumentId, searchAfterOptions.DocumentScore, searchAfterSortFields); } return scoreDocAfter;