Apache Solr open-source search software
in tests replace deprecated IndexSearcher.doc() calls (#3149)
Christine Poerschke70feb7261ecb
diff --git a/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java b/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.javaindex c873b8979f8..3a58135b4a0 100644--- a/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java+++ b/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java@@ -763,7 +763,7 @@ public class BasicFunctionalityTest extends SolrTestCaseJ4 {core.execute(core.getRequestHandler(req.getParams().get(CommonParams.QT)), req, rsp);DocList dl = ((ResultContext) rsp.getResponse()).getDocList();- Document d = req.getSearcher().doc(dl.iterator().nextDoc());+ Document d = req.getSearcher().getDocFetcher().doc(dl.iterator().nextDoc());// ensure field in fl is not lazyassertNotEquals("LazyField", ((Field) d.getField("test_hlt")).getClass().getSimpleName());assertNotEquals("LazyField", ((Field) d.getField("title")).getClass().getSimpleName());@@ -791,7 +791,7 @@ public class BasicFunctionalityTest extends SolrTestCaseJ4 {DocList dl = ((ResultContext) rsp.getResponse()).getDocList();DocIterator di = dl.iterator();- Document d1 = req.getSearcher().doc(di.nextDoc());+ Document d1 = req.getSearcher().getDocFetcher().doc(di.nextDoc());IndexableField[] values1 = null;// ensure fl field is non lazy, and non-fl field is lazy@@ -813,7 +813,7 @@ public class BasicFunctionalityTest extends SolrTestCaseJ4 {dl = ((ResultContext) rsp.getResponse()).getDocList();di = dl.iterator();- Document d2 = req.getSearcher().doc(di.nextDoc());+ Document d2 = req.getSearcher().getDocFetcher().doc(di.nextDoc());// ensure same doc, same lazy field nowassertSame("Doc was not cached", d1, d2);IndexableField[] values2 = d2.getFields("test_hlt");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.javaindex da0a8d753f9..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 @@ public abstract class TaggerTestCase extends SolrTestCaseJ4 {DocIterator iter = docList.iterator();while (iter.hasNext()) {int docId = iter.next();- Document doc = searcher.doc(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/legacy/TestNumericRangeQuery32.java b/solr/core/src/test/org/apache/solr/legacy/TestNumericRangeQuery32.javaindex cd2e480a49a..d045b2a8e24 100644--- a/solr/core/src/test/org/apache/solr/legacy/TestNumericRangeQuery32.java+++ b/solr/core/src/test/org/apache/solr/legacy/TestNumericRangeQuery32.java@@ -183,12 +183,12 @@ public class TestNumericRangeQuery32 extends SolrTestCase {ScoreDoc[] sd = topDocs.scoreDocs;assertNotNull(sd);assertEquals("Score doc count" + type, count, sd.length);- Document doc = searcher.doc(sd[0].doc);+ Document doc = searcher.storedFields().document(sd[0].doc);assertEquals("First doc" + type,2 * distance + startOffset,doc.getField(field).numericValue().intValue());- doc = searcher.doc(sd[sd.length - 1].doc);+ doc = searcher.storedFields().document(sd[sd.length - 1].doc);assertEquals("Last doc" + type,(1 + count) * distance + startOffset,@@ -231,9 +231,9 @@ public class TestNumericRangeQuery32 extends SolrTestCase {ScoreDoc[] sd = topDocs.scoreDocs;assertNotNull(sd);assertEquals("Score doc count", count, sd.length);- Document doc = searcher.doc(sd[0].doc);+ Document doc = searcher.storedFields().document(sd[0].doc);assertEquals("First doc", startOffset, doc.getField(field).numericValue().intValue());- doc = searcher.doc(sd[sd.length - 1].doc);+ doc = searcher.storedFields().document(sd[sd.length - 1].doc);assertEquals("Last doc",(count - 1) * distance + startOffset,@@ -244,9 +244,9 @@ public class TestNumericRangeQuery32 extends SolrTestCase {sd = topDocs.scoreDocs;assertNotNull(sd);assertEquals("Score doc count", count, sd.length);- doc = searcher.doc(sd[0].doc);+ doc = searcher.storedFields().document(sd[0].doc);assertEquals("First doc", startOffset, doc.getField(field).numericValue().intValue());- doc = searcher.doc(sd[sd.length - 1].doc);+ doc = searcher.storedFields().document(sd[sd.length - 1].doc);assertEquals("Last doc",(count - 1) * distance + startOffset,@@ -281,10 +281,10 @@ public class TestNumericRangeQuery32 extends SolrTestCase {ScoreDoc[] sd = topDocs.scoreDocs;assertNotNull(sd);assertEquals("Score doc count", noDocs - count, sd.length);- Document doc = searcher.doc(sd[0].doc);+ Document doc = searcher.storedFields().document(sd[0].doc);assertEquals("First doc", count * distance + startOffset, doc.getField(field).numericValue().intValue());- doc = searcher.doc(sd[sd.length - 1].doc);+ doc = searcher.storedFields().document(sd[sd.length - 1].doc);assertEquals("Last doc",(noDocs - 1) * distance + startOffset,@@ -297,10 +297,10 @@ public class TestNumericRangeQuery32 extends SolrTestCase {sd = topDocs.scoreDocs;assertNotNull(sd);assertEquals("Score doc count", noDocs - count, sd.length);- doc = searcher.doc(sd[0].doc);+ doc = searcher.storedFields().document(sd[0].doc);assertEquals("First doc", count * distance + startOffset, doc.getField(field).numericValue().intValue());- doc = searcher.doc(sd[sd.length - 1].doc);+ doc = searcher.storedFields().document(sd[sd.length - 1].doc);assertEquals("Last doc",(noDocs - 1) * distance + startOffset,diff --git a/solr/core/src/test/org/apache/solr/legacy/TestNumericRangeQuery64.java b/solr/core/src/test/org/apache/solr/legacy/TestNumericRangeQuery64.javaindex 97bac5ef1b5..b71dcefb0bd 100644--- a/solr/core/src/test/org/apache/solr/legacy/TestNumericRangeQuery64.java+++ b/solr/core/src/test/org/apache/solr/legacy/TestNumericRangeQuery64.java@@ -195,12 +195,12 @@ public class TestNumericRangeQuery64 extends SolrTestCase {ScoreDoc[] sd = topDocs.scoreDocs;assertNotNull(sd);assertEquals("Score doc count" + type, count, sd.length);- Document doc = searcher.doc(sd[0].doc);+ Document doc = searcher.storedFields().document(sd[0].doc);assertEquals("First doc" + type,2 * distance + startOffset,doc.getField(field).numericValue().longValue());- doc = searcher.doc(sd[sd.length - 1].doc);+ doc = searcher.storedFields().document(sd[sd.length - 1].doc);assertEquals("Last doc" + type,(1 + count) * distance + startOffset,@@ -249,9 +249,9 @@ public class TestNumericRangeQuery64 extends SolrTestCase {ScoreDoc[] sd = topDocs.scoreDocs;assertNotNull(sd);assertEquals("Score doc count", count, sd.length);- Document doc = searcher.doc(sd[0].doc);+ Document doc = searcher.storedFields().document(sd[0].doc);assertEquals("First doc", startOffset, doc.getField(field).numericValue().longValue());- doc = searcher.doc(sd[sd.length - 1].doc);+ doc = searcher.storedFields().document(sd[sd.length - 1].doc);assertEquals("Last doc",(count - 1) * distance + startOffset,@@ -262,9 +262,9 @@ public class TestNumericRangeQuery64 extends SolrTestCase {sd = topDocs.scoreDocs;assertNotNull(sd);assertEquals("Score doc count", count, sd.length);- doc = searcher.doc(sd[0].doc);+ doc = searcher.storedFields().document(sd[0].doc);assertEquals("First doc", startOffset, doc.getField(field).numericValue().longValue());- doc = searcher.doc(sd[sd.length - 1].doc);+ doc = searcher.storedFields().document(sd[sd.length - 1].doc);assertEquals("Last doc",(count - 1) * distance + startOffset,@@ -301,12 +301,12 @@ public class TestNumericRangeQuery64 extends SolrTestCase {ScoreDoc[] sd = topDocs.scoreDocs;assertNotNull(sd);assertEquals("Score doc count", noDocs - count, sd.length);- Document doc = searcher.doc(sd[0].doc);+ Document doc = searcher.storedFields().document(sd[0].doc);assertEquals("First doc",count * distance + startOffset,doc.getField(field).numericValue().longValue());- doc = searcher.doc(sd[sd.length - 1].doc);+ doc = searcher.storedFields().document(sd[sd.length - 1].doc);assertEquals("Last doc",(noDocs - 1) * distance + startOffset,@@ -317,12 +317,12 @@ public class TestNumericRangeQuery64 extends SolrTestCase {sd = topDocs.scoreDocs;assertNotNull(sd);assertEquals("Score doc count", noDocs - count, sd.length);- doc = searcher.doc(sd[0].doc);+ doc = searcher.storedFields().document(sd[0].doc);assertEquals("First doc",count * distance + startOffset,doc.getField(field).numericValue().longValue());- doc = searcher.doc(sd[sd.length - 1].doc);+ doc = searcher.storedFields().document(sd[sd.length - 1].doc);assertEquals("Last doc",(noDocs - 1) * distance + startOffset,diff --git a/solr/core/src/test/org/apache/solr/search/LargeFieldTest.java b/solr/core/src/test/org/apache/solr/search/LargeFieldTest.javaindex 0cda9dcfe7b..ba5d2d339cd 100644--- a/solr/core/src/test/org/apache/solr/search/LargeFieldTest.java+++ b/solr/core/src/test/org/apache/solr/search/LargeFieldTest.java@@ -96,7 +96,7 @@ public class LargeFieldTest extends SolrTestCaseJ4 {assertQ(req("q", "101", "df", ID_FLD, "fl", ID_FLD)); // eager load ID_FLD; rest are lazy// fetch the document; we know it will be from the documentCache, docId 0- final Document d = h.getCore().withSearcher(searcher -> searcher.doc(0));+ final Document d = h.getCore().withSearcher(searcher -> searcher.getDocFetcher().doc(0));assertEager(d, ID_FLD);assertLazyNotLoaded(d, LAZY_FIELD);diff --git a/solr/core/src/test/org/apache/solr/uninverting/TestFieldCacheSort.java b/solr/core/src/test/org/apache/solr/uninverting/TestFieldCacheSort.javaindex b8347c33b0d..2e357105079 100644--- a/solr/core/src/test/org/apache/solr/uninverting/TestFieldCacheSort.java+++ b/solr/core/src/test/org/apache/solr/uninverting/TestFieldCacheSort.java@@ -90,8 +90,8 @@ public class TestFieldCacheSort extends SolrTestCase {TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);assertEquals(2, td.totalHits.value);// 'bar' comes before 'foo'- assertEquals("bar", searcher.doc(td.scoreDocs[0].doc).get("value"));- assertEquals("foo", searcher.doc(td.scoreDocs[1].doc).get("value"));+ assertEquals("bar", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));+ assertEquals("foo", searcher.storedFields().document(td.scoreDocs[1].doc).get("value"));TestUtil.checkReader(ir);ir.close();@@ -129,9 +129,9 @@ public class TestFieldCacheSort extends SolrTestCase {TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);assertEquals(3, td.totalHits.value);// null comes first- assertNull(searcher.doc(td.scoreDocs[0].doc).get("value"));- assertEquals("bar", searcher.doc(td.scoreDocs[1].doc).get("value"));- assertEquals("foo", searcher.doc(td.scoreDocs[2].doc).get("value"));+ assertNull(searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));+ assertEquals("bar", searcher.storedFields().document(td.scoreDocs[1].doc).get("value"));+ assertEquals("foo", searcher.storedFields().document(td.scoreDocs[2].doc).get("value"));TestUtil.checkReader(ir);ir.close();dir.close();@@ -166,8 +166,8 @@ public class TestFieldCacheSort extends SolrTestCase {TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);assertEquals(2, td.totalHits.value);// 'foo' comes after 'bar' in reverse order- assertEquals("foo", searcher.doc(td.scoreDocs[0].doc).get("value"));- assertEquals("bar", searcher.doc(td.scoreDocs[1].doc).get("value"));+ assertEquals("foo", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));+ assertEquals("bar", searcher.storedFields().document(td.scoreDocs[1].doc).get("value"));TestUtil.checkReader(ir);ir.close();dir.close();@@ -205,9 +205,9 @@ public class TestFieldCacheSort extends SolrTestCase {TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);assertEquals(3, td.totalHits.value);// null comes first- assertNull(searcher.doc(td.scoreDocs[0].doc).get("value"));- assertEquals("bar", searcher.doc(td.scoreDocs[1].doc).get("value"));- assertEquals("foo", searcher.doc(td.scoreDocs[2].doc).get("value"));+ assertNull(searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));+ assertEquals("bar", searcher.storedFields().document(td.scoreDocs[1].doc).get("value"));+ assertEquals("foo", searcher.storedFields().document(td.scoreDocs[2].doc).get("value"));TestUtil.checkReader(ir);ir.close();dir.close();@@ -244,10 +244,10 @@ public class TestFieldCacheSort extends SolrTestCase {TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);assertEquals(3, td.totalHits.value);- assertEquals("foo", searcher.doc(td.scoreDocs[0].doc).get("value"));- assertEquals("bar", searcher.doc(td.scoreDocs[1].doc).get("value"));+ assertEquals("foo", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));+ assertEquals("bar", searcher.storedFields().document(td.scoreDocs[1].doc).get("value"));// null comes last- assertNull(searcher.doc(td.scoreDocs[2].doc).get("value"));+ assertNull(searcher.storedFields().document(td.scoreDocs[2].doc).get("value"));TestUtil.checkReader(ir);ir.close();dir.close();@@ -285,10 +285,10 @@ public class TestFieldCacheSort extends SolrTestCase {TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);assertEquals(3, td.totalHits.value);- assertEquals("bar", searcher.doc(td.scoreDocs[0].doc).get("value"));- assertEquals("foo", searcher.doc(td.scoreDocs[1].doc).get("value"));+ assertEquals("bar", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));+ assertEquals("foo", searcher.storedFields().document(td.scoreDocs[1].doc).get("value"));// null comes last- assertNull(searcher.doc(td.scoreDocs[2].doc).get("value"));+ assertNull(searcher.storedFields().document(td.scoreDocs[2].doc).get("value"));TestUtil.checkReader(ir);ir.close();dir.close();@@ -327,9 +327,9 @@ public class TestFieldCacheSort extends SolrTestCase {TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);assertEquals(3, td.totalHits.value);// null comes first- assertNull(searcher.doc(td.scoreDocs[0].doc).get("value"));- assertEquals("foo", searcher.doc(td.scoreDocs[1].doc).get("value"));- assertEquals("bar", searcher.doc(td.scoreDocs[2].doc).get("value"));+ assertNull(searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));+ assertEquals("foo", searcher.storedFields().document(td.scoreDocs[1].doc).get("value"));+ assertEquals("bar", searcher.storedFields().document(td.scoreDocs[2].doc).get("value"));TestUtil.checkReader(ir);ir.close();dir.close();@@ -475,9 +475,9 @@ public class TestFieldCacheSort extends SolrTestCase {TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);assertEquals(3, td.totalHits.value);// numeric order- assertEquals("-1", searcher.doc(td.scoreDocs[0].doc).get("value"));- assertEquals("4", searcher.doc(td.scoreDocs[1].doc).get("value"));- assertEquals("300000", searcher.doc(td.scoreDocs[2].doc).get("value"));+ assertEquals("-1", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));+ assertEquals("4", searcher.storedFields().document(td.scoreDocs[1].doc).get("value"));+ assertEquals("300000", searcher.storedFields().document(td.scoreDocs[2].doc).get("value"));TestUtil.checkReader(ir);ir.close();dir.close();@@ -508,9 +508,9 @@ public class TestFieldCacheSort extends SolrTestCase {TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);assertEquals(3, td.totalHits.value);// null is treated as a 0- assertEquals("-1", searcher.doc(td.scoreDocs[0].doc).get("value"));- assertNull(searcher.doc(td.scoreDocs[1].doc).get("value"));- assertEquals("4", searcher.doc(td.scoreDocs[2].doc).get("value"));+ assertEquals("-1", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));+ assertNull(searcher.storedFields().document(td.scoreDocs[1].doc).get("value"));+ assertEquals("4", searcher.storedFields().document(td.scoreDocs[2].doc).get("value"));TestUtil.checkReader(ir);ir.close();dir.close();@@ -545,9 +545,9 @@ public class TestFieldCacheSort extends SolrTestCase {TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);assertEquals(3, td.totalHits.value);// null is treated as an Integer.MAX_VALUE- assertEquals("-1", searcher.doc(td.scoreDocs[0].doc).get("value"));- assertEquals("4", searcher.doc(td.scoreDocs[1].doc).get("value"));- assertNull(searcher.doc(td.scoreDocs[2].doc).get("value"));+ assertEquals("-1", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));+ assertEquals("4", searcher.storedFields().document(td.scoreDocs[1].doc).get("value"));+ assertNull(searcher.storedFields().document(td.scoreDocs[2].doc).get("value"));TestUtil.checkReader(ir);ir.close();dir.close();@@ -580,9 +580,9 @@ public class TestFieldCacheSort extends SolrTestCase {TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);assertEquals(3, td.totalHits.value);// reverse numeric order- assertEquals("300000", searcher.doc(td.scoreDocs[0].doc).get("value"));- assertEquals("4", searcher.doc(td.scoreDocs[1].doc).get("value"));- assertEquals("-1", searcher.doc(td.scoreDocs[2].doc).get("value"));+ assertEquals("300000", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));+ assertEquals("4", searcher.storedFields().document(td.scoreDocs[1].doc).get("value"));+ assertEquals("-1", searcher.storedFields().document(td.scoreDocs[2].doc).get("value"));TestUtil.checkReader(ir);ir.close();dir.close();@@ -612,9 +612,9 @@ public class TestFieldCacheSort extends SolrTestCase {TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);assertEquals(3, td.totalHits.value);// numeric order- assertEquals("-1", searcher.doc(td.scoreDocs[0].doc).get("value"));- assertEquals("4", searcher.doc(td.scoreDocs[1].doc).get("value"));- assertEquals("300000", searcher.doc(td.scoreDocs[2].doc).get("value"));+ assertEquals("-1", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));+ assertEquals("4", searcher.storedFields().document(td.scoreDocs[1].doc).get("value"));+ assertEquals("300000", searcher.storedFields().document(td.scoreDocs[2].doc).get("value"));TestUtil.checkReader(ir);ir.close();dir.close();@@ -643,9 +643,9 @@ public class TestFieldCacheSort extends SolrTestCase {TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);assertEquals(3, td.totalHits.value);// null is treated as a 0- assertEquals("-1", searcher.doc(td.scoreDocs[0].doc).get("value"));- assertNull(searcher.doc(td.scoreDocs[1].doc).get("value"));- assertEquals("4", searcher.doc(td.scoreDocs[2].doc).get("value"));+ assertEquals("-1", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));+ assertNull(searcher.storedFields().document(td.scoreDocs[1].doc).get("value"));+ assertEquals("4", searcher.storedFields().document(td.scoreDocs[2].doc).get("value"));TestUtil.checkReader(ir);ir.close();dir.close();@@ -679,9 +679,9 @@ public class TestFieldCacheSort extends SolrTestCase {TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);assertEquals(3, td.totalHits.value);// null is treated as an Integer.MAX_VALUE- assertEquals("-1", searcher.doc(td.scoreDocs[0].doc).get("value"));- assertEquals("4", searcher.doc(td.scoreDocs[1].doc).get("value"));- assertNull(searcher.doc(td.scoreDocs[2].doc).get("value"));+ assertEquals("-1", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));+ assertEquals("4", searcher.storedFields().document(td.scoreDocs[1].doc).get("value"));+ assertNull(searcher.storedFields().document(td.scoreDocs[2].doc).get("value"));TestUtil.checkReader(ir);ir.close();dir.close();@@ -711,9 +711,9 @@ public class TestFieldCacheSort extends SolrTestCase {TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);assertEquals(3, td.totalHits.value);// reverse numeric order- assertEquals("300000", searcher.doc(td.scoreDocs[0].doc).get("value"));- assertEquals("4", searcher.doc(td.scoreDocs[1].doc).get("value"));- assertEquals("-1", searcher.doc(td.scoreDocs[2].doc).get("value"));+ assertEquals("300000", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));+ assertEquals("4", searcher.storedFields().document(td.scoreDocs[1].doc).get("value"));+ assertEquals("-1", searcher.storedFields().document(td.scoreDocs[2].doc).get("value"));TestUtil.checkReader(ir);ir.close();dir.close();@@ -746,9 +746,9 @@ public class TestFieldCacheSort extends SolrTestCase {TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);assertEquals(3, td.totalHits.value);// numeric order- assertEquals("-1", searcher.doc(td.scoreDocs[0].doc).get("value"));- assertEquals("4", searcher.doc(td.scoreDocs[1].doc).get("value"));- assertEquals("3000000000", searcher.doc(td.scoreDocs[2].doc).get("value"));+ assertEquals("-1", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));+ assertEquals("4", searcher.storedFields().document(td.scoreDocs[1].doc).get("value"));+ assertEquals("3000000000", searcher.storedFields().document(td.scoreDocs[2].doc).get("value"));TestUtil.checkReader(ir);ir.close();dir.close();@@ -779,9 +779,9 @@ public class TestFieldCacheSort extends SolrTestCase {TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);assertEquals(3, td.totalHits.value);// null is treated as 0- assertEquals("-1", searcher.doc(td.scoreDocs[0].doc).get("value"));- assertNull(searcher.doc(td.scoreDocs[1].doc).get("value"));- assertEquals("4", searcher.doc(td.scoreDocs[2].doc).get("value"));+ assertEquals("-1", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));+ assertNull(searcher.storedFields().document(td.scoreDocs[1].doc).get("value"));+ assertEquals("4", searcher.storedFields().document(td.scoreDocs[2].doc).get("value"));TestUtil.checkReader(ir);ir.close();dir.close();@@ -816,9 +816,9 @@ public class TestFieldCacheSort extends SolrTestCase {TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);assertEquals(3, td.totalHits.value);// null is treated as Long.MAX_VALUE- assertEquals("-1", searcher.doc(td.scoreDocs[0].doc).get("value"));- assertEquals("4", searcher.doc(td.scoreDocs[1].doc).get("value"));- assertNull(searcher.doc(td.scoreDocs[2].doc).get("value"));+ assertEquals("-1", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));+ assertEquals("4", searcher.storedFields().document(td.scoreDocs[1].doc).get("value"));+ assertNull(searcher.storedFields().document(td.scoreDocs[2].doc).get("value"));TestUtil.checkReader(ir);ir.close();dir.close();@@ -851,9 +851,9 @@ public class TestFieldCacheSort extends SolrTestCase {TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);assertEquals(3, td.totalHits.value);// reverse numeric order- assertEquals("3000000000", searcher.doc(td.scoreDocs[0].doc).get("value"));- assertEquals("4", searcher.doc(td.scoreDocs[1].doc).get("value"));- assertEquals("-1", searcher.doc(td.scoreDocs[2].doc).get("value"));+ assertEquals("3000000000", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));+ assertEquals("4", searcher.storedFields().document(td.scoreDocs[1].doc).get("value"));+ assertEquals("-1", searcher.storedFields().document(td.scoreDocs[2].doc).get("value"));TestUtil.checkReader(ir);ir.close();dir.close();@@ -883,9 +883,9 @@ public class TestFieldCacheSort extends SolrTestCase {TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);assertEquals(3, td.totalHits.value);// numeric order- assertEquals("-1", searcher.doc(td.scoreDocs[0].doc).get("value"));- assertEquals("4", searcher.doc(td.scoreDocs[1].doc).get("value"));- assertEquals("3000000000", searcher.doc(td.scoreDocs[2].doc).get("value"));+ assertEquals("-1", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));+ assertEquals("4", searcher.storedFields().document(td.scoreDocs[1].doc).get("value"));+ assertEquals("3000000000", searcher.storedFields().document(td.scoreDocs[2].doc).get("value"));TestUtil.checkReader(ir);ir.close();dir.close();@@ -914,9 +914,9 @@ public class TestFieldCacheSort extends SolrTestCase {TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);assertEquals(3, td.totalHits.value);// null is treated as 0- assertEquals("-1", searcher.doc(td.scoreDocs[0].doc).get("value"));- assertNull(searcher.doc(td.scoreDocs[1].doc).get("value"));- assertEquals("4", searcher.doc(td.scoreDocs[2].doc).get("value"));+ assertEquals("-1", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));+ assertNull(searcher.storedFields().document(td.scoreDocs[1].doc).get("value"));+ assertEquals("4", searcher.storedFields().document(td.scoreDocs[2].doc).get("value"));TestUtil.checkReader(ir);ir.close();dir.close();@@ -950,9 +950,9 @@ public class TestFieldCacheSort extends SolrTestCase {TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);assertEquals(3, td.totalHits.value);// null is treated as Long.MAX_VALUE- assertEquals("-1", searcher.doc(td.scoreDocs[0].doc).get("value"));- assertEquals("4", searcher.doc(td.scoreDocs[1].doc).get("value"));- assertNull(searcher.doc(td.scoreDocs[2].doc).get("value"));+ assertEquals("-1", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));+ assertEquals("4", searcher.storedFields().document(td.scoreDocs[1].doc).get("value"));+ assertNull(searcher.storedFields().document(td.scoreDocs[2].doc).get("value"));TestUtil.checkReader(ir);ir.close();dir.close();@@ -982,9 +982,9 @@ public class TestFieldCacheSort extends SolrTestCase {TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);assertEquals(3, td.totalHits.value);// reverse numeric order- assertEquals("3000000000", searcher.doc(td.scoreDocs[0].doc).get("value"));- assertEquals("4", searcher.doc(td.scoreDocs[1].doc).get("value"));- assertEquals("-1", searcher.doc(td.scoreDocs[2].doc).get("value"));+ assertEquals("3000000000", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));+ assertEquals("4", searcher.storedFields().document(td.scoreDocs[1].doc).get("value"));+ assertEquals("-1", searcher.storedFields().document(td.scoreDocs[2].doc).get("value"));TestUtil.checkReader(ir);ir.close();dir.close();@@ -1017,9 +1017,9 @@ public class TestFieldCacheSort extends SolrTestCase {TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);assertEquals(3, td.totalHits.value);// numeric order- assertEquals("-1.3", searcher.doc(td.scoreDocs[0].doc).get("value"));- assertEquals("4.2", searcher.doc(td.scoreDocs[1].doc).get("value"));- assertEquals("30.1", searcher.doc(td.scoreDocs[2].doc).get("value"));+ assertEquals("-1.3", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));+ assertEquals("4.2", searcher.storedFields().document(td.scoreDocs[1].doc).get("value"));+ assertEquals("30.1", searcher.storedFields().document(td.scoreDocs[2].doc).get("value"));TestUtil.checkReader(ir);ir.close();dir.close();@@ -1050,9 +1050,9 @@ public class TestFieldCacheSort extends SolrTestCase {TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);assertEquals(3, td.totalHits.value);// null is treated as 0- assertEquals("-1.3", searcher.doc(td.scoreDocs[0].doc).get("value"));- assertNull(searcher.doc(td.scoreDocs[1].doc).get("value"));- assertEquals("4.2", searcher.doc(td.scoreDocs[2].doc).get("value"));+ assertEquals("-1.3", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));+ assertNull(searcher.storedFields().document(td.scoreDocs[1].doc).get("value"));+ assertEquals("4.2", searcher.storedFields().document(td.scoreDocs[2].doc).get("value"));TestUtil.checkReader(ir);ir.close();dir.close();@@ -1087,9 +1087,9 @@ public class TestFieldCacheSort extends SolrTestCase {TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);assertEquals(3, td.totalHits.value);// null is treated as Float.MAX_VALUE- assertEquals("-1.3", searcher.doc(td.scoreDocs[0].doc).get("value"));- assertEquals("4.2", searcher.doc(td.scoreDocs[1].doc).get("value"));- assertNull(searcher.doc(td.scoreDocs[2].doc).get("value"));+ assertEquals("-1.3", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));+ assertEquals("4.2", searcher.storedFields().document(td.scoreDocs[1].doc).get("value"));+ assertNull(searcher.storedFields().document(td.scoreDocs[2].doc).get("value"));TestUtil.checkReader(ir);ir.close();dir.close();@@ -1122,9 +1122,9 @@ public class TestFieldCacheSort extends SolrTestCase {TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);assertEquals(3, td.totalHits.value);// reverse numeric order- assertEquals("30.1", searcher.doc(td.scoreDocs[0].doc).get("value"));- assertEquals("4.2", searcher.doc(td.scoreDocs[1].doc).get("value"));- assertEquals("-1.3", searcher.doc(td.scoreDocs[2].doc).get("value"));+ assertEquals("30.1", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));+ assertEquals("4.2", searcher.storedFields().document(td.scoreDocs[1].doc).get("value"));+ assertEquals("-1.3", searcher.storedFields().document(td.scoreDocs[2].doc).get("value"));TestUtil.checkReader(ir);ir.close();dir.close();@@ -1154,9 +1154,9 @@ public class TestFieldCacheSort extends SolrTestCase {TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);assertEquals(3, td.totalHits.value);// numeric order- assertEquals("-1.3", searcher.doc(td.scoreDocs[0].doc).get("value"));- assertEquals("4.2", searcher.doc(td.scoreDocs[1].doc).get("value"));- assertEquals("30.1", searcher.doc(td.scoreDocs[2].doc).get("value"));+ assertEquals("-1.3", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));+ assertEquals("4.2", searcher.storedFields().document(td.scoreDocs[1].doc).get("value"));+ assertEquals("30.1", searcher.storedFields().document(td.scoreDocs[2].doc).get("value"));TestUtil.checkReader(ir);ir.close();dir.close();@@ -1185,9 +1185,9 @@ public class TestFieldCacheSort extends SolrTestCase {TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);assertEquals(3, td.totalHits.value);// null is treated as 0- assertEquals("-1.3", searcher.doc(td.scoreDocs[0].doc).get("value"));- assertNull(searcher.doc(td.scoreDocs[1].doc).get("value"));- assertEquals("4.2", searcher.doc(td.scoreDocs[2].doc).get("value"));+ assertEquals("-1.3", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));+ assertNull(searcher.storedFields().document(td.scoreDocs[1].doc).get("value"));+ assertEquals("4.2", searcher.storedFields().document(td.scoreDocs[2].doc).get("value"));TestUtil.checkReader(ir);ir.close();dir.close();@@ -1221,9 +1221,9 @@ public class TestFieldCacheSort extends SolrTestCase {TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);assertEquals(3, td.totalHits.value);// null is treated as Float.MAX_VALUE- assertEquals("-1.3", searcher.doc(td.scoreDocs[0].doc).get("value"));- assertEquals("4.2", searcher.doc(td.scoreDocs[1].doc).get("value"));- assertNull(searcher.doc(td.scoreDocs[2].doc).get("value"));+ assertEquals("-1.3", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));+ assertEquals("4.2", searcher.storedFields().document(td.scoreDocs[1].doc).get("value"));+ assertNull(searcher.storedFields().document(td.scoreDocs[2].doc).get("value"));TestUtil.checkReader(ir);ir.close();dir.close();@@ -1253,9 +1253,9 @@ public class TestFieldCacheSort extends SolrTestCase {TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);assertEquals(3, td.totalHits.value);// reverse numeric order- assertEquals("30.1", searcher.doc(td.scoreDocs[0].doc).get("value"));- assertEquals("4.2", searcher.doc(td.scoreDocs[1].doc).get("value"));- assertEquals("-1.3", searcher.doc(td.scoreDocs[2].doc).get("value"));+ assertEquals("30.1", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));+ assertEquals("4.2", searcher.storedFields().document(td.scoreDocs[1].doc).get("value"));+ assertEquals("-1.3", searcher.storedFields().document(td.scoreDocs[2].doc).get("value"));TestUtil.checkReader(ir);ir.close();dir.close();@@ -1292,10 +1292,12 @@ public class TestFieldCacheSort extends SolrTestCase {TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);assertEquals(4, td.totalHits.value);// numeric order- assertEquals("-1.3", searcher.doc(td.scoreDocs[0].doc).get("value"));- assertEquals("4.2333333333332", searcher.doc(td.scoreDocs[1].doc).get("value"));- assertEquals("4.2333333333333", searcher.doc(td.scoreDocs[2].doc).get("value"));- assertEquals("30.1", searcher.doc(td.scoreDocs[3].doc).get("value"));+ assertEquals("-1.3", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));+ assertEquals(+ "4.2333333333332", searcher.storedFields().document(td.scoreDocs[1].doc).get("value"));+ assertEquals(+ "4.2333333333333", searcher.storedFields().document(td.scoreDocs[2].doc).get("value"));+ assertEquals("30.1", searcher.storedFields().document(td.scoreDocs[3].doc).get("value"));TestUtil.checkReader(ir);ir.close();dir.close();@@ -1325,8 +1327,20 @@ public class TestFieldCacheSort extends SolrTestCase {TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);assertEquals(2, td.totalHits.value);// numeric order- double v0 = searcher.doc(td.scoreDocs[0].doc).getField("value").numericValue().doubleValue();- double v1 = searcher.doc(td.scoreDocs[1].doc).getField("value").numericValue().doubleValue();+ double v0 =+ searcher+ .storedFields()+ .document(td.scoreDocs[0].doc)+ .getField("value")+ .numericValue()+ .doubleValue();+ double v1 =+ searcher+ .storedFields()+ .document(td.scoreDocs[1].doc)+ .getField("value")+ .numericValue()+ .doubleValue();assertEquals(0, v0, 0d);assertEquals(0, v1, 0d);// check sign bits@@ -1366,10 +1380,12 @@ public class TestFieldCacheSort extends SolrTestCase {TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);assertEquals(4, td.totalHits.value);// null treated as a 0- assertEquals("-1.3", searcher.doc(td.scoreDocs[0].doc).get("value"));- assertNull(searcher.doc(td.scoreDocs[1].doc).get("value"));- assertEquals("4.2333333333332", searcher.doc(td.scoreDocs[2].doc).get("value"));- assertEquals("4.2333333333333", searcher.doc(td.scoreDocs[3].doc).get("value"));+ assertEquals("-1.3", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));+ assertNull(searcher.storedFields().document(td.scoreDocs[1].doc).get("value"));+ assertEquals(+ "4.2333333333332", searcher.storedFields().document(td.scoreDocs[2].doc).get("value"));+ assertEquals(+ "4.2333333333333", searcher.storedFields().document(td.scoreDocs[3].doc).get("value"));TestUtil.checkReader(ir);ir.close();dir.close();@@ -1409,10 +1425,12 @@ public class TestFieldCacheSort extends SolrTestCase {TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);assertEquals(4, td.totalHits.value);// null treated as Double.MAX_VALUE- assertEquals("-1.3", searcher.doc(td.scoreDocs[0].doc).get("value"));- assertEquals("4.2333333333332", searcher.doc(td.scoreDocs[1].doc).get("value"));- assertEquals("4.2333333333333", searcher.doc(td.scoreDocs[2].doc).get("value"));- assertNull(searcher.doc(td.scoreDocs[3].doc).get("value"));+ assertEquals("-1.3", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));+ assertEquals(+ "4.2333333333332", searcher.storedFields().document(td.scoreDocs[1].doc).get("value"));+ assertEquals(+ "4.2333333333333", searcher.storedFields().document(td.scoreDocs[2].doc).get("value"));+ assertNull(searcher.storedFields().document(td.scoreDocs[3].doc).get("value"));TestUtil.checkReader(ir);ir.close();dir.close();@@ -1449,10 +1467,12 @@ public class TestFieldCacheSort extends SolrTestCase {TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);assertEquals(4, td.totalHits.value);// numeric order- assertEquals("30.1", searcher.doc(td.scoreDocs[0].doc).get("value"));- assertEquals("4.2333333333333", searcher.doc(td.scoreDocs[1].doc).get("value"));- assertEquals("4.2333333333332", searcher.doc(td.scoreDocs[2].doc).get("value"));- assertEquals("-1.3", searcher.doc(td.scoreDocs[3].doc).get("value"));+ assertEquals("30.1", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));+ assertEquals(+ "4.2333333333333", searcher.storedFields().document(td.scoreDocs[1].doc).get("value"));+ assertEquals(+ "4.2333333333332", searcher.storedFields().document(td.scoreDocs[2].doc).get("value"));+ assertEquals("-1.3", searcher.storedFields().document(td.scoreDocs[3].doc).get("value"));TestUtil.checkReader(ir);ir.close();dir.close();@@ -1485,10 +1505,12 @@ public class TestFieldCacheSort extends SolrTestCase {TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);assertEquals(4, td.totalHits.value);// numeric order- assertEquals("-1.3", searcher.doc(td.scoreDocs[0].doc).get("value"));- assertEquals("4.2333333333332", searcher.doc(td.scoreDocs[1].doc).get("value"));- assertEquals("4.2333333333333", searcher.doc(td.scoreDocs[2].doc).get("value"));- assertEquals("30.1", searcher.doc(td.scoreDocs[3].doc).get("value"));+ assertEquals("-1.3", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));+ assertEquals(+ "4.2333333333332", searcher.storedFields().document(td.scoreDocs[1].doc).get("value"));+ assertEquals(+ "4.2333333333333", searcher.storedFields().document(td.scoreDocs[2].doc).get("value"));+ assertEquals("30.1", searcher.storedFields().document(td.scoreDocs[3].doc).get("value"));TestUtil.checkReader(ir);ir.close();dir.close();@@ -1516,8 +1538,20 @@ public class TestFieldCacheSort extends SolrTestCase {TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);assertEquals(2, td.totalHits.value);// numeric order- double v0 = searcher.doc(td.scoreDocs[0].doc).getField("value").numericValue().doubleValue();- double v1 = searcher.doc(td.scoreDocs[1].doc).getField("value").numericValue().doubleValue();+ double v0 =+ searcher+ .storedFields()+ .document(td.scoreDocs[0].doc)+ .getField("value")+ .numericValue()+ .doubleValue();+ double v1 =+ searcher+ .storedFields()+ .document(td.scoreDocs[1].doc)+ .getField("value")+ .numericValue()+ .doubleValue();assertEquals(0, v0, 0d);assertEquals(0, v1, 0d);// check sign bits@@ -1554,10 +1588,12 @@ public class TestFieldCacheSort extends SolrTestCase {TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);assertEquals(4, td.totalHits.value);// null treated as a 0- assertEquals("-1.3", searcher.doc(td.scoreDocs[0].doc).get("value"));- assertNull(searcher.doc(td.scoreDocs[1].doc).get("value"));- assertEquals("4.2333333333332", searcher.doc(td.scoreDocs[2].doc).get("value"));- assertEquals("4.2333333333333", searcher.doc(td.scoreDocs[3].doc).get("value"));+ assertEquals("-1.3", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));+ assertNull(searcher.storedFields().document(td.scoreDocs[1].doc).get("value"));+ assertEquals(+ "4.2333333333332", searcher.storedFields().document(td.scoreDocs[2].doc).get("value"));+ assertEquals(+ "4.2333333333333", searcher.storedFields().document(td.scoreDocs[3].doc).get("value"));TestUtil.checkReader(ir);ir.close();dir.close();@@ -1594,10 +1630,12 @@ public class TestFieldCacheSort extends SolrTestCase {TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);assertEquals(4, td.totalHits.value);// null treated as Double.MAX_VALUE- assertEquals("-1.3", searcher.doc(td.scoreDocs[0].doc).get("value"));- assertEquals("4.2333333333332", searcher.doc(td.scoreDocs[1].doc).get("value"));- assertEquals("4.2333333333333", searcher.doc(td.scoreDocs[2].doc).get("value"));- assertNull(searcher.doc(td.scoreDocs[3].doc).get("value"));+ assertEquals("-1.3", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));+ assertEquals(+ "4.2333333333332", searcher.storedFields().document(td.scoreDocs[1].doc).get("value"));+ assertEquals(+ "4.2333333333333", searcher.storedFields().document(td.scoreDocs[2].doc).get("value"));+ assertNull(searcher.storedFields().document(td.scoreDocs[3].doc).get("value"));TestUtil.checkReader(ir);ir.close();dir.close();@@ -1630,10 +1668,12 @@ public class TestFieldCacheSort extends SolrTestCase {TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);assertEquals(4, td.totalHits.value);// numeric order- assertEquals("30.1", searcher.doc(td.scoreDocs[0].doc).get("value"));- assertEquals("4.2333333333333", searcher.doc(td.scoreDocs[1].doc).get("value"));- assertEquals("4.2333333333332", searcher.doc(td.scoreDocs[2].doc).get("value"));- assertEquals("-1.3", searcher.doc(td.scoreDocs[3].doc).get("value"));+ assertEquals("30.1", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));+ assertEquals(+ "4.2333333333333", searcher.storedFields().document(td.scoreDocs[1].doc).get("value"));+ assertEquals(+ "4.2333333333332", searcher.storedFields().document(td.scoreDocs[2].doc).get("value"));+ assertEquals("-1.3", searcher.storedFields().document(td.scoreDocs[3].doc).get("value"));TestUtil.checkReader(ir);ir.close();dir.close();@@ -1784,7 +1824,7 @@ public class TestFieldCacheSort extends SolrTestCase {TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);assertEquals(1, td.totalHits.value);- assertEquals("foo", searcher.doc(td.scoreDocs[0].doc).get("value"));+ assertEquals("foo", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));TestUtil.checkReader(ir);ir.close();dir.close();@@ -1844,8 +1884,8 @@ public class TestFieldCacheSort extends SolrTestCase {TopDocs td = searcher.search(new MatchAllDocsQuery(), 10, sort);assertEquals(2, td.totalHits.value);// 'bar' comes before 'foo'- assertEquals("bar", searcher.doc(td.scoreDocs[0].doc).get("value"));- assertEquals("foo", searcher.doc(td.scoreDocs[1].doc).get("value"));+ assertEquals("bar", searcher.storedFields().document(td.scoreDocs[0].doc).get("value"));+ assertEquals("foo", searcher.storedFields().document(td.scoreDocs[1].doc).get("value"));TestUtil.checkReader(ir);ir.close();dir.close();diff --git a/solr/core/src/test/org/apache/solr/uninverting/TestNumericTerms32.java b/solr/core/src/test/org/apache/solr/uninverting/TestNumericTerms32.javaindex f4954ceab71..6596b75b6a4 100644--- a/solr/core/src/test/org/apache/solr/uninverting/TestNumericTerms32.java+++ b/solr/core/src/test/org/apache/solr/uninverting/TestNumericTerms32.java@@ -141,9 +141,11 @@ public class TestNumericTerms32 extends SolrTestCase {if (topDocs.totalHits.value == 0) continue;ScoreDoc[] sd = topDocs.scoreDocs;assertNotNull(sd);- int last = searcher.doc(sd[0].doc).getField(field).numericValue().intValue();+ int last =+ searcher.storedFields().document(sd[0].doc).getField(field).numericValue().intValue();for (int j = 1; j < sd.length; j++) {- int act = searcher.doc(sd[j].doc).getField(field).numericValue().intValue();+ int act =+ searcher.storedFields().document(sd[j].doc).getField(field).numericValue().intValue();assertTrue("Docs should be sorted backwards", last > act);last = act;}diff --git a/solr/core/src/test/org/apache/solr/uninverting/TestNumericTerms64.java b/solr/core/src/test/org/apache/solr/uninverting/TestNumericTerms64.javaindex 95335a1d805..48bdefe4b5c 100644--- a/solr/core/src/test/org/apache/solr/uninverting/TestNumericTerms64.java+++ b/solr/core/src/test/org/apache/solr/uninverting/TestNumericTerms64.java@@ -147,9 +147,11 @@ public class TestNumericTerms64 extends SolrTestCase {if (topDocs.totalHits.value == 0) continue;ScoreDoc[] sd = topDocs.scoreDocs;assertNotNull(sd);- long last = searcher.doc(sd[0].doc).getField(field).numericValue().longValue();+ long last =+ searcher.storedFields().document(sd[0].doc).getField(field).numericValue().longValue();for (int j = 1; j < sd.length; j++) {- long act = searcher.doc(sd[j].doc).getField(field).numericValue().longValue();+ long act =+ searcher.storedFields().document(sd[j].doc).getField(field).numericValue().longValue();assertTrue("Docs should be sorted backwards", last > act);last = act;}diff --git a/solr/core/src/test/org/apache/solr/update/AddBlockUpdateTest.java b/solr/core/src/test/org/apache/solr/update/AddBlockUpdateTest.javaindex a54850f231b..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 class AddBlockUpdateTest extends SolrTestCaseJ4 {final TopDocs docs = searcher.search(join(one("cd")), 10);assertEquals(2, docs.totalHits.value);final String pAct =- searcher.doc(docs.scoreDocs[0].doc).get(parent)- + searcher.doc(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 @@ public class AddBlockUpdateTest extends SolrTestCaseJ4 {throws IOException {final TopDocs docs = searcher.search(join(childTerm), 10);assertEquals(1, docs.totalHits.value);- final String pAct = searcher.doc(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.javaindex 003385316dd..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 @@ public class ClassificationUpdateProcessorIntegrationTest extends SolrTestCaseJ4TermQuery query = new TermQuery(new Term(ID, id));TopDocs doc1 = searcher.search(query, 1);ScoreDoc scoreDoc = doc1.scoreDocs[0];- return searcher.doc(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.javaindex 6c749cd99d0..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 class TestLTRReRankingPipeline extends SolrTestCaseJ4 {// first run the standard queryTopDocs 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("0", searcher.getDocFetcher().doc(hits.scoreDocs[0].doc).get("id"));+ assertEquals("1", searcher.getDocFetcher().doc(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.getDocFetcher().doc(hits.scoreDocs[0].doc).get("id"));+ assertEquals("0", searcher.getDocFetcher().doc(hits.scoreDocs[1].doc).get("id"));}}@@ -173,11 +173,11 @@ public class TestLTRReRankingPipeline extends SolrTestCaseJ4 {TopDocs hits = searcher.search(bqBuilder.build(), 10);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.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<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 orderhits = 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.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@@ -219,9 +219,13 @@ 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.getDocFetcher().doc(hits.scoreDocs[j].doc).get("id"),+ j);}- assertEquals(i, Integer.parseInt(searcher.doc(hits.scoreDocs[j].doc).get("id")));+ assertEquals(+ i, Integer.parseInt(searcher.getDocFetcher().doc(hits.scoreDocs[j].doc).get("id")));assertEquals((i + 1) * features.size() * featureWeight, hits.scoreDocs[j].score, 0.00001);}}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.javaindex 8bcd684f1b0..34612bc8b54 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@@ -193,8 +193,8 @@ public class TestLTRScoringQuery extends SolrTestCase {// first run the standard queryfinal 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("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.javaindex be3bf3d481b..6f730bf86a3 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@@ -138,8 +138,8 @@ public class TestSelectiveWeightCreation extends TestRerankBase {// first run the standard queryfinal 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("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});