Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Closed
wants to merge 1 commit into from
Closed

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/main/java/org/elasticsearch/index/mapper/internal/ParentFieldMapper.java
View file
Open in desktop
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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());
}
}

Expand Down
16 changes: 5 additions & 11 deletions src/main/java/org/elasticsearch/search/SearchService.java
View file
Open in desktop
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there is no need to check that the mapper is active anymore?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, because if ParentFieldMapper is not active then the loading is always lazy and if it is active then it is always eager (that is what the change does in ParentFieldMapper).

}

final String indexName = fieldMapper.names().indexName();
Expand Down