Apache Solr open-source search software
SOLR-15496: Reuse comparator objects in contrib/ltr rescorer classes. (#228)
Marcos Pontesd67ff3afed06
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 4bea2e20bb7..4a8c6800c62 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -383,6 +383,8 @@ Optimizations---------------------* SOLR-15433: Replace transient core cache LRU by Caffeine cache. (Bruno Roustant)+* SOLR-15496: Reuse comparator objects in contrib/ltr rescorer classes. (marcosfpr via Christine Poerschke)+Bug Fixes---------------------* SOLR-15311: Support async parameter in MODIFYCOLLECTIONdiff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/LTRRescorer.java b/solr/contrib/ltr/src/java/org/apache/solr/ltr/LTRRescorer.javaindex c388c269e31..ec82127b709 100644--- a/solr/contrib/ltr/src/java/org/apache/solr/ltr/LTRRescorer.java+++ b/solr/contrib/ltr/src/java/org/apache/solr/ltr/LTRRescorer.java@@ -53,6 +53,21 @@ public class LTRRescorer extends Rescorer {this.scoringQuery = scoringQuery;}+ final private static Comparator<ScoreDoc> docComparator = Comparator.comparingInt(a -> a.doc);++ final protected static Comparator<ScoreDoc> scoreComparator = (a, b) -> {+ // Sort by score descending, then docID ascending:+ if (a.score > b.score) {+ return -1;+ } else if (a.score < b.score) {+ return 1;+ } else {+ // This subtraction can't overflow int+ // because docIDs are >= 0:+ return a.doc - b.doc;+ }+ };+protected static void heapAdjust(ScoreDoc[] hits, int size, int root) {final ScoreDoc doc = hits[root];final float score = doc.score;@@ -126,36 +141,18 @@ public class LTRRescorer extends Rescorer {scoreFeatures(searcher,topN, modelWeight, firstPassResults, leaves, reranked);// Must sort all documents that we reranked, and then select the top- sortByScore(reranked);+ Arrays.sort(reranked, scoreComparator);return reranked;}+ @Deprecatedprotected static void sortByScore(ScoreDoc[] reranked) {- Arrays.sort(reranked, new Comparator<ScoreDoc>() {- @Override- public int compare(ScoreDoc a, ScoreDoc b) {- // Sort by score descending, then docID ascending:- if (a.score > b.score) {- return -1;- } else if (a.score < b.score) {- return 1;- } else {- // This subtraction can't overflow int- // because docIDs are >= 0:- return a.doc - b.doc;- }- }- });+ Arrays.sort(reranked, scoreComparator);}protected static ScoreDoc[] getFirstPassDocsRanked(TopDocs firstPassTopDocs) {final ScoreDoc[] hits = firstPassTopDocs.scoreDocs;- Arrays.sort(hits, new Comparator<ScoreDoc>() {- @Override- public int compare(ScoreDoc a, ScoreDoc b) {- return a.doc - b.doc;- }- });+ Arrays.sort(hits, docComparator);assert firstPassTopDocs.totalHits.relation == TotalHits.Relation.EQUAL_TO;return hits;diff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/interleaving/LTRInterleavingRescorer.java b/solr/contrib/ltr/src/java/org/apache/solr/ltr/interleaving/LTRInterleavingRescorer.javaindex f71317cf946..082138b76e5 100644--- a/solr/contrib/ltr/src/java/org/apache/solr/ltr/interleaving/LTRInterleavingRescorer.java+++ b/solr/contrib/ltr/src/java/org/apache/solr/ltr/interleaving/LTRInterleavingRescorer.java@@ -18,6 +18,7 @@ package org.apache.solr.ltr.interleaving;import java.io.IOException;import java.util.ArrayList;+import java.util.Arrays;import java.util.List;import java.util.Set;@@ -104,7 +105,7 @@ public class LTRInterleavingRescorer extends LTRRescorer {for (int i = 0; i < rerankingQueries.length; i++) {if (originalRankingIndex == null || originalRankingIndex != i) {- sortByScore(reRankedPerModel[i]);+ Arrays.sort(reRankedPerModel[i], scoreComparator);}}