From 078936b8f573b10be990c9db9fd60b0b7520af8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20B=C3=BCscher?= Date: Fri, 26 Apr 2019 09:48:11 +0200 Subject: [PATCH] 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. --- .../index/mapper/DocumentFieldMappers.java | 17 +---------------- .../index/mapper/DocumentFieldMapperTests.java | 4 ---- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/server/src/main/java/org/elasticsearch/index/mapper/DocumentFieldMappers.java b/server/src/main/java/org/elasticsearch/index/mapper/DocumentFieldMappers.java index f70c003846495..664ea467d9e5f 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/DocumentFieldMappers.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/DocumentFieldMappers.java @@ -34,8 +34,6 @@ public final class DocumentFieldMappers implements Iterable { private final Map fieldMappers; private final FieldNameAnalyzer indexAnalyzer; - private final FieldNameAnalyzer searchAnalyzer; - private final FieldNameAnalyzer searchQuoteAnalyzer; private static void put(Map analyzers, String key, Analyzer value, Analyzer defaultValue) { if (value == null) { @@ -67,8 +65,6 @@ public DocumentFieldMappers(Collection mappers, this.fieldMappers = Collections.unmodifiableMap(fieldMappers); this.indexAnalyzer = new FieldNameAnalyzer(indexAnalyzers); - this.searchAnalyzer = new FieldNameAnalyzer(searchAnalyzers); - this.searchQuoteAnalyzer = new FieldNameAnalyzer(searchQuoteAnalyzers); } /** @@ -89,18 +85,7 @@ public Analyzer indexAnalyzer() { return this.indexAnalyzer; } - /** - * 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; - } - + @Override public Iterator iterator() { return fieldMappers.values().iterator(); } diff --git a/server/src/test/java/org/elasticsearch/index/mapper/DocumentFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/DocumentFieldMapperTests.java index 4373f2210a7c7..8327b7d4f2e13 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/DocumentFieldMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/DocumentFieldMapperTests.java @@ -147,12 +147,8 @@ public void testAnalyzers() throws IOException { defaultSearchQuote); assertAnalyzes(documentFieldMappers.indexAnalyzer(), "field1", "index"); - assertAnalyzes(documentFieldMappers.searchAnalyzer(), "field1", "search"); - assertAnalyzes(documentFieldMappers.searchQuoteAnalyzer(), "field1", "search_quote"); 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 {