Return a conflict when trying to enable/disable norms.

Close #4761
elastic · Jan 20, 2014 · 6469f6e · 6469f6e
1 parent f0bce08
commit 6469f6e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/src/main/java/org/elasticsearch/index/mapper/core/AbstractFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/AbstractFieldMapper.java
@@ -561,6 +561,9 @@ public void merge(Mapper mergeWith, MergeContext mergeContext) throws MergeMappi
             // when the doc_values field data format is configured
             mergeContext.addConflict("mapper [" + names.fullName() + "] has different " + TypeParsers.DOC_VALUES + " values");
         }
+        if (this.fieldType().omitNorms() != fieldMergeWith.fieldType.omitNorms()) {
+            mergeContext.addConflict("mapper [" + names.fullName() + "] has different `norms.enabled` values");
+        }
         if (this.fieldType().tokenized() != fieldMergeWith.fieldType().tokenized()) {
             mergeContext.addConflict("mapper [" + names.fullName() + "] has different tokenize values");
         }

diff --git a/src/test/java/org/elasticsearch/indices/mapping/UpdateMappingTests.java b/src/test/java/org/elasticsearch/indices/mapping/UpdateMappingTests.java
@@ -182,6 +182,16 @@ public void updateMappingWithConflicts() throws Exception {
         assertThat(putMappingResponse.isAcknowledged(), equalTo(true));
     }
 
+    @Test(expected = MergeMappingException.class)
+    public void updateMappingWithNormsConflicts() throws Exception {
+        client().admin().indices().prepareCreate("test")
+                .addMapping("type", "{\"type\":{\"properties\":{\"body\":{\"type\":\"string\", \"norms\": { \"enabled\": false }}}}}")
+                .execute().actionGet();
+        PutMappingResponse putMappingResponse = client().admin().indices().preparePutMapping("test").setType("type")
+                .setSource("{\"type\":{\"properties\":{\"body\":{\"type\":\"string\", \"norms\": { \"enabled\": true }}}}}")
+                .execute().actionGet();
+    }
+
     /*
     First regression test for https://github.com/elasticsearch/elasticsearch/issues/3381
      */