From 88f5823854c935353f91a7b5cd3568d4c25624ee Mon Sep 17 00:00:00 2001 From: Christine Poerschke Date: Mon, 3 Feb 2025 14:31:52 +0000 Subject: [PATCH] action review feedback: use doc fetcher more --- .../solr/handler/tagger/TaggerTestCase.java | 2 +- .../solr/update/AddBlockUpdateTest.java | 6 ++-- ...icationUpdateProcessorIntegrationTest.java | 2 +- .../solr/ltr/TestLTRReRankingPipeline.java | 33 +++++++++---------- 4 files changed, 21 insertions(+), 22 deletions(-) diff --git a/solr/core/src/test/org/apache/solr/handler/tagger/TaggerTestCase.java b/solr/core/src/test/org/apache/solr/handler/tagger/TaggerTestCase.java index 035461d8608..186cd8396eb 100644 --- a/solr/core/src/test/org/apache/solr/handler/tagger/TaggerTestCase.java +++ b/solr/core/src/test/org/apache/solr/handler/tagger/TaggerTestCase.java @@ -143,7 +143,7 @@ protected TestTag[] pullTagsFromResponse(SolrQueryRequest req, SolrQueryResponse DocIterator iter = docList.iterator(); while (iter.hasNext()) { int docId = iter.next(); - Document doc = searcher.storedFields().document(docId); + Document doc = searcher.getDocFetcher().doc(docId); String id = doc.getField("id").stringValue(); String name = lookupByName(doc.get("name")); assertEquals("looking for " + name, NAMES.indexOf(name) + "", id); diff --git a/solr/core/src/test/org/apache/solr/update/AddBlockUpdateTest.java b/solr/core/src/test/org/apache/solr/update/AddBlockUpdateTest.java index 52ed963159d..3bd24035767 100644 --- a/solr/core/src/test/org/apache/solr/update/AddBlockUpdateTest.java +++ b/solr/core/src/test/org/apache/solr/update/AddBlockUpdateTest.java @@ -207,8 +207,8 @@ public void testOverwrite() throws IOException { final TopDocs docs = searcher.search(join(one("cd")), 10); assertEquals(2, docs.totalHits.value); final String pAct = - searcher.storedFields().document(docs.scoreDocs[0].doc).get(parent) - + searcher.storedFields().document(docs.scoreDocs[1].doc).get(parent); + searcher.getDocFetcher().doc(docs.scoreDocs[0].doc).get(parent) + + searcher.getDocFetcher().doc(docs.scoreDocs[1].doc).get(parent); assertTrue(pAct.contains(dubbed) && pAct.contains(overwritten) && pAct.length() == 2); assertQ(req("id:66", "//*[@numFound='6']")); @@ -1028,7 +1028,7 @@ protected void assertSingleParentOf( throws IOException { final TopDocs docs = searcher.search(join(childTerm), 10); assertEquals(1, docs.totalHits.value); - final String pAct = searcher.storedFields().document(docs.scoreDocs[0].doc).get(parent); + final String pAct = searcher.getDocFetcher().doc(docs.scoreDocs[0].doc).get(parent); assertEquals(parentExp, pAct); } diff --git a/solr/core/src/test/org/apache/solr/update/processor/ClassificationUpdateProcessorIntegrationTest.java b/solr/core/src/test/org/apache/solr/update/processor/ClassificationUpdateProcessorIntegrationTest.java index 43bc1ef894b..d884f0168f6 100644 --- a/solr/core/src/test/org/apache/solr/update/processor/ClassificationUpdateProcessorIntegrationTest.java +++ b/solr/core/src/test/org/apache/solr/update/processor/ClassificationUpdateProcessorIntegrationTest.java @@ -283,7 +283,7 @@ private Document getDoc(String id) throws IOException { TermQuery query = new TermQuery(new Term(ID, id)); TopDocs doc1 = searcher.search(query, 1); ScoreDoc scoreDoc = doc1.scoreDocs[0]; - return searcher.storedFields().document(scoreDoc.doc); + return searcher.getDocFetcher().doc(scoreDoc.doc); } } 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 4dec6ff37ef..61e0fc91b07 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 @@ -121,8 +121,8 @@ public void testRescorer() throws Exception { // first run the standard query TopDocs hits = searcher.search(bqBuilder.build(), 10); 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")); + assertEquals("0", searcher.getDocFetcher().doc(hits.scoreDocs[0].doc).get("id")); + assertEquals("1", searcher.getDocFetcher().doc(hits.scoreDocs[1].doc).get("id")); final List features = makeFieldValueFeatures(new int[] {0, 1, 2}, "finalScore"); final List norms = @@ -145,8 +145,8 @@ public void testRescorer() throws Exception { hits = rescorer.rescore(searcher, hits, 2); // rerank using the field finalScore - assertEquals("1", searcher.storedFields().document(hits.scoreDocs[0].doc).get("id")); - assertEquals("0", searcher.storedFields().document(hits.scoreDocs[1].doc).get("id")); + assertEquals("1", searcher.getDocFetcher().doc(hits.scoreDocs[0].doc).get("id")); + assertEquals("0", searcher.getDocFetcher().doc(hits.scoreDocs[1].doc).get("id")); } } @@ -173,11 +173,11 @@ public void testDifferentTopN() throws IOException { TopDocs hits = searcher.search(bqBuilder.build(), 10); assertEquals(5, 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")); - 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")); + assertEquals("0", searcher.getDocFetcher().doc(hits.scoreDocs[0].doc).get("id")); + assertEquals("1", searcher.getDocFetcher().doc(hits.scoreDocs[1].doc).get("id")); + assertEquals("2", searcher.getDocFetcher().doc(hits.scoreDocs[2].doc).get("id")); + assertEquals("3", searcher.getDocFetcher().doc(hits.scoreDocs[3].doc).get("id")); + assertEquals("4", searcher.getDocFetcher().doc(hits.scoreDocs[4].doc).get("id")); final List features = makeFieldValueFeatures(new int[] {0, 1, 2}, "finalScoreFloat"); final List norms = @@ -201,11 +201,11 @@ public void testDifferentTopN() throws IOException { // rerank @ 0 should not change the order hits = rescorer.rescore(searcher, hits, 0); - 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")); + assertEquals("0", searcher.getDocFetcher().doc(hits.scoreDocs[0].doc).get("id")); + assertEquals("1", searcher.getDocFetcher().doc(hits.scoreDocs[1].doc).get("id")); + assertEquals("2", searcher.getDocFetcher().doc(hits.scoreDocs[2].doc).get("id")); + assertEquals("3", searcher.getDocFetcher().doc(hits.scoreDocs[3].doc).get("id")); + assertEquals("4", searcher.getDocFetcher().doc(hits.scoreDocs[4].doc).get("id")); // test rerank with different topN cuts @@ -221,12 +221,11 @@ public void testDifferentTopN() throws IOException { if (log.isInfoEnabled()) { log.info( "doc {} in pos {}", - searcher.storedFields().document(hits.scoreDocs[j].doc).get("id"), + searcher.getDocFetcher().doc(hits.scoreDocs[j].doc).get("id"), j); } assertEquals( - i, - Integer.parseInt(searcher.storedFields().document(hits.scoreDocs[j].doc).get("id"))); + i, Integer.parseInt(searcher.getDocFetcher().doc(hits.scoreDocs[j].doc).get("id"))); assertEquals((i + 1) * features.size() * featureWeight, hits.scoreDocs[j].score, 0.00001); } }