Moved the decision to load p/c fielddata eagerly to a better place.

Closes #5569
elastic · Apr 3, 2014 · f389c66 · f389c66
1 parent c308970
commit f389c66
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/src/main/java/org/elasticsearch/index/mapper/internal/ParentFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/internal/ParentFieldMapper.java
@@ -33,6 +33,7 @@
 import org.elasticsearch.common.lucene.BytesRefs;
 import org.elasticsearch.common.lucene.Lucene;
 import org.elasticsearch.common.lucene.search.Queries;
+import org.elasticsearch.common.settings.ImmutableSettings;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.index.codec.postingsformat.PostingsFormatProvider;
@@ -74,6 +75,10 @@ public static class Defaults extends AbstractFieldMapper.Defaults {
 
     public static class Builder extends Mapper.Builder<Builder, ParentFieldMapper> {
 
+        private static final Settings FIELD_DATA_SETTINGS = ImmutableSettings.settingsBuilder()
+                .put(Loading.KEY, Loading.EAGER_VALUE)
+                .build();
+
         protected String indexName;
 
         private String type;
@@ -100,7 +105,7 @@ public ParentFieldMapper build(BuilderContext context) {
             if (type == null) {
                 throw new MapperParsingException("Parent mapping must contain the parent type");
             }
-            return new ParentFieldMapper(name, indexName, type, postingsFormat, null, context.indexSettings());
+            return new ParentFieldMapper(name, indexName, type, postingsFormat, FIELD_DATA_SETTINGS, context.indexSettings());
         }
     }
 

diff --git a/src/main/java/org/elasticsearch/search/SearchService.java b/src/main/java/org/elasticsearch/search/SearchService.java
@@ -44,15 +44,16 @@
 import org.elasticsearch.common.util.BigArrays;
 import org.elasticsearch.common.util.concurrent.ConcurrentCollections;
 import org.elasticsearch.common.util.concurrent.ConcurrentMapLong;
-import org.elasticsearch.common.xcontent.*;
+import org.elasticsearch.common.xcontent.XContentFactory;
+import org.elasticsearch.common.xcontent.XContentHelper;
+import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.index.engine.Engine;
 import org.elasticsearch.index.fielddata.FieldDataType;
 import org.elasticsearch.index.fielddata.IndexFieldDataService;
 import org.elasticsearch.index.mapper.DocumentMapper;
 import org.elasticsearch.index.mapper.FieldMapper;
 import org.elasticsearch.index.mapper.FieldMapper.Loading;
 import org.elasticsearch.index.mapper.MapperService;
-import org.elasticsearch.index.mapper.internal.ParentFieldMapper;
 import org.elasticsearch.index.query.TemplateQueryParser;
 import org.elasticsearch.index.search.stats.StatsGroupsParseElement;
 import org.elasticsearch.index.service.IndexService;
@@ -767,15 +768,8 @@ public TerminationHandle warm(final IndexShard indexShard, IndexMetaData indexMe
                     if (fieldDataType == null) {
                         continue;
                     }
-                    if (fieldMapper instanceof ParentFieldMapper) {
-                        ParentFieldMapper parentFieldMapper = (ParentFieldMapper) fieldMapper;
-                        if (!parentFieldMapper.active()) {
-                            continue;
-                        }
-                    } else {
-                        if (fieldDataType.getLoading() != Loading.EAGER) {
-                            continue;
-                        }
+                    if (fieldDataType.getLoading() != Loading.EAGER) {
+                        continue;
                     }
 
                     final String indexName = fieldMapper.names().indexName();