This is an automated email from the ASF dual-hosted git repository. cpoerschke pushed a commit to branch ishan/upgrade-to-lucene-10 in repository https://gitbox.apache.org/repos/asf/solr.git
commit fe548f7f47a4598187b71cbc9d62d63538cfc090 Author: Christine Poerschke <[email protected]> AuthorDate: Fri Jan 31 13:56:39 2025 +0000 make solr/modules/ltr/src/test compile --- .../apache/solr/ltr/TestLTRReRankingPipeline.java | 44 +++++++++++----------- .../org/apache/solr/ltr/TestLTRScoringQuery.java | 6 +-- .../solr/ltr/TestSelectiveWeightCreation.java | 6 +-- .../solr/ltr/feature/TestFieldValueFeature.java | 4 +- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTRReRankingPipeline.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTRReRankingPipeline.java index 6c749cd99d0..72f77baec09 100644 --- a/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTRReRankingPipeline.java +++ b/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTRReRankingPipeline.java @@ -120,9 +120,9 @@ public class TestLTRReRankingPipeline extends SolrTestCaseJ4 { final SolrIndexSearcher searcher = solrQueryRequest.getSearcher(); // first run the standard query TopDocs hits = searcher.search(bqBuilder.build(), 10); - assertEquals(2, hits.totalHits.value); - assertEquals("0", searcher.doc(hits.scoreDocs[0].doc).get("id")); - assertEquals("1", searcher.doc(hits.scoreDocs[1].doc).get("id")); + assertEquals(2, hits.totalHits.value()); + assertEquals("0", searcher.storedFields().document(hits.scoreDocs[0].doc).get("id")); + assertEquals("1", searcher.storedFields().document(hits.scoreDocs[1].doc).get("id")); final List<Feature> features = makeFieldValueFeatures(new int[] {0, 1, 2}, "finalScore"); final List<Normalizer> norms = @@ -145,8 +145,8 @@ public class TestLTRReRankingPipeline extends SolrTestCaseJ4 { hits = rescorer.rescore(searcher, hits, 2); // rerank using the field finalScore - assertEquals("1", searcher.doc(hits.scoreDocs[0].doc).get("id")); - assertEquals("0", searcher.doc(hits.scoreDocs[1].doc).get("id")); + assertEquals("1", searcher.storedFields().document(hits.scoreDocs[0].doc).get("id")); + assertEquals("0", searcher.storedFields().document(hits.scoreDocs[1].doc).get("id")); } } @@ -171,13 +171,13 @@ public class TestLTRReRankingPipeline extends SolrTestCaseJ4 { // first run the standard query TopDocs hits = searcher.search(bqBuilder.build(), 10); - assertEquals(5, hits.totalHits.value); + assertEquals(5, hits.totalHits.value()); - assertEquals("0", searcher.doc(hits.scoreDocs[0].doc).get("id")); - assertEquals("1", searcher.doc(hits.scoreDocs[1].doc).get("id")); - assertEquals("2", searcher.doc(hits.scoreDocs[2].doc).get("id")); - assertEquals("3", searcher.doc(hits.scoreDocs[3].doc).get("id")); - assertEquals("4", searcher.doc(hits.scoreDocs[4].doc).get("id")); + assertEquals("0", searcher.storedFields().document(hits.scoreDocs[0].doc).get("id")); + assertEquals("1", searcher.storedFields().document(hits.scoreDocs[1].doc).get("id")); + assertEquals("2", searcher.storedFields().document(hits.scoreDocs[2].doc).get("id")); + assertEquals("3", searcher.storedFields().document(hits.scoreDocs[3].doc).get("id")); + assertEquals("4", searcher.storedFields().document(hits.scoreDocs[4].doc).get("id")); final List<Feature> features = makeFieldValueFeatures(new int[] {0, 1, 2}, "finalScoreFloat"); final List<Normalizer> norms = @@ -201,11 +201,11 @@ public class TestLTRReRankingPipeline extends SolrTestCaseJ4 { // rerank @ 0 should not change the order hits = rescorer.rescore(searcher, hits, 0); - assertEquals("0", searcher.doc(hits.scoreDocs[0].doc).get("id")); - assertEquals("1", searcher.doc(hits.scoreDocs[1].doc).get("id")); - assertEquals("2", searcher.doc(hits.scoreDocs[2].doc).get("id")); - assertEquals("3", searcher.doc(hits.scoreDocs[3].doc).get("id")); - assertEquals("4", searcher.doc(hits.scoreDocs[4].doc).get("id")); + assertEquals("0", searcher.storedFields().document(hits.scoreDocs[0].doc).get("id")); + assertEquals("1", searcher.storedFields().document(hits.scoreDocs[1].doc).get("id")); + assertEquals("2", searcher.storedFields().document(hits.scoreDocs[2].doc).get("id")); + assertEquals("3", searcher.storedFields().document(hits.scoreDocs[3].doc).get("id")); + assertEquals("4", searcher.storedFields().document(hits.scoreDocs[4].doc).get("id")); // test rerank with different topN cuts @@ -219,9 +219,9 @@ public class TestLTRReRankingPipeline extends SolrTestCaseJ4 { hits = rescorer.rescore(searcher, hits, topN); for (int i = topN - 1, j = 0; i >= 0; i--, j++) { if (log.isInfoEnabled()) { - log.info("doc {} in pos {}", searcher.doc(hits.scoreDocs[j].doc).get("id"), j); + log.info("doc {} in pos {}", searcher.storedFields().document(hits.scoreDocs[j].doc).get("id"), j); } - assertEquals(i, Integer.parseInt(searcher.doc(hits.scoreDocs[j].doc).get("id"))); + assertEquals(i, Integer.parseInt(searcher.storedFields().document(hits.scoreDocs[j].doc).get("id"))); assertEquals((i + 1) * features.size() * featureWeight, hits.scoreDocs[j].score, 0.00001); } } @@ -241,11 +241,11 @@ public class TestLTRReRankingPipeline extends SolrTestCaseJ4 { LTRScoringQuery query = new LTRScoringQuery(ltrScoringModel); query.setRequest(solrQueryRequest); LTRScoringQuery.ModelWeight wgt = query.createWeight(null, ScoreMode.COMPLETE, 1f); - LTRScoringQuery.ModelWeight.ModelScorer modelScr = wgt.scorer(null); + LTRScoringQuery.ModelWeight.ModelScorer modelScr = wgt.modelScorer(null); modelScr.getDocInfo().setOriginalDocScore(1f); for (final Scorable.ChildScorable feat : modelScr.getChildren()) { assertNotNull( - ((Feature.FeatureWeight.FeatureScorer) feat.child).getDocInfo().getOriginalDocScore()); + ((Feature.FeatureWeight.FeatureScorer) feat.child()).getDocInfo().getOriginalDocScore()); } features = makeFieldValueFeatures(new int[] {0, 1, 2}, "finalScore"); @@ -257,11 +257,11 @@ public class TestLTRReRankingPipeline extends SolrTestCaseJ4 { query = new LTRScoringQuery(ltrScoringModel); query.setRequest(solrQueryRequest); wgt = query.createWeight(null, ScoreMode.COMPLETE, 1f); - modelScr = wgt.scorer(null); + modelScr = wgt.modelScorer(null); modelScr.getDocInfo().setOriginalDocScore(1f); for (final Scorable.ChildScorable feat : modelScr.getChildren()) { assertNotNull( - ((Feature.FeatureWeight.FeatureScorer) feat.child).getDocInfo().getOriginalDocScore()); + ((Feature.FeatureWeight.FeatureScorer) feat.child()).getDocInfo().getOriginalDocScore()); } } } diff --git a/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTRScoringQuery.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTRScoringQuery.java index 8bcd684f1b0..227e5348955 100644 --- a/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTRScoringQuery.java +++ b/solr/modules/ltr/src/test/org/apache/solr/ltr/TestLTRScoringQuery.java @@ -192,9 +192,9 @@ public class TestLTRScoringQuery extends SolrTestCase { final IndexSearcher searcher = getSearcher(r); // first run the standard query final TopDocs hits = searcher.search(bqBuilder.build(), 10); - assertEquals(2, hits.totalHits.value); - assertEquals("0", searcher.doc(hits.scoreDocs[0].doc).get("id")); - assertEquals("1", searcher.doc(hits.scoreDocs[1].doc).get("id")); + assertEquals(2, hits.totalHits.value()); + assertEquals("0", searcher.storedFields().document(hits.scoreDocs[0].doc).get("id")); + assertEquals("1", searcher.storedFields().document(hits.scoreDocs[1].doc).get("id")); List<Feature> features = makeFeatures(new int[] {0, 1, 2}); final List<Feature> allFeatures = makeFeatures(new int[] {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}); diff --git a/solr/modules/ltr/src/test/org/apache/solr/ltr/TestSelectiveWeightCreation.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/TestSelectiveWeightCreation.java index be3bf3d481b..18a5dc54ffc 100644 --- a/solr/modules/ltr/src/test/org/apache/solr/ltr/TestSelectiveWeightCreation.java +++ b/solr/modules/ltr/src/test/org/apache/solr/ltr/TestSelectiveWeightCreation.java @@ -137,9 +137,9 @@ public class TestSelectiveWeightCreation extends TestRerankBase { final IndexSearcher searcher = getSearcher(r); // first run the standard query final TopDocs hits = searcher.search(bqBuilder.build(), 10); - assertEquals(2, hits.totalHits.value); - assertEquals("10", searcher.doc(hits.scoreDocs[0].doc).get("id")); - assertEquals("11", searcher.doc(hits.scoreDocs[1].doc).get("id")); + assertEquals(2, hits.totalHits.value()); + assertEquals("10", searcher.storedFields().document(hits.scoreDocs[0].doc).get("id")); + assertEquals("11", searcher.storedFields().document(hits.scoreDocs[1].doc).get("id")); List<Feature> features = makeFeatures(new int[] {0, 1, 2}); final List<Feature> allFeatures = makeFeatures(new int[] {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}); diff --git a/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestFieldValueFeature.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestFieldValueFeature.java index b10d9d7f952..b8a38b86dd2 100644 --- a/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestFieldValueFeature.java +++ b/solr/modules/ltr/src/test/org/apache/solr/ltr/feature/TestFieldValueFeature.java @@ -833,8 +833,8 @@ public class TestFieldValueFeature extends TestRerankBase { } @Override - public FeatureScorer scorer(LeafReaderContext context) throws IOException { - FeatureScorer scorer = super.scorer(context); + public FeatureScorer featureScorer(LeafReaderContext context) throws IOException { + FeatureScorer scorer = super.featureScorer(context); usedScorerClass = scorer.getClass().getName(); return scorer; }
