Apache Solr open-source search software
SOLR-15356: MergeIndexes should not use UninvertingReader. (#84)
David Smileyd6ff3ddc0b8e
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 179e18c4182..094eaebd332 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -266,6 +266,7 @@ Other Changes* SOLR-15146: Allow Collection API and Config Set API to be done in a distributed fashion without going through Overseer (Ilan Ginzburg)+* SOLR-15356: "mergeindexes" should not use UninvertingReader (FieldCache). (David Smiley)Bug Fixes---------------------diff --git a/solr/core/src/java/org/apache/solr/handler/admin/MergeIndexesOp.java b/solr/core/src/java/org/apache/solr/handler/admin/MergeIndexesOp.javaindex d9f5de3b76f..d025522aa0b 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/MergeIndexesOp.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/MergeIndexesOp.java@@ -103,7 +103,7 @@ class MergeIndexesOp implements CoreAdminHandler.CoreAdminOp {// record the searchers so that we can decrefRefCounted<SolrIndexSearcher> searcher = solrCore.getSearcher();searchers.add(searcher);- readers.add(searcher.get().getIndexReader());+ readers.add(searcher.get().getRawReader());}}diff --git a/solr/core/src/test/org/apache/solr/schema/TestManagedSchemaAPI.java b/solr/core/src/test/org/apache/solr/schema/TestManagedSchemaAPI.javaindex f022ac3b2d2..e0303e5c26b 100644--- a/solr/core/src/test/org/apache/solr/schema/TestManagedSchemaAPI.java+++ b/solr/core/src/test/org/apache/solr/schema/TestManagedSchemaAPI.java@@ -87,7 +87,7 @@ public class TestManagedSchemaAPI extends SolrCloudTestCase {doc.addField("id", "2");doc.addField(fieldName, "val1");UpdateRequest ureq = new UpdateRequest().add(doc);- cloudClient.request(ureq, collection);;+ cloudClient.request(ureq, collection);}private void addStringField(String fieldName, String collection, CloudSolrClient cloudClient) throws IOException, SolrServerException {@@ -102,18 +102,20 @@ public class TestManagedSchemaAPI extends SolrCloudTestCase {log.info("added new field={}", fieldName);}- private void testModifyField(String collection) throws IOException, SolrServerException {+ private void testModifyField(String collection) throws Exception {CloudSolrClient cloudClient = cluster.getSolrClient();+ // assumption: in this schema, the id field is docValues=false, uninvertible=trueSolrInputDocument doc = new SolrInputDocument("id", "3");cloudClient.add(collection, doc);cloudClient.commit(collection);+ cloudClient.query(collection, params("q", "*:*", "sort", "id asc")); // does not throwString fieldName = "id";SchemaRequest.Field getFieldRequest = new SchemaRequest.Field(fieldName);SchemaResponse.FieldResponse getFieldResponse = getFieldRequest.process(cloudClient, collection);Map<String, Object> field = getFieldResponse.getField();- field.put("docValues", true);+ field.put("uninvertible", false); // and because this field does not have docValues, can't sort.SchemaRequest.ReplaceField replaceRequest = new SchemaRequest.ReplaceField(field);SchemaResponse.UpdateResponse replaceResponse = replaceRequest.process(cloudClient, collection);assertNull(replaceResponse.getResponse().get("errors"));@@ -122,6 +124,10 @@ public class TestManagedSchemaAPI extends SolrCloudTestCase {assertEquals(0, response.getStatus());assertTrue(response.isSuccess());+ Exception e = expectThrows(Exception.class, () -> {+ cloudClient.query(collection, params("q", "*:*", "sort", "id asc"));+ });+ assertTrue("Should fail because needs docValues", e.getMessage().contains("docValues"));}}diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.javaindex 7a69edac590..ac43555550e 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java@@ -1765,22 +1765,24 @@ abstract public class SolrExampleTests extends SolrExampleTestsBase@Testpublic void testUpdateField() throws Exception {//no versions+ // Use a simple float field. "price"->"price_c" has problems: SOLR-15357 & SOLR-15358+ final String field = "price_f";SolrClient client = getSolrClient();client.deleteByQuery("*:*");client.commit();SolrInputDocument doc = new SolrInputDocument();doc.addField("id", "unique");doc.addField("name", "gadget");- doc.addField("price", 1);+ doc.addField(field, 1);client.add(doc);client.commit();SolrQuery q = new SolrQuery("*:*");- q.setFields("id","price","name", "_version_");+ q.setFields("id", field,"name", "_version_");QueryResponse resp = client.query(q);assertEquals("Doc count does not match", 1, resp.getResults().getNumFound());Long version = (Long)resp.getResults().get(0).getFirstValue("_version_");assertNotNull("no version returned", version);- assertEquals(1.0f, resp.getResults().get(0).getFirstValue("price"));+ assertEquals(1.0f, resp.getResults().get(0).getFirstValue(field));//update "price" with incorrect version (optimistic locking)HashMap<String, Object> oper = new HashMap<>(); //need better api for this???@@ -1789,7 +1791,7 @@ abstract public class SolrExampleTests extends SolrExampleTestsBasedoc = new SolrInputDocument();doc.addField("id", "unique");doc.addField("_version_", version+1);- doc.addField("price", oper);+ doc.addField(field, oper);try {client.add(doc);if(client instanceof HttpSolrClient) { //XXX concurrent client reports exceptions differently@@ -1813,24 +1815,24 @@ abstract public class SolrExampleTests extends SolrExampleTestsBasedoc = new SolrInputDocument();doc.addField("id", "unique");doc.addField("_version_", version);- doc.addField("price", oper);+ doc.addField(field, oper);client.add(doc);client.commit();resp = client.query(q);assertEquals("Doc count does not match", 1, resp.getResults().getNumFound());- assertEquals("price was not updated?", 100.0f, resp.getResults().get(0).getFirstValue("price"));+ assertEquals("price was not updated?", 100.0f, resp.getResults().get(0).getFirstValue(field));assertEquals("no name?", "gadget", resp.getResults().get(0).getFirstValue("name"));//update "price", no versionoper.put("set", 200);doc = new SolrInputDocument();doc.addField("id", "unique");- doc.addField("price", oper);+ doc.addField(field, oper);client.add(doc);client.commit();resp = client.query(q);assertEquals("Doc count does not match", 1, resp.getResults().getNumFound());- assertEquals("price was not updated?", 200.0f, resp.getResults().get(0).getFirstValue("price"));+ assertEquals("price was not updated?", 200.0f, resp.getResults().get(0).getFirstValue(field));assertEquals("no name?", "gadget", resp.getResults().get(0).getFirstValue("name"));}