honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove search analyzers from DocumentFieldMappers (#41484) 

These references seem to be unused except for tests and should be removed to
keep the places we store analyzers limited.
This commit is contained in:
Christoph Büscher 2019-04-26 09:48:11 +02:00
parent 6a24fd3f26
commit 078936b8f5
2 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
server/src/main/java/org/elasticsearch/index/mapper/DocumentFieldMappers.java
View File

@ -34,8 +34,6 @@ public final class DocumentFieldMappers implements Iterable<Mapper> {
private final Map<String, Mapper> fieldMappers; private final Map<String, Mapper> fieldMappers;
private final FieldNameAnalyzer indexAnalyzer; private final FieldNameAnalyzer indexAnalyzer;
private final FieldNameAnalyzer searchAnalyzer;
private final FieldNameAnalyzer searchQuoteAnalyzer;
private static void put(Map<String, Analyzer> analyzers, String key, Analyzer value, Analyzer defaultValue) { private static void put(Map<String, Analyzer> analyzers, String key, Analyzer value, Analyzer defaultValue) {
if (value == null) { if (value == null) {
@ -67,8 +65,6 @@ public final class DocumentFieldMappers implements Iterable<Mapper> {
this.fieldMappers = Collections.unmodifiableMap(fieldMappers); this.fieldMappers = Collections.unmodifiableMap(fieldMappers);
this.indexAnalyzer = new FieldNameAnalyzer(indexAnalyzers); this.indexAnalyzer = new FieldNameAnalyzer(indexAnalyzers);
this.searchAnalyzer = new FieldNameAnalyzer(searchAnalyzers);
this.searchQuoteAnalyzer = new FieldNameAnalyzer(searchQuoteAnalyzers);
} }
/** /**
@ -89,18 +85,7 @@ public final class DocumentFieldMappers implements Iterable<Mapper> {
return this.indexAnalyzer; return this.indexAnalyzer;
} }
/** @Override
* A smart analyzer used for searching that takes into account specific analyzers configured
* per {@link FieldMapper}.
*/
public Analyzer searchAnalyzer() {
return this.searchAnalyzer;
}
public Analyzer searchQuoteAnalyzer() {
return this.searchQuoteAnalyzer;
}
public Iterator<Mapper> iterator() { public Iterator<Mapper> iterator() {
return fieldMappers.values().iterator(); return fieldMappers.values().iterator();
} }

4
server/src/test/java/org/elasticsearch/index/mapper/DocumentFieldMapperTests.java
View File

@ -147,12 +147,8 @@ public class DocumentFieldMapperTests extends LuceneTestCase {
defaultSearchQuote); defaultSearchQuote);
assertAnalyzes(documentFieldMappers.indexAnalyzer(), "field1", "index"); assertAnalyzes(documentFieldMappers.indexAnalyzer(), "field1", "index");
assertAnalyzes(documentFieldMappers.searchAnalyzer(), "field1", "search");
assertAnalyzes(documentFieldMappers.searchQuoteAnalyzer(), "field1", "search_quote");
assertAnalyzes(documentFieldMappers.indexAnalyzer(), "field2", "default_index"); assertAnalyzes(documentFieldMappers.indexAnalyzer(), "field2", "default_index");
assertAnalyzes(documentFieldMappers.searchAnalyzer(), "field2", "default_search");
assertAnalyzes(documentFieldMappers.searchQuoteAnalyzer(), "field2", "default_search_quote");
} }
private void assertAnalyzes(Analyzer analyzer, String field, String output) throws IOException { private void assertAnalyzes(Analyzer analyzer, String field, String output) throws IOException {