Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-6764: Field types need to be re-informed after reloading a managed schema from ZK 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1651763 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Timothy Potter 2015-01-14 18:25:10 +00:00
parent 0f5e7462f5
commit 4930a38e84
2 changed files with 43 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
solr/CHANGES.txt
View File

@ -445,6 +445,9 @@ Bug Fixes
* SOLR-6941: DistributedQueue#containsTaskWithRequestId can fail with NPE. (Mark Miller)
* SOLR-6764: Field types need to be re-informed after reloading a managed schema from ZK
(Timothy Potter)
Optimizations
----------------------

69
solr/core/src/java/org/apache/solr/schema/ManagedIndexSchema.java
View File

@ -560,34 +560,8 @@ public final class ManagedIndexSchema extends IndexSchema {
aware.inform(newSchema);
// looks good for the add, notify ResoureLoaderAware objects
for (FieldType fieldType : fieldTypeList) {
// must inform any sub-components used in the
// tokenizer chain if they are ResourceLoaderAware
if (fieldType.supportsAnalyzers()) {
Analyzer indexAnalyzer = fieldType.getIndexAnalyzer();
if (indexAnalyzer != null && indexAnalyzer instanceof TokenizerChain)
informResourceLoaderAwareObjectsInChain((TokenizerChain)indexAnalyzer);
Analyzer queryAnalyzer = fieldType.getQueryAnalyzer();
// ref comparison is correct here (vs. equals) as they may be the same
// object in which case, we don't need to inform twice ... however, it's
// actually safe to call inform multiple times on an object anyway
if (queryAnalyzer != null &&
queryAnalyzer != indexAnalyzer &&
queryAnalyzer instanceof TokenizerChain)
informResourceLoaderAwareObjectsInChain((TokenizerChain)queryAnalyzer);
// if fieldType is a TextField, it might have a multi-term analyzer
if (fieldType instanceof TextField) {
TextField textFieldType = (TextField)fieldType;
Analyzer multiTermAnalyzer = textFieldType.getMultiTermAnalyzer();
if (multiTermAnalyzer != null && multiTermAnalyzer != indexAnalyzer &&
multiTermAnalyzer != queryAnalyzer && multiTermAnalyzer instanceof TokenizerChain)
informResourceLoaderAwareObjectsInChain((TokenizerChain)multiTermAnalyzer);
}
}
}
for (FieldType fieldType : fieldTypeList)
informResourceLoaderAwareObjectsForFieldType(fieldType);
newSchema.refreshAnalyzers();
@ -611,7 +585,39 @@ public final class ManagedIndexSchema extends IndexSchema {
}
return newSchema;
}
}
/**
* Informs analyzers used by a fieldType.
*/
protected void informResourceLoaderAwareObjectsForFieldType(FieldType fieldType) {
// must inform any sub-components used in the
// tokenizer chain if they are ResourceLoaderAware
if (!fieldType.supportsAnalyzers())
return;
Analyzer indexAnalyzer = fieldType.getIndexAnalyzer();
if (indexAnalyzer != null && indexAnalyzer instanceof TokenizerChain)
informResourceLoaderAwareObjectsInChain((TokenizerChain)indexAnalyzer);
Analyzer queryAnalyzer = fieldType.getQueryAnalyzer();
// ref comparison is correct here (vs. equals) as they may be the same
// object in which case, we don't need to inform twice ... however, it's
// actually safe to call inform multiple times on an object anyway
if (queryAnalyzer != null &&
queryAnalyzer != indexAnalyzer &&
queryAnalyzer instanceof TokenizerChain)
informResourceLoaderAwareObjectsInChain((TokenizerChain)queryAnalyzer);
// if fieldType is a TextField, it might have a multi-term analyzer
if (fieldType instanceof TextField) {
TextField textFieldType = (TextField)fieldType;
Analyzer multiTermAnalyzer = textFieldType.getMultiTermAnalyzer();
if (multiTermAnalyzer != null && multiTermAnalyzer != indexAnalyzer &&
multiTermAnalyzer != queryAnalyzer && multiTermAnalyzer instanceof TokenizerChain)
informResourceLoaderAwareObjectsInChain((TokenizerChain)multiTermAnalyzer);
}
}
@Override
public SchemaField newField(String fieldName, String fieldType, Map<String,?> options) {
@ -786,6 +792,11 @@ public final class ManagedIndexSchema extends IndexSchema {
for (SchemaAware aware : newSchema.schemaAware) {
aware.inform(newSchema);
}
// notify analyzers and other objects for our fieldTypes
for (FieldType fieldType : newSchema.fieldTypes.values())
informResourceLoaderAwareObjectsForFieldType(fieldType);
newSchema.refreshAnalyzers();
newSchema.schemaZkVersion = schemaZkVersion;
} catch (SolrException e) {