Mapping: Fixes Merging of default analyzer

Fixed behaviour where two representations of the default index analyzer weren't being treated as equivalent. Added REST test to confirm fix. Closes #2716
elastic · Nov 14, 2014 · 6e98bd7 · 6e98bd7
1 parent 17c8a1c
commit 6e98bd7
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 3 deletions.
diff --git a/rest-api-spec/test/indices.put_mapping/all_path_options.yaml b/rest-api-spec/test/indices.put_mapping/all_path_options.yaml
@@ -176,3 +176,37 @@ setup:
       catch: param
       indices.put_mapping: {}
 
+---
+"post a mapping with default analyzer twice":
+
+  - do:
+      indices.put_mapping:
+        index: test_index1
+        type: test_type
+        body:
+          test_type:
+            dynamic: false
+            properties:
+              text:
+                index:    analyzed
+                analyzer: default
+                type:     string
+
+  - do:
+      indices.put_mapping:
+        index: test_index1
+        type: test_type
+        body:
+          test_type:
+            dynamic: false
+            properties:
+              text:
+                index:    analyzed
+                analyzer: default
+                type:     string
+
+  - do:
+      indices.get_mapping: {}
+
+  - match: {test_index1.mappings.test_type.properties.text.type:     string}
+
diff --git a/src/main/java/org/elasticsearch/index/mapper/core/AbstractFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/AbstractFieldMapper.java
@@ -595,15 +595,18 @@ public void merge(Mapper mergeWith, MergeContext mergeContext) throws MergeMappi
         if (this.fieldType().storeTermVectorPayloads() != fieldMergeWith.fieldType().storeTermVectorPayloads()) {
             mergeContext.addConflict("mapper [" + names.fullName() + "] has different store_term_vector_payloads values");
         }
-        if (this.indexAnalyzer == null) {
-            if (fieldMergeWith.indexAnalyzer != null) {
+
+        // null and "default"-named index analyzers both mean the default is used
+        if (this.indexAnalyzer == null || "default".equals(this.indexAnalyzer.name())) {
+            if (fieldMergeWith.indexAnalyzer != null && !"default".equals(fieldMergeWith.indexAnalyzer.name())) {
                 mergeContext.addConflict("mapper [" + names.fullName() + "] has different index_analyzer");
             }
-        } else if (fieldMergeWith.indexAnalyzer == null) {
+        } else if (fieldMergeWith.indexAnalyzer == null || "default".equals(fieldMergeWith.indexAnalyzer.name())) {
             mergeContext.addConflict("mapper [" + names.fullName() + "] has different index_analyzer");
         } else if (!this.indexAnalyzer.name().equals(fieldMergeWith.indexAnalyzer.name())) {
             mergeContext.addConflict("mapper [" + names.fullName() + "] has different index_analyzer");
         }
+
         if (!this.names().equals(fieldMergeWith.names())) {
             mergeContext.addConflict("mapper [" + names.fullName() + "] has different index_name");
         }