Make sure KeywordFieldMapper#clone preserves split_queries_on_whitesp…

…ace. (#31049) (cherry picked from commit 30a8f9d)
elastic · Jun 4, 2018 · 11b001d · 11b001d
1 parent 9a8a1fd
commit 11b001d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java
@@ -198,7 +198,7 @@ public KeywordFieldType() {
         protected KeywordFieldType(KeywordFieldType ref) {
             super(ref);
             this.normalizer = ref.normalizer;
-            this.splitQueriesOnWhitespace = splitQueriesOnWhitespace;
+            this.splitQueriesOnWhitespace = ref.splitQueriesOnWhitespace;
         }
 
         public KeywordFieldType clone() {

diff --git a/server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldTypeTests.java
@@ -52,8 +52,15 @@ public class KeywordFieldTypeTests extends FieldTypeTestCase {
     public void setupProperties() {
         addModifier(new Modifier("normalizer", false) {
             @Override
-            public void modify(MappedFieldType ft) {
-                ((KeywordFieldType) ft).setNormalizer(Lucene.KEYWORD_ANALYZER);
+            public void modify(MappedFieldType type) {
+                ((KeywordFieldType) type).setNormalizer(Lucene.KEYWORD_ANALYZER);
+            }
+        });
+        addModifier(new Modifier("split_queries_on_whitespace", true) {
+            @Override
+            public void modify(MappedFieldType type) {
+                KeywordFieldType keywordType = (KeywordFieldType) type;
+                keywordType.setSplitQueriesOnWhitespace(!keywordType.splitQueriesOnWhitespace());
             }
         });
     }