You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ds...@apache.org on 2019/10/01 13:18:11 UTC
[lucene-solr] branch master updated: SOLR-13802: Write analyzer
property luceneMatchVersion to managed schema
This is an automated email from the ASF dual-hosted git repository.
dsmiley pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/master by this push:
new 4ddde00 SOLR-13802: Write analyzer property luceneMatchVersion to managed schema
4ddde00 is described below
commit 4ddde00667faa3c23081b9bdfc552ab3472bad24
Author: Thomas Wöckinger <th...@users.noreply.github.com>
AuthorDate: Tue Oct 1 09:17:59 2019 -0400
SOLR-13802: Write analyzer property luceneMatchVersion to managed schema
---
solr/CHANGES.txt | 3 +++
solr/core/src/java/org/apache/solr/core/SolrConfig.java | 5 +++--
solr/core/src/java/org/apache/solr/response/SchemaXmlWriter.java | 2 ++
solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java | 5 ++---
.../core/src/test/org/apache/solr/rest/schema/TestBulkSchemaAPI.java | 5 ++++-
.../src/test/org/apache/solr/client/solrj/request/SchemaTest.java | 2 ++
6 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 8a1e2fc..bc27b0a 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -259,6 +259,9 @@ Bug Fixes
* SOLR-13712: JMX MBeans are not exposed because of race condition between creating platform mbean server and
registering mbeans. (shalin)
+* SOLR-13802: Managed schema manipulations were not persisting the optional luceneMatchVersion that can be set
+ on an Analyzer. (Thomas Wöckinger)
+
Other Changes
----------------------
diff --git a/solr/core/src/java/org/apache/solr/core/SolrConfig.java b/solr/core/src/java/org/apache/solr/core/SolrConfig.java
index 914a102..2ab7851 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrConfig.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrConfig.java
@@ -62,6 +62,7 @@ import org.apache.solr.request.SolrRequestHandler;
import org.apache.solr.response.QueryResponseWriter;
import org.apache.solr.response.transform.TransformerFactory;
import org.apache.solr.rest.RestManager;
+import org.apache.solr.schema.IndexSchema;
import org.apache.solr.schema.IndexSchemaFactory;
import org.apache.solr.search.CacheConfig;
import org.apache.solr.search.FastLRUCache;
@@ -207,7 +208,7 @@ public class SolrConfig extends XmlConfigFile implements MapSerializable {
getOverlay();//just in case it is not initialized
getRequestParams();
initLibs();
- luceneMatchVersion = SolrConfig.parseLuceneVersionString(getVal("luceneMatchVersion", true));
+ luceneMatchVersion = SolrConfig.parseLuceneVersionString(getVal(IndexSchema.LUCENE_MATCH_VERSION_PARAM, true));
log.info("Using Lucene MatchVersion: {}", luceneMatchVersion);
String indexConfigPrefix;
@@ -896,7 +897,7 @@ public class SolrConfig extends XmlConfigFile implements MapSerializable {
@Override
public Map<String, Object> toMap(Map<String, Object> result) {
if (getZnodeVersion() > -1) result.put(ZNODEVER, getZnodeVersion());
- result.put("luceneMatchVersion", luceneMatchVersion);
+ result.put(IndexSchema.LUCENE_MATCH_VERSION_PARAM, luceneMatchVersion);
result.put("updateHandler", getUpdateHandlerInfo());
Map m = new LinkedHashMap();
result.put("query", m);
diff --git a/solr/core/src/java/org/apache/solr/response/SchemaXmlWriter.java b/solr/core/src/java/org/apache/solr/response/SchemaXmlWriter.java
index 1af6634..82a5301 100644
--- a/solr/core/src/java/org/apache/solr/response/SchemaXmlWriter.java
+++ b/solr/core/src/java/org/apache/solr/response/SchemaXmlWriter.java
@@ -219,6 +219,8 @@ public class SchemaXmlWriter extends TextResponseWriter {
if ( ! "solr.TokenizerChain".equals(analyzerProperties.getVal(i))) {
writeAttr(name, analyzerProperties.getVal(i).toString());
}
+ } else if (name.equals(IndexSchema.LUCENE_MATCH_VERSION_PARAM)) {
+ writeAttr(name, analyzerProperties.getVal(i).toString());
}
}
boolean isEmptyTag
diff --git a/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java b/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java
index c8da0bb..781e199 100644
--- a/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java
+++ b/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java
@@ -234,10 +234,9 @@ public final class FieldTypePluginLoader
schema.getDefaultLuceneMatchVersion() :
SolrConfig.parseLuceneVersionString(matchVersionStr);
if (luceneMatchVersion == null) {
- throw new SolrException
- ( SolrException.ErrorCode.SERVER_ERROR,
+ throw new SolrException(SolrException.ErrorCode.SERVER_ERROR,
"Configuration Error: Analyzer '" + clazz.getName() +
- "' needs a 'luceneMatchVersion' parameter");
+ "' needs a '" + IndexSchema.LUCENE_MATCH_VERSION_PARAM + "' parameter");
}
analyzer.setVersion(luceneMatchVersion);
return analyzer;
diff --git a/solr/core/src/test/org/apache/solr/rest/schema/TestBulkSchemaAPI.java b/solr/core/src/test/org/apache/solr/rest/schema/TestBulkSchemaAPI.java
index e40db98..35305b8 100644
--- a/solr/core/src/test/org/apache/solr/rest/schema/TestBulkSchemaAPI.java
+++ b/solr/core/src/test/org/apache/solr/rest/schema/TestBulkSchemaAPI.java
@@ -35,6 +35,7 @@ import org.apache.lucene.search.similarities.Similarity;
import org.apache.solr.common.SolrDocumentList;
import org.apache.solr.core.CoreContainer;
import org.apache.solr.core.SolrCore;
+import org.apache.solr.schema.IndexSchema;
import org.apache.solr.schema.SimilarityFactory;
import org.apache.solr.search.similarities.SchemaSimilarityFactory;
import org.apache.solr.util.RESTfulServerProvider;
@@ -183,12 +184,14 @@ public class TestBulkSchemaAPI extends RestTestBase {
response = restTestHarness.post("/schema", json(addFieldTypeAnalyzerWithClass + suffix));
map = (Map) fromJSONString(response);
assertNull(response, map.get("error"));
+
+ restTestHarness.checkAdminResponseStatus("/admin/cores?wt=xml&action=RELOAD&core=" + coreName, "0");
map = getObj(restTestHarness, "myNewTextFieldWithAnalyzerClass", "fieldTypes");
assertNotNull(map);
Map analyzer = (Map)map.get("analyzer");
assertEquals("org.apache.lucene.analysis.core.WhitespaceAnalyzer", String.valueOf(analyzer.get("class")));
- assertEquals("5.0.0", String.valueOf(analyzer.get("luceneMatchVersion")));
+ assertEquals("5.0.0", String.valueOf(analyzer.get(IndexSchema.LUCENE_MATCH_VERSION_PARAM)));
}
public void testAnalyzerByName() throws Exception {
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/request/SchemaTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/request/SchemaTest.java
index 76ce4ab..3f08722 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/request/SchemaTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/request/SchemaTest.java
@@ -622,6 +622,8 @@ public class SchemaTest extends RestTestBase {
SchemaResponse.UpdateResponse addFieldTypeResponse = addFieldTypeRequest.process(getSolrClient());
assertValidSchemaResponse(addFieldTypeResponse);
+ restTestHarness.reload();
+
SchemaRequest.FieldType fieldTypeRequest = new SchemaRequest.FieldType(fieldTypeName);
SchemaResponse.FieldTypeResponse newFieldTypeResponse = fieldTypeRequest.process(getSolrClient());
assertValidSchemaResponse(newFieldTypeResponse);