Now really fix eager fielddata loading.

Relates to #5557
elastic · Mar 27, 2014 · 8a1d399 · 8a1d399
1 parent a517dce
commit 8a1d399
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/src/main/java/org/elasticsearch/search/SearchService.java b/src/main/java/org/elasticsearch/search/SearchService.java
@@ -767,15 +767,22 @@ public TerminationHandle warm(final IndexShard indexShard, IndexMetaData indexMe
                     if (fieldDataType == null) {
                         continue;
                     }
-                    final String indexName = fieldMapper.names().indexName();
                     if (fieldMapper instanceof ParentFieldMapper) {
                         ParentFieldMapper parentFieldMapper = (ParentFieldMapper) fieldMapper;
-                        if (parentFieldMapper.active()) {
-                            warmUp.put(indexName, parentFieldMapper);
+                        if (!parentFieldMapper.active()) {
+                            continue;
+                        }
+                    } else {
+                        if (fieldDataType.getLoading() != Loading.EAGER) {
+                            continue;
                         }
-                    } else if (fieldDataType.getLoading() != Loading.EAGER && !warmUp.containsKey(indexName)) {
-                        warmUp.put(indexName, fieldMapper);
                     }
+
+                    final String indexName = fieldMapper.names().indexName();
+                    if (warmUp.containsKey(indexName)) {
+                        continue;
+                    }
+                    warmUp.put(indexName, fieldMapper);
                 }
             }
             final IndexFieldDataService indexFieldDataService = indexShard.indexFieldDataService();