When the 'strict' mapping option is enabled, make sure to validate sp…

…lit_queries_on_whitespace.
elastic · Jun 4, 2018 · c3d4005 · c3d4005
1 parent 0cfa12f
commit c3d4005
Showing 1 changed file with 6 additions and 0 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
@@ -222,6 +222,12 @@ public void checkCompatibility(MappedFieldType otherFT, List<String> conflicts,
             if (Objects.equals(normalizer, other.normalizer) == false) {
                 conflicts.add("mapper [" + name() + "] has different [normalizer]");
             }
+            if (strict) {
+                if (splitQueriesOnWhitespace != other.splitQueriesOnWhitespace) {
+                    conflicts.add("mapper [" + name() + "] is used by multiple types. Set update_all_types" +
+                        " to true to update [split_queries_on_whitespace] across all types.");
+                }
+            }
         }
 
         @Override