You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ds...@apache.org on 2021/04/21 16:41:08 UTC

[solr] branch main updated: SOLR-15356: MergeIndexes should not use UninvertingReader. (#84)

This is an automated email from the ASF dual-hosted git repository.

dsmiley pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git


The following commit(s) were added to refs/heads/main by this push:
     new d6ff3dd  SOLR-15356: MergeIndexes should not use UninvertingReader. (#84)
d6ff3dd is described below

commit d6ff3ddc0b8ec63db87014e10e118d6a8be5c029
Author: David Smiley <ds...@apache.org>
AuthorDate: Wed Apr 21 12:40:59 2021 -0400

    SOLR-15356: MergeIndexes should not use UninvertingReader. (#84)
    
    Also change some tests to avoid Lucene's new FieldInfo consistency checks in LUCENE-9334
---
 solr/CHANGES.txt                                       |  1 +
 .../org/apache/solr/handler/admin/MergeIndexesOp.java  |  2 +-
 .../org/apache/solr/schema/TestManagedSchemaAPI.java   | 12 +++++++++---
 .../org/apache/solr/client/solrj/SolrExampleTests.java | 18 ++++++++++--------
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 179e18c..094eaeb 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.java
index d9f5de3..d025522a 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 decref
           RefCounted<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.java
index f022ac3..e0303e5 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=true
 
     SolrInputDocument doc = new SolrInputDocument("id", "3");
     cloudClient.add(collection, doc);
     cloudClient.commit(collection);
+    cloudClient.query(collection, params("q", "*:*", "sort", "id asc")); // does not throw
 
     String 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.java
index 7a69eda..ac43555 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
   @Test
   public 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 SolrExampleTestsBase
     doc = 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 SolrExampleTestsBase
     doc = 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 version
     oper.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"));
   }