Multi field mapper with more than one extra mapping can cause endless…

… re-sync'ing of mapping between nodes, closes elastic#1487.
mute · Nov 23, 2011 · 6be2c7f · 6be2c7f
1 parent 7cf8105
commit 6be2c7f
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/...asticsearch/src/main/java/org/elasticsearch/index/mapper/multifield/MultiFieldMapper.java b/...asticsearch/src/main/java/org/elasticsearch/index/mapper/multifield/MultiFieldMapper.java
@@ -39,6 +39,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.TreeMap;
 
 import static org.elasticsearch.common.collect.Lists.*;
 import static org.elasticsearch.common.collect.MapBuilder.*;
@@ -305,8 +306,16 @@ public ImmutableMap<String, Mapper> mappers() {
         if (defaultMapper != null) {
             defaultMapper.toXContent(builder, params);
         }
-        for (Mapper mapper : mappers.values()) {
-            mapper.toXContent(builder, params);
+        if (mappers.size() <= 1) {
+            for (Mapper mapper : mappers.values()) {
+                mapper.toXContent(builder, params);
+            }
+        } else {
+            // sort the mappers (by name) if there is more than one mapping
+            TreeMap<String, Mapper> sortedMappers = new TreeMap<String, Mapper>(mappers);
+            for (Mapper mapper : sortedMappers.values()) {
+                mapper.toXContent(builder, params);
+            }
         }
         builder.endObject();