Apache Solr open-source search software
SOLR-15537: split 10-args LTRRescorer.scoreSingleHit method (#192)
Christine Poerschke1e3ee66305a6
diff --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 3c1f85b2eb3..0f1f2c98e22 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@@ -178,13 +178,41 @@ public class LTRRescorer extends Rescorer {docBase = readerContext.docBase;scorer = modelWeight.scorer(readerContext);}- scoreSingleHit(indexSearcher, topN, modelWeight, docBase, hitUpto, hit, docID, scoringQuery, scorer, reranked);+ if (scoreSingleHit(topN, docBase, hitUpto, hit, docID, scorer, reranked)) {+ logSingleHit(indexSearcher, modelWeight, hit.doc, scoringQuery);+ }hitUpto++;}}+ /**+ * @deprecated Use {@link #scoreSingleHit(int, int, int, ScoreDoc, int, org.apache.solr.ltr.LTRScoringQuery.ModelWeight.ModelScorer, ScoreDoc[])}+ * and {@link #logSingleHit(IndexSearcher, org.apache.solr.ltr.LTRScoringQuery.ModelWeight, int, LTRScoringQuery)} instead.+ */+ @Deprecatedprotected static void scoreSingleHit(IndexSearcher indexSearcher, int topN, LTRScoringQuery.ModelWeight modelWeight, int docBase, int hitUpto, ScoreDoc hit, int docID, LTRScoringQuery rerankingQuery, LTRScoringQuery.ModelWeight.ModelScorer scorer, ScoreDoc[] reranked) throws IOException {- final FeatureLogger featureLogger = rerankingQuery.getFeatureLogger();+ if (scoreSingleHit(topN, docBase, hitUpto, hit, docID, scorer, reranked)) {+ logSingleHit(indexSearcher, modelWeight, hit.doc, rerankingQuery);+ }+ }++ /**+ * Call this method if the {@link #scoreSingleHit(int, int, int, ScoreDoc, int, org.apache.solr.ltr.LTRScoringQuery.ModelWeight.ModelScorer, ScoreDoc[])}+ * method indicated that the document's feature info should be logged.+ */+ protected static void logSingleHit(IndexSearcher indexSearcher, LTRScoringQuery.ModelWeight modelWeight, int docid, LTRScoringQuery scoringQuery) {+ final FeatureLogger featureLogger = scoringQuery.getFeatureLogger();+ if (featureLogger != null && indexSearcher instanceof SolrIndexSearcher) {+ featureLogger.log(docid, scoringQuery, (SolrIndexSearcher)indexSearcher, modelWeight.getFeaturesInfo());+ }+ }++ /**+ * Scores a single document and returns true if the document's feature info should be logged via the+ * {@link #logSingleHit(IndexSearcher, org.apache.solr.ltr.LTRScoringQuery.ModelWeight, int, LTRScoringQuery)}+ * method. Feature info logging is only necessary for the topN documents.+ */+ protected static boolean scoreSingleHit(int topN, int docBase, int hitUpto, ScoreDoc hit, int docID, LTRScoringQuery.ModelWeight.ModelScorer scorer, ScoreDoc[] reranked) throws IOException {// Scorer for a LTRScoringQuery.ModelWeight should never be null since we always have to// call score// even if no feature scorers match, since a model might use that info to@@ -198,16 +226,15 @@ public class LTRRescorer extends Rescorer {scorer.docID();scorer.iterator().advance(targetDoc);+ boolean logHit = false;+scorer.getDocInfo().setOriginalDocScore(hit.score);hit.score = scorer.score();if (hitUpto < topN) {reranked[hitUpto] = hit;// if the heap is not full, maybe I want to log the features for this// document- if (featureLogger != null && indexSearcher instanceof SolrIndexSearcher) {- featureLogger.log(hit.doc, rerankingQuery, (SolrIndexSearcher) indexSearcher,- modelWeight.getFeaturesInfo());- }+ logHit = true;} else if (hitUpto == topN) {// collected topN document, I create the heapheapify(reranked, topN);@@ -221,12 +248,10 @@ public class LTRRescorer extends Rescorer {if (hit.score > reranked[0].score) {reranked[0] = hit;heapAdjust(reranked, topN, 0);- if (featureLogger != null && indexSearcher instanceof SolrIndexSearcher) {- featureLogger.log(hit.doc, rerankingQuery, (SolrIndexSearcher) indexSearcher,- modelWeight.getFeaturesInfo());- }+ logHit = true;}}+ return logHit;}@Overridediff --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 082138b76e5..799f4d9e36a 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@@ -142,7 +142,10 @@ public class LTRInterleavingRescorer extends LTRRescorer {}for (int i = 0; i < rerankingQueries.length; i++) {if (modelWeights[i] != null) {- scoreSingleHit(indexSearcher, topN, modelWeights[i], docBase, hitUpto, new ScoreDoc(hit.doc, hit.score, hit.shardIndex), docID, rerankingQueries[i], scorers[i], rerankedPerModel[i]);+ final ScoreDoc hit_i = new ScoreDoc(hit.doc, hit.score, hit.shardIndex);+ if (scoreSingleHit(topN, docBase, hitUpto, hit_i, docID, scorers[i], rerankedPerModel[i])) {+ logSingleHit(indexSearcher, modelWeights[i], hit_i.doc, rerankingQueries[i]);+ }}}hitUpto++;