From ca2d12d039b9fdaa83bc950d590a6d6e18c78775 Mon Sep 17 00:00:00 2001 From: Alan Woodward Date: Thu, 18 Jun 2020 12:39:48 +0100 Subject: [PATCH] Remove Settings parameter from FieldMapper base class (#58237) This is currently used to set the indexVersionCreated parameter on FieldMapper. However, this parameter is only actually used by two implementations, and clutters the API considerably. We should just remove it, and use it directly in the implementations that require it. --- .../index/mapper/RankFeatureFieldMapper.java | 8 +++---- .../mapper/RankFeatureMetaFieldMapper.java | 8 +++---- .../index/mapper/RankFeaturesFieldMapper.java | 7 +++--- .../index/mapper/ScaledFloatFieldMapper.java | 6 ++--- .../mapper/SearchAsYouTypeFieldMapper.java | 18 +++++++-------- .../index/mapper/TokenCountFieldMapper.java | 7 +++--- .../join/mapper/MetaJoinFieldMapper.java | 7 +++--- .../join/mapper/ParentIdFieldMapper.java | 8 +++---- .../join/mapper/ParentJoinFieldMapper.java | 6 ++--- .../percolator/PercolatorFieldMapper.java | 7 +++--- .../ICUCollationKeywordFieldMapper.java | 7 +++--- .../AnnotatedTextFieldMapper.java | 8 +++---- .../mapper/murmur3/Murmur3FieldMapper.java | 7 +++--- .../index/mapper/size/SizeFieldMapper.java | 10 ++++---- .../mapper/AbstractGeometryFieldMapper.java | 5 ++-- .../AbstractPointGeometryFieldMapper.java | 9 ++++---- .../AbstractShapeGeometryFieldMapper.java | 5 ++-- .../index/mapper/AllFieldMapper.java | 10 ++++---- .../index/mapper/BinaryFieldMapper.java | 7 +++--- .../index/mapper/BooleanFieldMapper.java | 7 +++--- .../index/mapper/CompletionFieldMapper.java | 7 +++--- .../index/mapper/DateFieldMapper.java | 6 ++--- .../index/mapper/DynamicKeyFieldMapper.java | 4 +--- .../index/mapper/FieldMapper.java | 7 +----- .../index/mapper/FieldNamesFieldMapper.java | 8 +++---- .../index/mapper/GeoPointFieldMapper.java | 11 ++++----- .../index/mapper/GeoShapeFieldMapper.java | 7 +++--- .../index/mapper/IdFieldMapper.java | 7 +++--- .../index/mapper/IgnoredFieldMapper.java | 10 ++++---- .../index/mapper/IndexFieldMapper.java | 10 ++++---- .../index/mapper/IpFieldMapper.java | 6 ++--- .../index/mapper/KeywordFieldMapper.java | 7 +++--- .../mapper/LegacyGeoShapeFieldMapper.java | 5 +++- .../index/mapper/MetadataFieldMapper.java | 5 ++-- .../index/mapper/NumberFieldMapper.java | 6 ++--- .../index/mapper/RangeFieldMapper.java | 6 ++--- .../index/mapper/RoutingFieldMapper.java | 8 +++---- .../index/mapper/SeqNoFieldMapper.java | 6 ++--- .../index/mapper/SourceFieldMapper.java | 12 +++++----- .../index/mapper/TextFieldMapper.java | 19 ++++++++------- .../index/mapper/TypeFieldMapper.java | 6 ++--- .../index/mapper/VersionFieldMapper.java | 8 +++---- .../mapper/DocumentFieldMapperTests.java | 7 +----- .../index/mapper/ExternalMapper.java | 7 +++--- .../index/mapper/ExternalMetadataMapper.java | 10 ++++---- .../index/mapper/FakeStringFieldMapper.java | 7 +++--- .../index/mapper/ObjectMapperMergeTests.java | 4 +--- .../index/mapper/MockFieldMapper.java | 6 +---- .../mapper/HistogramFieldMapper.java | 7 +++--- .../mapper/ConstantKeywordFieldMapper.java | 12 ++++------ .../mapper/FlatObjectFieldMapper.java | 8 +++---- .../GeoShapeWithDocValuesFieldMapper.java | 9 +++----- .../index/mapper/PointFieldMapper.java | 8 +++---- .../index/mapper/ShapeFieldMapper.java | 7 +++--- .../mapper/DenseVectorFieldMapper.java | 5 +++- .../mapper/SparseVectorFieldMapper.java | 10 ++++---- .../wildcard/mapper/WildcardFieldMapper.java | 23 +++++++++---------- 57 files changed, 191 insertions(+), 267 deletions(-) diff --git a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/RankFeatureFieldMapper.java b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/RankFeatureFieldMapper.java index 0b878d610f7..954b8f12bec 100644 --- a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/RankFeatureFieldMapper.java +++ b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/RankFeatureFieldMapper.java @@ -26,7 +26,6 @@ import org.apache.lucene.index.Term; import org.apache.lucene.search.Query; import org.apache.lucene.search.TermQuery; import org.elasticsearch.common.lucene.Lucene; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser.Token; import org.elasticsearch.common.xcontent.support.XContentMapValues; @@ -73,7 +72,7 @@ public class RankFeatureFieldMapper extends FieldMapper { @Override public RankFeatureFieldMapper build(BuilderContext context) { return new RankFeatureFieldMapper(name, fieldType, new RankFeatureFieldType(buildFullName(context), meta, positiveScoreImpact), - context.indexSettings(), multiFieldsBuilder.build(this, context), copyTo, positiveScoreImpact); + multiFieldsBuilder.build(this, context), copyTo, positiveScoreImpact); } } @@ -142,9 +141,8 @@ public class RankFeatureFieldMapper extends FieldMapper { private final boolean positiveScoreImpact; private RankFeatureFieldMapper(String simpleName, FieldType fieldType, MappedFieldType mappedFieldType, - Settings indexSettings, MultiFields multiFields, CopyTo copyTo, - boolean positiveScoreImpact) { - super(simpleName, fieldType, mappedFieldType, indexSettings, multiFields, copyTo); + MultiFields multiFields, CopyTo copyTo, boolean positiveScoreImpact) { + super(simpleName, fieldType, mappedFieldType, multiFields, copyTo); assert fieldType.indexOptions().compareTo(IndexOptions.DOCS_AND_FREQS) <= 0; this.positiveScoreImpact = positiveScoreImpact; } diff --git a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/RankFeatureMetaFieldMapper.java b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/RankFeatureMetaFieldMapper.java index 990bee363ed..0b38be92aa7 100644 --- a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/RankFeatureMetaFieldMapper.java +++ b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/RankFeatureMetaFieldMapper.java @@ -61,7 +61,7 @@ public class RankFeatureMetaFieldMapper extends MetadataFieldMapper { @Override public RankFeatureMetaFieldMapper build(BuilderContext context) { - return new RankFeatureMetaFieldMapper(context.indexSettings()); + return new RankFeatureMetaFieldMapper(); } } @@ -76,7 +76,7 @@ public class RankFeatureMetaFieldMapper extends MetadataFieldMapper { public MetadataFieldMapper getDefault(MappedFieldType fieldType, ParserContext context) { final Settings indexSettings = context.mapperService().getIndexSettings().getSettings(); if (fieldType != null) { - return new RankFeatureMetaFieldMapper(indexSettings); + return new RankFeatureMetaFieldMapper(); } else { return parse(NAME, Collections.emptyMap(), context) .build(new BuilderContext(indexSettings, new ContentPath(1))); @@ -117,8 +117,8 @@ public class RankFeatureMetaFieldMapper extends MetadataFieldMapper { } } - private RankFeatureMetaFieldMapper(Settings indexSettings) { - super(Defaults.FIELD_TYPE, RankFeatureMetaFieldType.INSTANCE, indexSettings); + private RankFeatureMetaFieldMapper() { + super(Defaults.FIELD_TYPE, RankFeatureMetaFieldType.INSTANCE); } @Override diff --git a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/RankFeaturesFieldMapper.java b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/RankFeaturesFieldMapper.java index 0726df272dd..fca28f88490 100644 --- a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/RankFeaturesFieldMapper.java +++ b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/RankFeaturesFieldMapper.java @@ -24,7 +24,6 @@ import org.apache.lucene.document.FieldType; import org.apache.lucene.index.IndexOptions; import org.apache.lucene.search.Query; import org.elasticsearch.common.lucene.Lucene; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentParser.Token; import org.elasticsearch.index.fielddata.IndexFieldData; import org.elasticsearch.index.query.QueryShardContext; @@ -63,7 +62,7 @@ public class RankFeaturesFieldMapper extends FieldMapper { public RankFeaturesFieldMapper build(BuilderContext context) { return new RankFeaturesFieldMapper( name, fieldType, new RankFeaturesFieldType(buildFullName(context), meta), - context.indexSettings(), multiFieldsBuilder.build(this, context), copyTo); + multiFieldsBuilder.build(this, context), copyTo); } } @@ -112,8 +111,8 @@ public class RankFeaturesFieldMapper extends FieldMapper { } private RankFeaturesFieldMapper(String simpleName, FieldType fieldType, MappedFieldType mappedFieldType, - Settings indexSettings, MultiFields multiFields, CopyTo copyTo) { - super(simpleName, fieldType, mappedFieldType, indexSettings, multiFields, copyTo); + MultiFields multiFields, CopyTo copyTo) { + super(simpleName, fieldType, mappedFieldType, multiFields, copyTo); assert fieldType.indexOptions().compareTo(IndexOptions.DOCS_AND_FREQS) <= 0; } diff --git a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/ScaledFloatFieldMapper.java b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/ScaledFloatFieldMapper.java index 705c3a5beb9..e4bd5f90733 100644 --- a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/ScaledFloatFieldMapper.java +++ b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/ScaledFloatFieldMapper.java @@ -34,7 +34,6 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.util.BytesRef; import org.elasticsearch.common.Explicit; import org.elasticsearch.common.settings.Setting; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentParser.Token; @@ -141,7 +140,7 @@ public class ScaledFloatFieldMapper extends FieldMapper { } ScaledFloatFieldType type = new ScaledFloatFieldType(buildFullName(context), indexed, hasDocValues, meta, scalingFactor); return new ScaledFloatFieldMapper(name, fieldType, type, ignoreMalformed(context), - coerce(context), context.indexSettings(), multiFieldsBuilder.build(this, context), copyTo, nullValue); + coerce(context), multiFieldsBuilder.build(this, context), copyTo, nullValue); } } @@ -347,11 +346,10 @@ public class ScaledFloatFieldMapper extends FieldMapper { ScaledFloatFieldType mappedFieldType, Explicit ignoreMalformed, Explicit coerce, - Settings indexSettings, MultiFields multiFields, CopyTo copyTo, Double nullValue) { - super(simpleName, fieldType, mappedFieldType, indexSettings, multiFields, copyTo); + super(simpleName, fieldType, mappedFieldType, multiFields, copyTo); this.scalingFactor = mappedFieldType.scalingFactor; this.nullValue = nullValue; if (Double.isFinite(scalingFactor) == false || scalingFactor <= 0) { diff --git a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/SearchAsYouTypeFieldMapper.java b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/SearchAsYouTypeFieldMapper.java index cb1809609fd..423ed1027cf 100644 --- a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/SearchAsYouTypeFieldMapper.java +++ b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/SearchAsYouTypeFieldMapper.java @@ -48,7 +48,6 @@ import org.apache.lucene.util.automaton.Automata; import org.apache.lucene.util.automaton.Automaton; import org.apache.lucene.util.automaton.Operations; import org.elasticsearch.common.collect.Iterators; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.index.analysis.AnalyzerScope; import org.elasticsearch.index.analysis.NamedAnalyzer; @@ -181,7 +180,7 @@ public class SearchAsYouTypeFieldMapper extends FieldMapper { prefixft.setStoreTermVectors(false); prefixft.setOmitNorms(true); prefixft.setStored(false); - final PrefixFieldMapper prefixFieldMapper = new PrefixFieldMapper(prefixft, prefixFieldType, context.indexSettings()); + final PrefixFieldMapper prefixFieldMapper = new PrefixFieldMapper(prefixft, prefixFieldType); // set up the shingle fields final ShingleFieldMapper[] shingleFieldMappers = new ShingleFieldMapper[maxShingleSize - 1]; @@ -205,11 +204,11 @@ public class SearchAsYouTypeFieldMapper extends FieldMapper { shingleFieldTypes[i] = shingleFieldType; FieldType shingleft = new FieldType(fieldType); shingleft.setStored(false); - shingleFieldMappers[i] = new ShingleFieldMapper(shingleft, shingleFieldType, context.indexSettings()); + shingleFieldMappers[i] = new ShingleFieldMapper(shingleft, shingleFieldType); } ft.setPrefixField(prefixFieldType); ft.setShingleFields(shingleFieldTypes); - return new SearchAsYouTypeFieldMapper(name, fieldType, ft, context.indexSettings(), copyTo, + return new SearchAsYouTypeFieldMapper(name, fieldType, ft, copyTo, maxShingleSize, prefixFieldMapper, shingleFieldMappers); } } @@ -470,8 +469,8 @@ public class SearchAsYouTypeFieldMapper extends FieldMapper { static final class PrefixFieldMapper extends FieldMapper { - PrefixFieldMapper(FieldType fieldType, PrefixFieldType mappedFieldType, Settings indexSettings) { - super(mappedFieldType.name(), fieldType, mappedFieldType, indexSettings, MultiFields.empty(), CopyTo.empty()); + PrefixFieldMapper(FieldType fieldType, PrefixFieldType mappedFieldType) { + super(mappedFieldType.name(), fieldType, mappedFieldType, MultiFields.empty(), CopyTo.empty()); } @Override @@ -506,8 +505,8 @@ public class SearchAsYouTypeFieldMapper extends FieldMapper { static final class ShingleFieldMapper extends FieldMapper { - ShingleFieldMapper(FieldType fieldType, ShingleFieldType mappedFieldtype, Settings indexSettings) { - super(mappedFieldtype.name(), fieldType, mappedFieldtype, indexSettings, MultiFields.empty(), CopyTo.empty()); + ShingleFieldMapper(FieldType fieldType, ShingleFieldType mappedFieldtype) { + super(mappedFieldtype.name(), fieldType, mappedFieldtype, MultiFields.empty(), CopyTo.empty()); } FieldType getLuceneFieldType() { @@ -659,12 +658,11 @@ public class SearchAsYouTypeFieldMapper extends FieldMapper { public SearchAsYouTypeFieldMapper(String simpleName, FieldType fieldType, SearchAsYouTypeFieldType mappedFieldType, - Settings indexSettings, CopyTo copyTo, int maxShingleSize, PrefixFieldMapper prefixField, ShingleFieldMapper[] shingleFields) { - super(simpleName, fieldType, mappedFieldType, indexSettings, MultiFields.empty(), copyTo); + super(simpleName, fieldType, mappedFieldType, MultiFields.empty(), copyTo); this.prefixField = prefixField; this.shingleFields = shingleFields; this.maxShingleSize = maxShingleSize; diff --git a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/TokenCountFieldMapper.java b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/TokenCountFieldMapper.java index 560cea9c162..fb6a41a0f76 100644 --- a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/TokenCountFieldMapper.java +++ b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/TokenCountFieldMapper.java @@ -23,7 +23,6 @@ import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; import org.apache.lucene.document.FieldType; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.index.analysis.NamedAnalyzer; @@ -84,7 +83,7 @@ public class TokenCountFieldMapper extends FieldMapper { public TokenCountFieldMapper build(BuilderContext context) { return new TokenCountFieldMapper(name, fieldType, new NumberFieldMapper.NumberFieldType(buildFullName(context), NumberFieldMapper.NumberType.INTEGER), - context.indexSettings(), analyzer, enablePositionIncrements, nullValue, + analyzer, enablePositionIncrements, nullValue, multiFieldsBuilder.build(this, context), copyTo); } } @@ -125,9 +124,9 @@ public class TokenCountFieldMapper extends FieldMapper { private Integer nullValue; protected TokenCountFieldMapper(String simpleName, FieldType fieldType, MappedFieldType defaultFieldType, - Settings indexSettings, NamedAnalyzer analyzer, boolean enablePositionIncrements, Integer nullValue, + NamedAnalyzer analyzer, boolean enablePositionIncrements, Integer nullValue, MultiFields multiFields, CopyTo copyTo) { - super(simpleName, fieldType, defaultFieldType, indexSettings, multiFields, copyTo); + super(simpleName, fieldType, defaultFieldType, multiFields, copyTo); this.analyzer = analyzer; this.enablePositionIncrements = enablePositionIncrements; this.nullValue = nullValue; diff --git a/modules/parent-join/src/main/java/org/elasticsearch/join/mapper/MetaJoinFieldMapper.java b/modules/parent-join/src/main/java/org/elasticsearch/join/mapper/MetaJoinFieldMapper.java index c4658987b77..73df7164b9f 100644 --- a/modules/parent-join/src/main/java/org/elasticsearch/join/mapper/MetaJoinFieldMapper.java +++ b/modules/parent-join/src/main/java/org/elasticsearch/join/mapper/MetaJoinFieldMapper.java @@ -23,7 +23,6 @@ import org.apache.lucene.document.FieldType; import org.apache.lucene.index.IndexOptions; import org.apache.lucene.search.Query; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.fielddata.IndexFieldData; import org.elasticsearch.index.fielddata.plain.SortedSetOrdinalsIndexFieldData; import org.elasticsearch.index.mapper.FieldMapper; @@ -69,7 +68,7 @@ public class MetaJoinFieldMapper extends FieldMapper { @Override public MetaJoinFieldMapper build(BuilderContext context) { - return new MetaJoinFieldMapper(name, joinField, context.indexSettings()); + return new MetaJoinFieldMapper(name, joinField); } } @@ -121,8 +120,8 @@ public class MetaJoinFieldMapper extends FieldMapper { } } - MetaJoinFieldMapper(String name, String joinField, Settings indexSettings) { - super(name, Defaults.FIELD_TYPE, new MetaJoinFieldType(joinField), indexSettings, MultiFields.empty(), CopyTo.empty()); + MetaJoinFieldMapper(String name, String joinField) { + super(name, Defaults.FIELD_TYPE, new MetaJoinFieldType(joinField), MultiFields.empty(), CopyTo.empty()); } @Override diff --git a/modules/parent-join/src/main/java/org/elasticsearch/join/mapper/ParentIdFieldMapper.java b/modules/parent-join/src/main/java/org/elasticsearch/join/mapper/ParentIdFieldMapper.java index 43b0472f778..1a130ae297e 100644 --- a/modules/parent-join/src/main/java/org/elasticsearch/join/mapper/ParentIdFieldMapper.java +++ b/modules/parent-join/src/main/java/org/elasticsearch/join/mapper/ParentIdFieldMapper.java @@ -32,7 +32,6 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.TermQuery; import org.apache.lucene.util.BytesRef; import org.elasticsearch.common.lucene.Lucene; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.fielddata.IndexFieldData; import org.elasticsearch.index.fielddata.plain.SortedSetOrdinalsIndexFieldData; import org.elasticsearch.index.mapper.FieldMapper; @@ -89,7 +88,7 @@ public final class ParentIdFieldMapper extends FieldMapper { @Override public ParentIdFieldMapper build(BuilderContext context) { return new ParentIdFieldMapper(name, parent, children, fieldType, - new ParentIdFieldType(buildFullName(context), eagerGlobalOrdinals, meta), context.indexSettings()); + new ParentIdFieldType(buildFullName(context), eagerGlobalOrdinals, meta)); } } @@ -142,9 +141,8 @@ public final class ParentIdFieldMapper extends FieldMapper { String parentName, Set children, FieldType fieldType, - MappedFieldType mappedFieldType, - Settings indexSettings) { - super(simpleName, fieldType, mappedFieldType, indexSettings, MultiFields.empty(), CopyTo.empty()); + MappedFieldType mappedFieldType) { + super(simpleName, fieldType, mappedFieldType, MultiFields.empty(), CopyTo.empty()); this.parentName = parentName; this.children = children; } diff --git a/modules/parent-join/src/main/java/org/elasticsearch/join/mapper/ParentJoinFieldMapper.java b/modules/parent-join/src/main/java/org/elasticsearch/join/mapper/ParentJoinFieldMapper.java index 93cd653e48f..770331dc8e8 100644 --- a/modules/parent-join/src/main/java/org/elasticsearch/join/mapper/ParentJoinFieldMapper.java +++ b/modules/parent-join/src/main/java/org/elasticsearch/join/mapper/ParentJoinFieldMapper.java @@ -27,7 +27,6 @@ import org.apache.lucene.search.DocValuesFieldExistsQuery; import org.apache.lucene.search.Query; import org.apache.lucene.util.BytesRef; import org.elasticsearch.common.lucene.Lucene; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.support.XContentMapValues; @@ -162,7 +161,7 @@ public final class ParentJoinFieldMapper extends FieldMapper { .forEach(parentIdFields::add); checkParentFields(name(), parentIdFields); MetaJoinFieldMapper unique = new MetaJoinFieldMapper.Builder(name).build(context); - return new ParentJoinFieldMapper(name, fieldType, new JoinFieldType(buildFullName(context), meta), context.indexSettings(), + return new ParentJoinFieldMapper(name, fieldType, new JoinFieldType(buildFullName(context), meta), unique, Collections.unmodifiableList(parentIdFields), eagerGlobalOrdinals); } } @@ -253,11 +252,10 @@ public final class ParentJoinFieldMapper extends FieldMapper { protected ParentJoinFieldMapper(String simpleName, FieldType fieldType, MappedFieldType mappedFieldType, - Settings indexSettings, MetaJoinFieldMapper uniqueFieldMapper, List parentIdFields, boolean eagerGlobalOrdinals) { - super(simpleName, fieldType, mappedFieldType, indexSettings, MultiFields.empty(), CopyTo.empty()); + super(simpleName, fieldType, mappedFieldType, MultiFields.empty(), CopyTo.empty()); this.parentIdFields = parentIdFields; this.uniqueFieldMapper = uniqueFieldMapper; this.eagerGlobalOrdinals = eagerGlobalOrdinals; diff --git a/modules/percolator/src/main/java/org/elasticsearch/percolator/PercolatorFieldMapper.java b/modules/percolator/src/main/java/org/elasticsearch/percolator/PercolatorFieldMapper.java index 6f9bf984b6e..b3692e96049 100644 --- a/modules/percolator/src/main/java/org/elasticsearch/percolator/PercolatorFieldMapper.java +++ b/modules/percolator/src/main/java/org/elasticsearch/percolator/PercolatorFieldMapper.java @@ -139,7 +139,7 @@ public class PercolatorFieldMapper extends FieldMapper { fieldType.mapUnmappedFieldsAsText = getMapUnmappedFieldAsText(context.indexSettings()); context.path().remove(); - return new PercolatorFieldMapper(name(), Builder.this.fieldType, fieldType, context.indexSettings(), + return new PercolatorFieldMapper(name(), Builder.this.fieldType, fieldType, multiFieldsBuilder.build(this, context), copyTo, queryShardContext, extractedTermsField, extractionResultField, queryBuilderField, rangeFieldMapper, minimumShouldMatchFieldMapper, getMapUnmappedFieldAsText(context.indexSettings())); @@ -344,12 +344,11 @@ public class PercolatorFieldMapper extends FieldMapper { private final boolean mapUnmappedFieldsAsText; PercolatorFieldMapper(String simpleName, FieldType fieldType, MappedFieldType mappedFieldType, - Settings indexSettings, MultiFields multiFields, CopyTo copyTo, - Supplier queryShardContext, + MultiFields multiFields, CopyTo copyTo, Supplier queryShardContext, KeywordFieldMapper queryTermsField, KeywordFieldMapper extractionResultField, BinaryFieldMapper queryBuilderField, RangeFieldMapper rangeFieldMapper, NumberFieldMapper minimumShouldMatchFieldMapper, boolean mapUnmappedFieldsAsText) { - super(simpleName, fieldType, mappedFieldType, indexSettings, multiFields, copyTo); + super(simpleName, fieldType, mappedFieldType, multiFields, copyTo); this.queryShardContext = queryShardContext; this.queryTermsField = queryTermsField; this.extractionResultField = extractionResultField; diff --git a/plugins/analysis-icu/src/main/java/org/elasticsearch/index/mapper/ICUCollationKeywordFieldMapper.java b/plugins/analysis-icu/src/main/java/org/elasticsearch/index/mapper/ICUCollationKeywordFieldMapper.java index aff74a99989..086d675e44d 100644 --- a/plugins/analysis-icu/src/main/java/org/elasticsearch/index/mapper/ICUCollationKeywordFieldMapper.java +++ b/plugins/analysis-icu/src/main/java/org/elasticsearch/index/mapper/ICUCollationKeywordFieldMapper.java @@ -36,7 +36,6 @@ import org.apache.lucene.util.BytesRef; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.lucene.Lucene; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.Fuzziness; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; @@ -459,7 +458,7 @@ public class ICUCollationKeywordFieldMapper extends FieldMapper { public ICUCollationKeywordFieldMapper build(BuilderContext context) { final Collator collator = buildCollator(); CollationFieldType ft = new CollationFieldType(buildFullName(context), indexed, hasDocValues, collator, meta); - return new ICUCollationKeywordFieldMapper(name, fieldType, ft, context.indexSettings(), + return new ICUCollationKeywordFieldMapper(name, fieldType, ft, multiFieldsBuilder.build(this, context), copyTo, rules, language, country, variant, strength, decomposition, alternate, caseLevel, caseFirst, numeric, variableTop, hiraganaQuaternaryMode, ignoreAbove, collator, nullValue); } @@ -565,12 +564,12 @@ public class ICUCollationKeywordFieldMapper extends FieldMapper { private final String nullValue; protected ICUCollationKeywordFieldMapper(String simpleName, FieldType fieldType, MappedFieldType mappedFieldType, - Settings indexSettings, MultiFields multiFields, CopyTo copyTo, String rules, String language, + MultiFields multiFields, CopyTo copyTo, String rules, String language, String country, String variant, String strength, String decomposition, String alternate, boolean caseLevel, String caseFirst, boolean numeric, String variableTop, boolean hiraganaQuaternaryMode, int ignoreAbove, Collator collator, String nullValue) { - super(simpleName, fieldType, mappedFieldType, indexSettings, multiFields, copyTo); + super(simpleName, fieldType, mappedFieldType, multiFields, copyTo); assert collator.isFrozen(); this.rules = rules; this.language = language; diff --git a/plugins/mapper-annotated-text/src/main/java/org/elasticsearch/index/mapper/annotatedtext/AnnotatedTextFieldMapper.java b/plugins/mapper-annotated-text/src/main/java/org/elasticsearch/index/mapper/annotatedtext/AnnotatedTextFieldMapper.java index d30cfe86b45..7cfe86abaf2 100644 --- a/plugins/mapper-annotated-text/src/main/java/org/elasticsearch/index/mapper/annotatedtext/AnnotatedTextFieldMapper.java +++ b/plugins/mapper-annotated-text/src/main/java/org/elasticsearch/index/mapper/annotatedtext/AnnotatedTextFieldMapper.java @@ -32,7 +32,6 @@ import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; import org.apache.lucene.index.IndexOptions; import org.elasticsearch.ElasticsearchParseException; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.support.XContentMapValues; import org.elasticsearch.index.analysis.AnalyzerScope; @@ -142,7 +141,7 @@ public class AnnotatedTextFieldMapper extends FieldMapper { } return new AnnotatedTextFieldMapper( name, fieldType, buildFieldType(context), positionIncrementGap, - context.indexSettings(), multiFieldsBuilder.build(this, context), copyTo); + multiFieldsBuilder.build(this, context), copyTo); } } @@ -554,9 +553,8 @@ public class AnnotatedTextFieldMapper extends FieldMapper { private int positionIncrementGap; protected AnnotatedTextFieldMapper(String simpleName, FieldType fieldType, AnnotatedTextFieldType mappedFieldType, - int positionIncrementGap, - Settings indexSettings, MultiFields multiFields, CopyTo copyTo) { - super(simpleName, fieldType, mappedFieldType, indexSettings, multiFields, copyTo); + int positionIncrementGap, MultiFields multiFields, CopyTo copyTo) { + super(simpleName, fieldType, mappedFieldType, multiFields, copyTo); assert fieldType.tokenized(); this.positionIncrementGap = positionIncrementGap; } diff --git a/plugins/mapper-murmur3/src/main/java/org/elasticsearch/index/mapper/murmur3/Murmur3FieldMapper.java b/plugins/mapper-murmur3/src/main/java/org/elasticsearch/index/mapper/murmur3/Murmur3FieldMapper.java index fe89d463b87..37fe6faf5c1 100644 --- a/plugins/mapper-murmur3/src/main/java/org/elasticsearch/index/mapper/murmur3/Murmur3FieldMapper.java +++ b/plugins/mapper-murmur3/src/main/java/org/elasticsearch/index/mapper/murmur3/Murmur3FieldMapper.java @@ -27,7 +27,6 @@ import org.apache.lucene.search.DocValuesFieldExistsQuery; import org.apache.lucene.search.Query; import org.apache.lucene.util.BytesRef; import org.elasticsearch.common.hash.MurmurHash3; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.fielddata.IndexFieldData; import org.elasticsearch.index.fielddata.IndexNumericFieldData.NumericType; import org.elasticsearch.index.fielddata.plain.SortedNumericIndexFieldData; @@ -66,7 +65,7 @@ public class Murmur3FieldMapper extends FieldMapper { @Override public Murmur3FieldMapper build(BuilderContext context) { return new Murmur3FieldMapper(name, fieldType, new Murmur3FieldType(buildFullName(context), meta), - context.indexSettings(), multiFieldsBuilder.build(this, context), copyTo); + multiFieldsBuilder.build(this, context), copyTo); } } @@ -128,8 +127,8 @@ public class Murmur3FieldMapper extends FieldMapper { } protected Murmur3FieldMapper(String simpleName, FieldType fieldType, MappedFieldType mappedFieldType, - Settings indexSettings, MultiFields multiFields, CopyTo copyTo) { - super(simpleName, fieldType, mappedFieldType, indexSettings, multiFields, copyTo); + MultiFields multiFields, CopyTo copyTo) { + super(simpleName, fieldType, mappedFieldType, multiFields, copyTo); } @Override diff --git a/plugins/mapper-size/src/main/java/org/elasticsearch/index/mapper/size/SizeFieldMapper.java b/plugins/mapper-size/src/main/java/org/elasticsearch/index/mapper/size/SizeFieldMapper.java index f403f48d313..d4a8050267b 100644 --- a/plugins/mapper-size/src/main/java/org/elasticsearch/index/mapper/size/SizeFieldMapper.java +++ b/plugins/mapper-size/src/main/java/org/elasticsearch/index/mapper/size/SizeFieldMapper.java @@ -20,7 +20,6 @@ package org.elasticsearch.index.mapper.size; import org.apache.lucene.document.FieldType; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.support.XContentMapValues; import org.elasticsearch.index.mapper.EnabledAttributeMapper; @@ -67,7 +66,7 @@ public class SizeFieldMapper extends MetadataFieldMapper { @Override public SizeFieldMapper build(BuilderContext context) { return new SizeFieldMapper(fieldType, enabledState, - new NumberFieldMapper.NumberFieldType(NAME, NumberFieldMapper.NumberType.INTEGER), context.indexSettings()); + new NumberFieldMapper.NumberFieldType(NAME, NumberFieldMapper.NumberType.INTEGER)); } } @@ -92,16 +91,15 @@ public class SizeFieldMapper extends MetadataFieldMapper { @Override public MetadataFieldMapper getDefault(MappedFieldType fieldType, ParserContext context) { return new SizeFieldMapper(Defaults.SIZE_FIELD_TYPE, Defaults.ENABLED_STATE, - new NumberFieldMapper.NumberFieldType(NAME, NumberFieldMapper.NumberType.INTEGER), - context.mapperService().getIndexSettings().getSettings()); + new NumberFieldMapper.NumberFieldType(NAME, NumberFieldMapper.NumberType.INTEGER)); } } private EnabledAttributeMapper enabledState; private SizeFieldMapper(FieldType fieldType, EnabledAttributeMapper enabled, - MappedFieldType mappedFieldType, Settings indexSettings) { - super(fieldType, mappedFieldType, indexSettings); + MappedFieldType mappedFieldType) { + super(fieldType, mappedFieldType); this.enabledState = enabled; } diff --git a/server/src/main/java/org/elasticsearch/index/mapper/AbstractGeometryFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/AbstractGeometryFieldMapper.java index 74f46172e8a..e44c0cc2244 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/AbstractGeometryFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/AbstractGeometryFieldMapper.java @@ -28,7 +28,6 @@ import org.elasticsearch.common.Explicit; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.geo.ShapeRelation; import org.elasticsearch.common.geo.SpatialStrategy; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.LoggingDeprecationHandler; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; @@ -253,9 +252,9 @@ public abstract class AbstractGeometryFieldMapper extends Fie protected Explicit ignoreZValue; protected AbstractGeometryFieldMapper(String simpleName, FieldType fieldType, MappedFieldType mappedFieldType, - Settings indexSettings, Explicit ignoreMalformed, + Explicit ignoreMalformed, Explicit ignoreZValue, MultiFields multiFields, CopyTo copyTo) { - super(simpleName, fieldType, mappedFieldType, indexSettings, multiFields, copyTo); + super(simpleName, fieldType, mappedFieldType, multiFields, copyTo); this.ignoreMalformed = ignoreMalformed; this.ignoreZValue = ignoreZValue; } diff --git a/server/src/main/java/org/elasticsearch/index/mapper/AbstractPointGeometryFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/AbstractPointGeometryFieldMapper.java index eb684a76072..e8c2135e40e 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/AbstractPointGeometryFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/AbstractPointGeometryFieldMapper.java @@ -24,7 +24,6 @@ import org.elasticsearch.common.Explicit; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.geo.GeoPoint; import org.elasticsearch.common.geo.GeometryFormat; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.LoggingDeprecationHandler; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; @@ -66,7 +65,7 @@ public abstract class AbstractPointGeometryFieldMapper extend } public abstract AbstractPointGeometryFieldMapper build(BuilderContext context, String simpleName, FieldType fieldType, - Settings indexSettings, MultiFields multiFields, + MultiFields multiFields, Explicit ignoreMalformed, Explicit ignoreZValue, ParsedPoint nullValue, CopyTo copyTo); @@ -74,7 +73,7 @@ public abstract class AbstractPointGeometryFieldMapper extend @Override public AbstractPointGeometryFieldMapper build(BuilderContext context) { - return build(context, name, fieldType, context.indexSettings(), + return build(context, name, fieldType, multiFieldsBuilder.build(this, context), ignoreMalformed(context), ignoreZValue(context), nullValue, copyTo); } @@ -125,9 +124,9 @@ public abstract class AbstractPointGeometryFieldMapper extend } protected AbstractPointGeometryFieldMapper(String simpleName, FieldType fieldType, MappedFieldType mappedFieldType, - Settings indexSettings, MultiFields multiFields, Explicit ignoreMalformed, + MultiFields multiFields, Explicit ignoreMalformed, Explicit ignoreZValue, ParsedPoint nullValue, CopyTo copyTo) { - super(simpleName, fieldType, mappedFieldType, indexSettings, ignoreMalformed, ignoreZValue, multiFields, copyTo); + super(simpleName, fieldType, mappedFieldType, ignoreMalformed, ignoreZValue, multiFields, copyTo); this.nullValue = nullValue; } diff --git a/server/src/main/java/org/elasticsearch/index/mapper/AbstractShapeGeometryFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/AbstractShapeGeometryFieldMapper.java index 49979ac9266..43bba0078eb 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/AbstractShapeGeometryFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/AbstractShapeGeometryFieldMapper.java @@ -24,7 +24,6 @@ import org.elasticsearch.common.Explicit; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.geo.builders.ShapeBuilder; import org.elasticsearch.common.geo.builders.ShapeBuilder.Orientation; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.LoggingDeprecationHandler; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.support.XContentMapValues; @@ -192,9 +191,9 @@ public abstract class AbstractShapeGeometryFieldMapper extend protected AbstractShapeGeometryFieldMapper(String simpleName, FieldType fieldType, MappedFieldType mappedFieldType, Explicit ignoreMalformed, Explicit coerce, - Explicit ignoreZValue, Explicit orientation, Settings indexSettings, + Explicit ignoreZValue, Explicit orientation, MultiFields multiFields, CopyTo copyTo) { - super(simpleName, fieldType, mappedFieldType, indexSettings, ignoreMalformed, ignoreZValue, multiFields, copyTo); + super(simpleName, fieldType, mappedFieldType, ignoreMalformed, ignoreZValue, multiFields, copyTo); this.coerce = coerce; this.orientation = orientation; } diff --git a/server/src/main/java/org/elasticsearch/index/mapper/AllFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/AllFieldMapper.java index b15e22d0198..da8995303e4 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/AllFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/AllFieldMapper.java @@ -23,7 +23,6 @@ import org.apache.lucene.document.FieldType; import org.apache.lucene.index.IndexOptions; import org.apache.lucene.search.MatchNoDocsQuery; import org.apache.lucene.search.Query; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.support.XContentMapValues; import org.elasticsearch.index.query.QueryShardContext; @@ -68,7 +67,7 @@ public class AllFieldMapper extends MetadataFieldMapper { @Override public AllFieldMapper build(BuilderContext context) { - return new AllFieldMapper(context.indexSettings(), disableExplicit); + return new AllFieldMapper(disableExplicit); } } @@ -94,8 +93,7 @@ public class AllFieldMapper extends MetadataFieldMapper { @Override public MetadataFieldMapper getDefault(MappedFieldType fieldType, ParserContext context) { - final Settings indexSettings = context.mapperService().getIndexSettings().getSettings(); - return new AllFieldMapper(indexSettings, false); + return new AllFieldMapper(false); } } @@ -126,8 +124,8 @@ public class AllFieldMapper extends MetadataFieldMapper { private final boolean disableExplicit; - private AllFieldMapper(Settings indexSettings, boolean disableExplicit) { - super(Defaults.FIELD_TYPE, new AllFieldType(), indexSettings); + private AllFieldMapper(boolean disableExplicit) { + super(Defaults.FIELD_TYPE, new AllFieldType()); this.disableExplicit = disableExplicit; } diff --git a/server/src/main/java/org/elasticsearch/index/mapper/BinaryFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/BinaryFieldMapper.java index 9bb81bbc73c..08cad1e73f9 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/BinaryFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/BinaryFieldMapper.java @@ -32,7 +32,6 @@ import org.apache.lucene.util.BytesRef; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.bytes.BytesReference; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.util.CollectionUtils; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.index.fielddata.IndexFieldData; @@ -75,7 +74,7 @@ public class BinaryFieldMapper extends FieldMapper { @Override public BinaryFieldMapper build(BuilderContext context) { return new BinaryFieldMapper(name, fieldType, new BinaryFieldType(buildFullName(context), hasDocValues, meta), - context.indexSettings(), multiFieldsBuilder.build(this, context), copyTo); + multiFieldsBuilder.build(this, context), copyTo); } @Override @@ -168,8 +167,8 @@ public class BinaryFieldMapper extends FieldMapper { } protected BinaryFieldMapper(String simpleName, FieldType fieldType, MappedFieldType mappedFieldType, - Settings indexSettings, MultiFields multiFields, CopyTo copyTo) { - super(simpleName, fieldType, mappedFieldType, indexSettings, multiFields, copyTo); + MultiFields multiFields, CopyTo copyTo) { + super(simpleName, fieldType, mappedFieldType, multiFields, copyTo); } @Override diff --git a/server/src/main/java/org/elasticsearch/index/mapper/BooleanFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/BooleanFieldMapper.java index 7ab98372bc9..8d359f3baf5 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/BooleanFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/BooleanFieldMapper.java @@ -30,7 +30,6 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TermRangeQuery; import org.apache.lucene.util.BytesRef; import org.elasticsearch.common.Nullable; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.support.XContentMapValues; @@ -90,7 +89,7 @@ public class BooleanFieldMapper extends FieldMapper { public BooleanFieldMapper build(BuilderContext context) { return new BooleanFieldMapper(name, fieldType, new BooleanFieldType(buildFullName(context), indexed, hasDocValues, meta), - context.indexSettings(), multiFieldsBuilder.build(this, context), copyTo, nullValue); + multiFieldsBuilder.build(this, context), copyTo, nullValue); } } @@ -220,8 +219,8 @@ public class BooleanFieldMapper extends FieldMapper { private final Boolean nullValue; protected BooleanFieldMapper(String simpleName, FieldType fieldType, MappedFieldType mappedFieldType, - Settings indexSettings, MultiFields multiFields, CopyTo copyTo, Boolean nullValue) { - super(simpleName, fieldType, mappedFieldType, indexSettings, multiFields, copyTo); + MultiFields multiFields, CopyTo copyTo, Boolean nullValue) { + super(simpleName, fieldType, mappedFieldType, multiFields, copyTo); this.nullValue = nullValue; } diff --git a/server/src/main/java/org/elasticsearch/index/mapper/CompletionFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/CompletionFieldMapper.java index b7b95b2a9d5..f62730c92ce 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/CompletionFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/CompletionFieldMapper.java @@ -37,7 +37,6 @@ import org.elasticsearch.cluster.metadata.IndexMetadata; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.ParsingException; import org.elasticsearch.common.logging.DeprecationLogger; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.Fuzziness; import org.elasticsearch.common.util.set.Sets; import org.elasticsearch.common.xcontent.LoggingDeprecationHandler; @@ -404,7 +403,7 @@ public class CompletionFieldMapper extends FieldMapper { ft.setSearchAnalyzer(searchAnalyzer); ft.setSearchQuoteAnalyzer(searchQuoteAnalyzer); ft.setSimilarity(similarity); - return new CompletionFieldMapper(name, this.fieldType, ft, context.indexSettings(), + return new CompletionFieldMapper(name, this.fieldType, ft, multiFieldsBuilder.build(this, context), copyTo, maxInputLength); } @@ -429,9 +428,9 @@ public class CompletionFieldMapper extends FieldMapper { private int maxInputLength; - public CompletionFieldMapper(String simpleName, FieldType fieldType, MappedFieldType mappedFieldType, Settings indexSettings, + public CompletionFieldMapper(String simpleName, FieldType fieldType, MappedFieldType mappedFieldType, MultiFields multiFields, CopyTo copyTo, int maxInputLength) { - super(simpleName, fieldType, mappedFieldType, indexSettings, multiFields, copyTo); + super(simpleName, fieldType, mappedFieldType, multiFields, copyTo); this.maxInputLength = maxInputLength; } diff --git a/server/src/main/java/org/elasticsearch/index/mapper/DateFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/DateFieldMapper.java index 96ce71610bb..d2ff790ac98 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/DateFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/DateFieldMapper.java @@ -40,7 +40,6 @@ import org.elasticsearch.common.Nullable; import org.elasticsearch.common.geo.ShapeRelation; import org.elasticsearch.common.joda.Joda; import org.elasticsearch.common.lucene.Lucene; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.time.DateFormatter; import org.elasticsearch.common.time.DateFormatters; import org.elasticsearch.common.time.DateMathParser; @@ -258,7 +257,7 @@ public final class DateFieldMapper extends FieldMapper { DateFieldType ft = setupFieldType(context); Long nullTimestamp = nullValue == null ? null : ft.dateTimeFormatter.parseMillis(nullValue); return new DateFieldMapper(name, fieldType, ft, ignoreMalformed(context), nullTimestamp, nullValue, - context.indexSettings(), multiFieldsBuilder.build(this, context), copyTo); + multiFieldsBuilder.build(this, context), copyTo); } } @@ -563,10 +562,9 @@ public final class DateFieldMapper extends FieldMapper { MappedFieldType mappedFieldType, Explicit ignoreMalformed, Long nullValue, String nullValueAsString, - Settings indexSettings, MultiFields multiFields, CopyTo copyTo) { - super(simpleName, fieldType, mappedFieldType, indexSettings, multiFields, copyTo); + super(simpleName, fieldType, mappedFieldType, multiFields, copyTo); this.ignoreMalformed = ignoreMalformed; this.nullValue = nullValue; this.nullValueAsString = nullValueAsString; diff --git a/server/src/main/java/org/elasticsearch/index/mapper/DynamicKeyFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/DynamicKeyFieldMapper.java index 9135559f998..2ebd66080a0 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/DynamicKeyFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/DynamicKeyFieldMapper.java @@ -20,7 +20,6 @@ package org.elasticsearch.index.mapper; import org.apache.lucene.document.FieldType; -import org.elasticsearch.common.settings.Settings; /** * A field mapper that supports lookup of dynamic sub-keys. If the field mapper is named 'my_field', @@ -45,9 +44,8 @@ public abstract class DynamicKeyFieldMapper extends FieldMapper { public DynamicKeyFieldMapper(String simpleName, FieldType fieldType, MappedFieldType defaultFieldType, - Settings indexSettings, CopyTo copyTo) { - super(simpleName, fieldType, defaultFieldType, indexSettings, MultiFields.empty(), copyTo); + super(simpleName, fieldType, defaultFieldType, MultiFields.empty(), copyTo); } public abstract MappedFieldType keyedFieldType(String key); diff --git a/server/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java index 7624f458cb6..58d7e3d34a7 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java @@ -24,11 +24,9 @@ import com.carrotsearch.hppc.cursors.ObjectObjectCursor; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; import org.apache.lucene.index.IndexOptions; -import org.elasticsearch.Version; import org.elasticsearch.common.collect.ImmutableOpenMap; import org.elasticsearch.common.settings.Setting; import org.elasticsearch.common.settings.Setting.Property; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.support.AbstractXContentParser; @@ -192,17 +190,14 @@ public abstract class FieldMapper extends Mapper implements Cloneable { } } - protected final Version indexCreatedVersion; protected FieldType fieldType; protected MappedFieldType mappedFieldType; protected MultiFields multiFields; protected CopyTo copyTo; protected FieldMapper(String simpleName, FieldType fieldType, MappedFieldType mappedFieldType, - Settings indexSettings, MultiFields multiFields, CopyTo copyTo) { + MultiFields multiFields, CopyTo copyTo) { super(simpleName); - assert indexSettings != null; - this.indexCreatedVersion = Version.indexCreated(indexSettings); if (mappedFieldType.name().isEmpty()) { throw new IllegalArgumentException("name cannot be empty string"); } diff --git a/server/src/main/java/org/elasticsearch/index/mapper/FieldNamesFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/FieldNamesFieldMapper.java index 5fe2dad6c0c..d0e3f0c4b42 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/FieldNamesFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/FieldNamesFieldMapper.java @@ -86,7 +86,7 @@ public class FieldNamesFieldMapper extends MetadataFieldMapper { public FieldNamesFieldMapper build(BuilderContext context) { FieldNamesFieldType fieldNamesFieldType = new FieldNamesFieldType(); fieldNamesFieldType.setEnabled(enabled); - return new FieldNamesFieldMapper(fieldType, fieldNamesFieldType, context.indexSettings()); + return new FieldNamesFieldMapper(fieldType, fieldNamesFieldType); } } @@ -119,7 +119,7 @@ public class FieldNamesFieldMapper extends MetadataFieldMapper { public MetadataFieldMapper getDefault(MappedFieldType fieldType, ParserContext context) { final Settings indexSettings = context.mapperService().getIndexSettings().getSettings(); if (fieldType != null) { - return new FieldNamesFieldMapper(Defaults.FIELD_TYPE, fieldType, indexSettings); + return new FieldNamesFieldMapper(Defaults.FIELD_TYPE, fieldType); } else { return parse(NAME, Collections.emptyMap(), context) .build(new BuilderContext(indexSettings, new ContentPath(1))); @@ -187,8 +187,8 @@ public class FieldNamesFieldMapper extends MetadataFieldMapper { } } - private FieldNamesFieldMapper(FieldType fieldType, MappedFieldType mappedFieldType, Settings indexSettings) { - super(fieldType, mappedFieldType, indexSettings); + private FieldNamesFieldMapper(FieldType fieldType, MappedFieldType mappedFieldType) { + super(fieldType, mappedFieldType); } @Override diff --git a/server/src/main/java/org/elasticsearch/index/mapper/GeoPointFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/GeoPointFieldMapper.java index 7888ba791a6..5f435c125a4 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/GeoPointFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/GeoPointFieldMapper.java @@ -27,7 +27,6 @@ import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.Explicit; import org.elasticsearch.common.geo.GeoPoint; import org.elasticsearch.common.geo.GeoUtils; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.index.fielddata.IndexFieldData; import org.elasticsearch.index.fielddata.plain.AbstractLatLonPointIndexFieldData; @@ -61,15 +60,15 @@ public class GeoPointFieldMapper extends AbstractPointGeometryFieldMapper ignoreMalformed, + MultiFields multiFields, Explicit ignoreMalformed, Explicit ignoreZValue, ParsedPoint nullValue, CopyTo copyTo) { GeoPointFieldType ft = new GeoPointFieldType(buildFullName(context), indexed, hasDocValues, meta); ft.setGeometryParser(new PointParser<>()); ft.setGeometryIndexer(new GeoPointIndexer(ft)); ft.setGeometryQueryBuilder(new VectorGeoPointShapeQueryProcessor()); - return new GeoPointFieldMapper(name, fieldType, ft, indexSettings, multiFields, - ignoreMalformed, ignoreZValue, nullValue, copyTo); + return new GeoPointFieldMapper(name, fieldType, ft, multiFields, ignoreMalformed, ignoreZValue, nullValue, copyTo); } } @@ -106,9 +105,9 @@ public class GeoPointFieldMapper extends AbstractPointGeometryFieldMapper ignoreMalformed, + MultiFields multiFields, Explicit ignoreMalformed, Explicit ignoreZValue, ParsedPoint nullValue, CopyTo copyTo) { - super(simpleName, fieldType, mappedFieldType, indexSettings, multiFields, ignoreMalformed, ignoreZValue, nullValue, copyTo); + super(simpleName, fieldType, mappedFieldType, multiFields, ignoreMalformed, ignoreZValue, nullValue, copyTo); } @Override diff --git a/server/src/main/java/org/elasticsearch/index/mapper/GeoShapeFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/GeoShapeFieldMapper.java index bec622bc46b..a33693995cd 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/GeoShapeFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/GeoShapeFieldMapper.java @@ -23,7 +23,6 @@ import org.apache.lucene.document.LatLonShape; import org.elasticsearch.common.Explicit; import org.elasticsearch.common.geo.GeometryParser; import org.elasticsearch.common.geo.builders.ShapeBuilder; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.geometry.Geometry; import org.elasticsearch.index.query.VectorGeoShapeQueryProcessor; @@ -80,7 +79,7 @@ public class GeoShapeFieldMapper extends AbstractShapeGeometryFieldMapper ignoreMalformed, Explicit coerce, - Explicit ignoreZValue, Explicit orientation, Settings indexSettings, + Explicit ignoreZValue, Explicit orientation, MultiFields multiFields, CopyTo copyTo) { - super(simpleName, fieldType, mappedFieldType, ignoreMalformed, coerce, ignoreZValue, orientation, indexSettings, + super(simpleName, fieldType, mappedFieldType, ignoreMalformed, coerce, ignoreZValue, orientation, multiFields, copyTo); } diff --git a/server/src/main/java/org/elasticsearch/index/mapper/IdFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/IdFieldMapper.java index 7f1e072bb4e..c1482090489 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/IdFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/IdFieldMapper.java @@ -108,8 +108,7 @@ public class IdFieldMapper extends MetadataFieldMapper { @Override public MetadataFieldMapper getDefault(MappedFieldType fieldType, ParserContext context) { - final IndexSettings indexSettings = context.mapperService().getIndexSettings(); - return new IdFieldMapper(Defaults.FIELD_TYPE, indexSettings); + return new IdFieldMapper(Defaults.FIELD_TYPE); } } @@ -285,8 +284,8 @@ public class IdFieldMapper extends MetadataFieldMapper { }; } - private IdFieldMapper(FieldType fieldType, IndexSettings indexSettings) { - super(fieldType, new IdFieldType(), indexSettings.getSettings()); + private IdFieldMapper(FieldType fieldType) { + super(fieldType, new IdFieldType()); } @Override diff --git a/server/src/main/java/org/elasticsearch/index/mapper/IgnoredFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/IgnoredFieldMapper.java index d617a268797..585da23d644 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/IgnoredFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/IgnoredFieldMapper.java @@ -24,7 +24,6 @@ import org.apache.lucene.document.FieldType; import org.apache.lucene.index.IndexOptions; import org.apache.lucene.search.Query; import org.apache.lucene.search.TermRangeQuery; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.index.query.QueryShardContext; @@ -63,7 +62,7 @@ public final class IgnoredFieldMapper extends MetadataFieldMapper { @Override public IgnoredFieldMapper build(BuilderContext context) { - return new IgnoredFieldMapper(context.indexSettings()); + return new IgnoredFieldMapper(); } } @@ -76,8 +75,7 @@ public final class IgnoredFieldMapper extends MetadataFieldMapper { @Override public MetadataFieldMapper getDefault(MappedFieldType fieldType, ParserContext context) { - final Settings indexSettings = context.mapperService().getIndexSettings().getSettings(); - return new IgnoredFieldMapper(indexSettings); + return new IgnoredFieldMapper(); } } @@ -114,8 +112,8 @@ public final class IgnoredFieldMapper extends MetadataFieldMapper { } - private IgnoredFieldMapper(Settings indexSettings) { - super(Defaults.FIELD_TYPE, IgnoredFieldType.INSTANCE, indexSettings); + private IgnoredFieldMapper() { + super(Defaults.FIELD_TYPE, IgnoredFieldType.INSTANCE); } @Override diff --git a/server/src/main/java/org/elasticsearch/index/mapper/IndexFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/IndexFieldMapper.java index 25000ce0f20..59b67e821f5 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/IndexFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/IndexFieldMapper.java @@ -23,7 +23,6 @@ import org.apache.lucene.document.FieldType; import org.apache.lucene.index.IndexOptions; import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.Query; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.index.fielddata.IndexFieldData; import org.elasticsearch.index.fielddata.plain.ConstantIndexFieldData; @@ -63,7 +62,7 @@ public class IndexFieldMapper extends MetadataFieldMapper { @Override public IndexFieldMapper build(BuilderContext context) { - return new IndexFieldMapper(fieldType, context.indexSettings()); + return new IndexFieldMapper(fieldType); } } @@ -76,8 +75,7 @@ public class IndexFieldMapper extends MetadataFieldMapper { @Override public MetadataFieldMapper getDefault(MappedFieldType fieldType, ParserContext context) { - final Settings indexSettings = context.mapperService().getIndexSettings().getSettings(); - return new IndexFieldMapper(Defaults.FIELD_TYPE, indexSettings); + return new IndexFieldMapper(Defaults.FIELD_TYPE); } } @@ -120,8 +118,8 @@ public class IndexFieldMapper extends MetadataFieldMapper { } - private IndexFieldMapper(FieldType fieldType, Settings indexSettings) { - super(fieldType, IndexFieldType.INSTANCE, indexSettings); + private IndexFieldMapper(FieldType fieldType) { + super(fieldType, IndexFieldType.INSTANCE); } @Override diff --git a/server/src/main/java/org/elasticsearch/index/mapper/IpFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/IpFieldMapper.java index f0a7a4e216a..da1726ccbd7 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/IpFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/IpFieldMapper.java @@ -35,7 +35,6 @@ import org.elasticsearch.common.Explicit; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.collect.Tuple; import org.elasticsearch.common.network.InetAddresses; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.support.XContentMapValues; import org.elasticsearch.index.fielddata.IndexFieldData; @@ -101,7 +100,7 @@ public class IpFieldMapper extends FieldMapper { @Override public IpFieldMapper build(BuilderContext context) { return new IpFieldMapper(name, fieldType, new IpFieldType(buildFullName(context), indexed, hasDocValues, meta), - ignoreMalformed(context), nullValue, context.indexSettings(), + ignoreMalformed(context), nullValue, multiFieldsBuilder.build(this, context), copyTo); } @@ -339,10 +338,9 @@ public class IpFieldMapper extends FieldMapper { MappedFieldType mappedFieldType, Explicit ignoreMalformed, InetAddress nullValue, - Settings indexSettings, MultiFields multiFields, CopyTo copyTo) { - super(simpleName, fieldType, mappedFieldType, indexSettings, multiFields, copyTo); + super(simpleName, fieldType, mappedFieldType, multiFields, copyTo); this.ignoreMalformed = ignoreMalformed; this.nullValue = nullValue; } diff --git a/server/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java index d3d4cec29f5..16a1c9be81d 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java @@ -33,7 +33,6 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.TermQuery; import org.apache.lucene.util.BytesRef; import org.elasticsearch.common.lucene.Lucene; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.support.XContentMapValues; @@ -174,7 +173,7 @@ public final class KeywordFieldMapper extends FieldMapper { public KeywordFieldMapper build(BuilderContext context) { return new KeywordFieldMapper(name, fieldType, buildFieldType(context), ignoreAbove, splitQueriesOnWhitespace, nullValue, - context.indexSettings(), multiFieldsBuilder.build(this, context), copyTo); + multiFieldsBuilder.build(this, context), copyTo); } } @@ -330,8 +329,8 @@ public final class KeywordFieldMapper extends FieldMapper { protected KeywordFieldMapper(String simpleName, FieldType fieldType, MappedFieldType mappedFieldType, int ignoreAbove, boolean splitQueriesOnWhitespace, String nullValue, - Settings indexSettings, MultiFields multiFields, CopyTo copyTo) { - super(simpleName, fieldType, mappedFieldType, indexSettings, multiFields, copyTo); + MultiFields multiFields, CopyTo copyTo) { + super(simpleName, fieldType, mappedFieldType, multiFields, copyTo); assert fieldType.indexOptions().compareTo(IndexOptions.DOCS_AND_FREQS) <= 0; this.ignoreAbove = ignoreAbove; this.splitQueriesOnWhitespace = splitQueriesOnWhitespace; diff --git a/server/src/main/java/org/elasticsearch/index/mapper/LegacyGeoShapeFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/LegacyGeoShapeFieldMapper.java index 5372da38d75..e088ee8789a 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/LegacyGeoShapeFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/LegacyGeoShapeFieldMapper.java @@ -422,12 +422,15 @@ public class LegacyGeoShapeFieldMapper extends AbstractShapeGeometryFieldMapper< } } + private final Version indexCreatedVersion; + public LegacyGeoShapeFieldMapper(String simpleName, FieldType fieldType, MappedFieldType mappedFieldType, Explicit ignoreMalformed, Explicit coerce, Explicit orientation, Explicit ignoreZValue, Settings indexSettings, MultiFields multiFields, CopyTo copyTo) { - super(simpleName, fieldType, mappedFieldType, ignoreMalformed, coerce, ignoreZValue, orientation, indexSettings, + super(simpleName, fieldType, mappedFieldType, ignoreMalformed, coerce, ignoreZValue, orientation, multiFields, copyTo); + this.indexCreatedVersion = Version.indexCreated(indexSettings); } @Override diff --git a/server/src/main/java/org/elasticsearch/index/mapper/MetadataFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/MetadataFieldMapper.java index f92ede91850..a1711e7458a 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/MetadataFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/MetadataFieldMapper.java @@ -20,7 +20,6 @@ package org.elasticsearch.index.mapper; import org.apache.lucene.document.FieldType; -import org.elasticsearch.common.settings.Settings; import java.io.IOException; import java.util.List; @@ -66,8 +65,8 @@ public abstract class MetadataFieldMapper extends FieldMapper { public abstract MetadataFieldMapper build(BuilderContext context); } - protected MetadataFieldMapper(FieldType fieldType, MappedFieldType mappedFieldType, Settings indexSettings) { - super(mappedFieldType.name(), fieldType, mappedFieldType, indexSettings, MultiFields.empty(), CopyTo.empty()); + protected MetadataFieldMapper(FieldType fieldType, MappedFieldType mappedFieldType) { + super(mappedFieldType.name(), fieldType, mappedFieldType, MultiFields.empty(), CopyTo.empty()); } /** diff --git a/server/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java index 51202fa65ec..45a0baba6b4 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java @@ -47,7 +47,6 @@ import org.elasticsearch.common.lucene.Lucene; import org.elasticsearch.common.lucene.search.Queries; import org.elasticsearch.common.settings.Setting; import org.elasticsearch.common.settings.Setting.Property; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentParser.Token; @@ -141,7 +140,7 @@ public class NumberFieldMapper extends FieldMapper { @Override public NumberFieldMapper build(BuilderContext context) { return new NumberFieldMapper(name, fieldType, new NumberFieldType(buildFullName(context), type, indexed, hasDocValues, meta), - ignoreMalformed(context), coerce(context), nullValue, context.indexSettings(), + ignoreMalformed(context), coerce(context), nullValue, multiFieldsBuilder.build(this, context), copyTo); } } @@ -1029,10 +1028,9 @@ public class NumberFieldMapper extends FieldMapper { Explicit ignoreMalformed, Explicit coerce, Number nullValue, - Settings indexSettings, MultiFields multiFields, CopyTo copyTo) { - super(simpleName, fieldType, mappedFieldType, indexSettings, multiFields, copyTo); + super(simpleName, fieldType, mappedFieldType, multiFields, copyTo); this.ignoreMalformed = ignoreMalformed; this.coerce = coerce; this.nullValue = nullValue; diff --git a/server/src/main/java/org/elasticsearch/index/mapper/RangeFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/RangeFieldMapper.java index 3da0e49bd0a..9cc94e06629 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/RangeFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/RangeFieldMapper.java @@ -34,7 +34,6 @@ import org.elasticsearch.common.joda.Joda; import org.elasticsearch.common.lucene.Lucene; import org.elasticsearch.common.network.InetAddresses; import org.elasticsearch.common.settings.Setting; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.time.DateFormatter; import org.elasticsearch.common.time.DateMathParser; import org.elasticsearch.common.util.LocaleUtils; @@ -146,7 +145,7 @@ public class RangeFieldMapper extends FieldMapper { public RangeFieldMapper build(BuilderContext context) { setupFieldType(context); return new RangeFieldMapper(name, fieldType, setupFieldType(context), coerce(context), - context.indexSettings(), multiFieldsBuilder.build(this, context), copyTo); + multiFieldsBuilder.build(this, context), copyTo); } } @@ -320,10 +319,9 @@ public class RangeFieldMapper extends FieldMapper { FieldType fieldType, MappedFieldType mappedFieldType, Explicit coerce, - Settings indexSettings, MultiFields multiFields, CopyTo copyTo) { - super(simpleName, fieldType, mappedFieldType, indexSettings, multiFields, copyTo); + super(simpleName, fieldType, mappedFieldType, multiFields, copyTo); this.coerce = coerce; } diff --git a/server/src/main/java/org/elasticsearch/index/mapper/RoutingFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/RoutingFieldMapper.java index 3d9c434c1f8..b2337de1539 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/RoutingFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/RoutingFieldMapper.java @@ -72,7 +72,7 @@ public class RoutingFieldMapper extends MetadataFieldMapper { @Override public RoutingFieldMapper build(BuilderContext context) { - return new RoutingFieldMapper(fieldType, required, context.indexSettings()); + return new RoutingFieldMapper(fieldType, required); } } @@ -97,7 +97,7 @@ public class RoutingFieldMapper extends MetadataFieldMapper { public MetadataFieldMapper getDefault(MappedFieldType fieldType, ParserContext context) { final Settings indexSettings = context.mapperService().getIndexSettings().getSettings(); if (fieldType != null) { - return new RoutingFieldMapper(Defaults.FIELD_TYPE, Defaults.REQUIRED, indexSettings); + return new RoutingFieldMapper(Defaults.FIELD_TYPE, Defaults.REQUIRED); } else { return parse(NAME, Collections.emptyMap(), context) .build(new BuilderContext(indexSettings, new ContentPath(1))); @@ -137,8 +137,8 @@ public class RoutingFieldMapper extends MetadataFieldMapper { private final boolean required; - private RoutingFieldMapper(FieldType fieldType, boolean required, Settings indexSettings) { - super(fieldType, RoutingFieldType.INSTANCE, indexSettings); + private RoutingFieldMapper(FieldType fieldType, boolean required) { + super(fieldType, RoutingFieldType.INSTANCE); this.required = required; } diff --git a/server/src/main/java/org/elasticsearch/index/mapper/SeqNoFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/SeqNoFieldMapper.java index c9331c88d6c..31a8800303c 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/SeqNoFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/SeqNoFieldMapper.java @@ -115,7 +115,7 @@ public class SeqNoFieldMapper extends MetadataFieldMapper { @Override public MetadataFieldMapper getDefault(MappedFieldType fieldType, ParserContext context) { final Settings indexSettings = context.mapperService().getIndexSettings().getSettings(); - return new SeqNoFieldMapper(indexSettings); + return new SeqNoFieldMapper(); } } @@ -210,8 +210,8 @@ public class SeqNoFieldMapper extends MetadataFieldMapper { } - public SeqNoFieldMapper(Settings indexSettings) { - super(Defaults.FIELD_TYPE, Defaults.MAPPED_FIELD_TYPE, indexSettings); + public SeqNoFieldMapper() { + super(Defaults.FIELD_TYPE, Defaults.MAPPED_FIELD_TYPE); } @Override diff --git a/server/src/main/java/org/elasticsearch/index/mapper/SourceFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/SourceFieldMapper.java index f4b5894102b..1dbafeca256 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/SourceFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/SourceFieldMapper.java @@ -99,7 +99,7 @@ public class SourceFieldMapper extends MetadataFieldMapper { @Override public SourceFieldMapper build(BuilderContext context) { - return new SourceFieldMapper(enabled, includes, excludes, context.indexSettings()); + return new SourceFieldMapper(enabled, includes, excludes); } } @@ -140,7 +140,7 @@ public class SourceFieldMapper extends MetadataFieldMapper { @Override public MetadataFieldMapper getDefault(MappedFieldType fieldType, ParserContext context) { final Settings indexSettings = context.mapperService().getIndexSettings().getSettings(); - return new SourceFieldMapper(indexSettings); + return new SourceFieldMapper(); } } @@ -185,12 +185,12 @@ public class SourceFieldMapper extends MetadataFieldMapper { private final String[] includes; private final String[] excludes; - private SourceFieldMapper(Settings indexSettings) { - this(Defaults.ENABLED, null, null, indexSettings); + private SourceFieldMapper() { + this(Defaults.ENABLED, null, null); } - private SourceFieldMapper(boolean enabled, String[] includes, String[] excludes, Settings indexSettings) { - super(Defaults.FIELD_TYPE, SourceFieldType.INSTANCE, indexSettings); // Only stored. + private SourceFieldMapper(boolean enabled, String[] includes, String[] excludes) { + super(Defaults.FIELD_TYPE, SourceFieldType.INSTANCE); // Only stored. this.enabled = enabled; this.includes = includes; this.excludes = excludes; diff --git a/server/src/main/java/org/elasticsearch/index/mapper/TextFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/TextFieldMapper.java index 7a892450c4b..d1169f0f0a7 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/TextFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/TextFieldMapper.java @@ -60,7 +60,6 @@ import org.apache.lucene.util.automaton.Operations; import org.elasticsearch.Version; import org.elasticsearch.common.collect.Iterators; import org.elasticsearch.common.lucene.search.MultiPhrasePrefixQuery; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.support.XContentMapValues; import org.elasticsearch.index.analysis.AnalyzerScope; @@ -235,7 +234,7 @@ public class TextFieldMapper extends FieldMapper { PrefixFieldType prefixFieldType = new PrefixFieldType(fullName, fullName + "._index_prefix", minPrefixChars, maxPrefixChars, pft.indexOptions().compareTo(IndexOptions.DOCS_AND_FREQS_AND_POSITIONS) >= 0); prefixFieldType.setAnalyzer(indexAnalyzer); - return new PrefixFieldMapper(pft, prefixFieldType, context.indexSettings()); + return new PrefixFieldMapper(pft, prefixFieldType); } private PhraseFieldMapper buildPhraseMapper(BuilderContext context, TextFieldType parent) { @@ -249,7 +248,7 @@ public class TextFieldMapper extends FieldMapper { throw new IllegalArgumentException("Cannot set index_phrases on field [" + name() + "] if positions are not enabled"); } FieldType phraseFieldType = new FieldType(fieldType); - return new PhraseFieldMapper(phraseFieldType, new PhraseFieldType(parent), context.indexSettings()); + return new PhraseFieldMapper(phraseFieldType, new PhraseFieldType(parent)); } @Override @@ -266,7 +265,7 @@ public class TextFieldMapper extends FieldMapper { TextFieldType tft = buildFieldType(context); return new TextFieldMapper(name, fieldType, tft, positionIncrementGap, buildPrefixMapper(context), buildPhraseMapper(context, tft), - context.indexSettings(), multiFieldsBuilder.build(this, context), copyTo); + multiFieldsBuilder.build(this, context), copyTo); } } @@ -498,8 +497,8 @@ public class TextFieldMapper extends FieldMapper { private static final class PhraseFieldMapper extends FieldMapper { - PhraseFieldMapper(FieldType fieldType, PhraseFieldType mappedFieldType, Settings indexSettings) { - super(mappedFieldType.name(), fieldType, mappedFieldType, indexSettings, MultiFields.empty(), CopyTo.empty()); + PhraseFieldMapper(FieldType fieldType, PhraseFieldType mappedFieldType) { + super(mappedFieldType.name(), fieldType, mappedFieldType, MultiFields.empty(), CopyTo.empty()); } @Override @@ -520,8 +519,8 @@ public class TextFieldMapper extends FieldMapper { private static final class PrefixFieldMapper extends FieldMapper { - protected PrefixFieldMapper(FieldType fieldType, PrefixFieldType mappedFieldType, Settings indexSettings) { - super(mappedFieldType.name(), fieldType, mappedFieldType, indexSettings, MultiFields.empty(), CopyTo.empty()); + protected PrefixFieldMapper(FieldType fieldType, PrefixFieldType mappedFieldType) { + super(mappedFieldType.name(), fieldType, mappedFieldType, MultiFields.empty(), CopyTo.empty()); } void addField(ParseContext context, String value) { @@ -813,8 +812,8 @@ public class TextFieldMapper extends FieldMapper { protected TextFieldMapper(String simpleName, FieldType fieldType, TextFieldType mappedFieldType, int positionIncrementGap, PrefixFieldMapper prefixFieldMapper, PhraseFieldMapper phraseFieldMapper, - Settings indexSettings, MultiFields multiFields, CopyTo copyTo) { - super(simpleName, fieldType, mappedFieldType, indexSettings, multiFields, copyTo); + MultiFields multiFields, CopyTo copyTo) { + super(simpleName, fieldType, mappedFieldType, multiFields, copyTo); assert fieldType.tokenized(); assert mappedFieldType.hasDocValues() == false; if (fieldType.indexOptions() == IndexOptions.NONE && fieldType().fielddata()) { diff --git a/server/src/main/java/org/elasticsearch/index/mapper/TypeFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/TypeFieldMapper.java index f871312c0a4..2d6db2b249f 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/TypeFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/TypeFieldMapper.java @@ -92,7 +92,7 @@ public class TypeFieldMapper extends MetadataFieldMapper { @Override public MetadataFieldMapper getDefault(MappedFieldType fieldType, ParserContext context) { final IndexSettings indexSettings = context.mapperService().getIndexSettings(); - return new TypeFieldMapper(Defaults.FIELD_TYPE, indexSettings); + return new TypeFieldMapper(Defaults.FIELD_TYPE); } } @@ -284,8 +284,8 @@ public class TypeFieldMapper extends MetadataFieldMapper { } } - private TypeFieldMapper(FieldType fieldType, IndexSettings indexSettings) { - super(fieldType, new TypeFieldType(), indexSettings.getSettings()); + private TypeFieldMapper(FieldType fieldType) { + super(fieldType, new TypeFieldType()); } @Override diff --git a/server/src/main/java/org/elasticsearch/index/mapper/VersionFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/VersionFieldMapper.java index f2803db646d..d796217c5b9 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/VersionFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/VersionFieldMapper.java @@ -26,7 +26,6 @@ import org.apache.lucene.index.DocValuesType; import org.apache.lucene.index.IndexOptions; import org.apache.lucene.search.DocValuesFieldExistsQuery; import org.apache.lucene.search.Query; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.index.mapper.ParseContext.Document; import org.elasticsearch.index.query.QueryShardContext; @@ -64,8 +63,7 @@ public class VersionFieldMapper extends MetadataFieldMapper { @Override public MetadataFieldMapper getDefault(MappedFieldType fieldType, ParserContext context) { - final Settings indexSettings = context.mapperService().getIndexSettings().getSettings(); - return new VersionFieldMapper(indexSettings); + return new VersionFieldMapper(); } } @@ -102,8 +100,8 @@ public class VersionFieldMapper extends MetadataFieldMapper { } } - private VersionFieldMapper(Settings indexSettings) { - super(Defaults.FIELD_TYPE, Defaults.MAPPED_FIELD_TYPE, indexSettings); + private VersionFieldMapper() { + super(Defaults.FIELD_TYPE, Defaults.MAPPED_FIELD_TYPE); } @Override diff --git a/server/src/test/java/org/elasticsearch/index/mapper/DocumentFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/DocumentFieldMapperTests.java index 0712e973257..4940e1b6579 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/DocumentFieldMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/DocumentFieldMapperTests.java @@ -29,9 +29,6 @@ import org.apache.lucene.search.DocValuesFieldExistsQuery; import org.apache.lucene.search.Query; import org.apache.lucene.search.TermQuery; import org.apache.lucene.util.LuceneTestCase; -import org.elasticsearch.Version; -import org.elasticsearch.cluster.metadata.IndexMetadata; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.analysis.AnalyzerScope; import org.elasticsearch.index.analysis.NamedAnalyzer; import org.elasticsearch.index.query.QueryShardContext; @@ -106,10 +103,8 @@ public class DocumentFieldMapperTests extends LuceneTestCase { static class FakeFieldMapper extends FieldMapper { - private static final Settings SETTINGS = Settings.builder().put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT).build(); - FakeFieldMapper(FakeFieldType fieldType) { - super(fieldType.name(), new FieldType(), fieldType, SETTINGS, MultiFields.empty(), CopyTo.empty()); + super(fieldType.name(), new FieldType(), fieldType, MultiFields.empty(), CopyTo.empty()); } @Override diff --git a/server/src/test/java/org/elasticsearch/index/mapper/ExternalMapper.java b/server/src/test/java/org/elasticsearch/index/mapper/ExternalMapper.java index e216a2db76b..6357a55c4a8 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/ExternalMapper.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/ExternalMapper.java @@ -28,7 +28,6 @@ import org.elasticsearch.Version; import org.elasticsearch.common.collect.Iterators; import org.elasticsearch.common.geo.GeoPoint; import org.elasticsearch.common.geo.builders.PointBuilder; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.geometry.Point; import org.elasticsearch.index.query.QueryShardContext; @@ -97,7 +96,7 @@ public class ExternalMapper extends FieldMapper { context.path().remove(); return new ExternalMapper(name, buildFullName(context), fieldType, generatedValue, mapperName, binMapper, boolMapper, - pointMapper, shapeMapper, stringMapper, context.indexSettings(), multiFieldsBuilder.build(this, context), copyTo, true); + pointMapper, shapeMapper, stringMapper, multiFieldsBuilder.build(this, context), copyTo, true); } @Override @@ -167,9 +166,9 @@ public class ExternalMapper extends FieldMapper { public ExternalMapper(String simpleName, String contextName, FieldType fieldType, String generatedValue, String mapperName, BinaryFieldMapper binMapper, BooleanFieldMapper boolMapper, GeoPointFieldMapper pointMapper, - AbstractShapeGeometryFieldMapper shapeMapper, FieldMapper stringMapper, Settings indexSettings, + AbstractShapeGeometryFieldMapper shapeMapper, FieldMapper stringMapper, MultiFields multiFields, CopyTo copyTo, boolean indexed) { - super(simpleName, fieldType, new ExternalFieldType(contextName, indexed, false), indexSettings, multiFields, copyTo); + super(simpleName, fieldType, new ExternalFieldType(contextName, indexed, false), multiFields, copyTo); this.generatedValue = generatedValue; this.mapperName = mapperName; this.binMapper = binMapper; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/ExternalMetadataMapper.java b/server/src/test/java/org/elasticsearch/index/mapper/ExternalMetadataMapper.java index f0855c29ea4..7e374a4087d 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/ExternalMetadataMapper.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/ExternalMetadataMapper.java @@ -22,7 +22,6 @@ package org.elasticsearch.index.mapper; import org.apache.lucene.document.Field.Store; import org.apache.lucene.document.FieldType; import org.apache.lucene.document.StringField; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentBuilder; import java.io.IOException; @@ -36,8 +35,8 @@ public class ExternalMetadataMapper extends MetadataFieldMapper { static final String FIELD_NAME = "_is_external"; static final String FIELD_VALUE = "true"; - protected ExternalMetadataMapper(Settings indexSettings) { - super(new FieldType(), new BooleanFieldMapper.BooleanFieldType(FIELD_NAME), indexSettings); + protected ExternalMetadataMapper() { + super(new FieldType(), new BooleanFieldMapper.BooleanFieldType(FIELD_NAME)); } @Override @@ -77,7 +76,7 @@ public class ExternalMetadataMapper extends MetadataFieldMapper { @Override public ExternalMetadataMapper build(BuilderContext context) { - return new ExternalMetadataMapper(context.indexSettings()); + return new ExternalMetadataMapper(); } } @@ -92,8 +91,7 @@ public class ExternalMetadataMapper extends MetadataFieldMapper { @Override public MetadataFieldMapper getDefault(MappedFieldType fieldType, ParserContext context) { - final Settings indexSettings = context.mapperService().getIndexSettings().getSettings(); - return new ExternalMetadataMapper(indexSettings); + return new ExternalMetadataMapper(); } } diff --git a/server/src/test/java/org/elasticsearch/index/mapper/FakeStringFieldMapper.java b/server/src/test/java/org/elasticsearch/index/mapper/FakeStringFieldMapper.java index d1d24e64b5e..7a644eeb197 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/FakeStringFieldMapper.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/FakeStringFieldMapper.java @@ -29,7 +29,6 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.TermQuery; import org.apache.lucene.util.BytesRef; import org.elasticsearch.common.lucene.Lucene; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.index.query.QueryShardContext; @@ -66,7 +65,7 @@ public class FakeStringFieldMapper extends FieldMapper { public FakeStringFieldMapper build(BuilderContext context) { return new FakeStringFieldMapper( fieldType, new FakeStringFieldType(name), - context.indexSettings(), multiFieldsBuilder.build(this, context), copyTo); + multiFieldsBuilder.build(this, context), copyTo); } } @@ -116,8 +115,8 @@ public class FakeStringFieldMapper extends FieldMapper { } protected FakeStringFieldMapper(FieldType fieldType, MappedFieldType mappedFieldType, - Settings indexSettings, MultiFields multiFields, CopyTo copyTo) { - super(mappedFieldType.name(), fieldType, mappedFieldType, indexSettings, multiFields, copyTo); + MultiFields multiFields, CopyTo copyTo) { + super(mappedFieldType.name(), fieldType, mappedFieldType, multiFields, copyTo); } @Override diff --git a/server/src/test/java/org/elasticsearch/index/mapper/ObjectMapperMergeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/ObjectMapperMergeTests.java index b03e12d029a..0967bcff81f 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/ObjectMapperMergeTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/ObjectMapperMergeTests.java @@ -127,9 +127,7 @@ public class ObjectMapperMergeTests extends ESTestCase { private static TextFieldMapper createTextFieldMapper(String name) { final TextFieldType fieldType = new TextFieldType(name); - final Settings indexSettings = Settings.builder().put(SETTING_VERSION_CREATED, Version.CURRENT).build(); - return new TextFieldMapper(name, TextFieldMapper.Defaults.FIELD_TYPE, fieldType, -1, - null, null, indexSettings, MultiFields.empty(), CopyTo.empty()); + null, null, MultiFields.empty(), CopyTo.empty()); } } diff --git a/test/framework/src/main/java/org/elasticsearch/index/mapper/MockFieldMapper.java b/test/framework/src/main/java/org/elasticsearch/index/mapper/MockFieldMapper.java index f1186427d96..ee05fb9e504 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/mapper/MockFieldMapper.java +++ b/test/framework/src/main/java/org/elasticsearch/index/mapper/MockFieldMapper.java @@ -24,9 +24,6 @@ import org.apache.lucene.index.Term; import org.apache.lucene.search.DocValuesFieldExistsQuery; import org.apache.lucene.search.Query; import org.apache.lucene.search.TermQuery; -import org.elasticsearch.Version; -import org.elasticsearch.cluster.metadata.IndexMetadata; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.query.QueryShardContext; import java.io.IOException; @@ -35,14 +32,13 @@ import java.util.List; // this sucks how much must be overridden just do get a dummy field mapper... public class MockFieldMapper extends FieldMapper { - static Settings dummySettings = Settings.builder().put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT.id).build(); public MockFieldMapper(String fullName) { this(new FakeFieldType(fullName)); } public MockFieldMapper(MappedFieldType fieldType) { - super(findSimpleName(fieldType.name()), new FieldType(), fieldType, dummySettings, + super(findSimpleName(fieldType.name()), new FieldType(), fieldType, MultiFields.empty(), new CopyTo.Builder().build()); } diff --git a/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/mapper/HistogramFieldMapper.java b/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/mapper/HistogramFieldMapper.java index de6f7062492..97401919544 100644 --- a/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/mapper/HistogramFieldMapper.java +++ b/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/mapper/HistogramFieldMapper.java @@ -23,7 +23,6 @@ import org.apache.lucene.store.ByteBuffersDataOutput; import org.apache.lucene.util.BytesRef; import org.elasticsearch.common.Explicit; import org.elasticsearch.common.ParseField; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.util.BigArrays; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; @@ -112,7 +111,7 @@ public class HistogramFieldMapper extends FieldMapper { @Override public HistogramFieldMapper build(BuilderContext context) { return new HistogramFieldMapper(name, fieldType, new HistogramFieldType(buildFullName(context), hasDocValues, meta), - context.indexSettings(), multiFieldsBuilder.build(this, context), ignoreMalformed(context), copyTo); + multiFieldsBuilder.build(this, context), ignoreMalformed(context), copyTo); } } @@ -138,8 +137,8 @@ public class HistogramFieldMapper extends FieldMapper { protected Explicit ignoreMalformed; public HistogramFieldMapper(String simpleName, FieldType fieldType, MappedFieldType mappedFieldType, - Settings indexSettings, MultiFields multiFields, Explicit ignoreMalformed, CopyTo copyTo) { - super(simpleName, fieldType, mappedFieldType, indexSettings, multiFields, copyTo); + MultiFields multiFields, Explicit ignoreMalformed, CopyTo copyTo) { + super(simpleName, fieldType, mappedFieldType, multiFields, copyTo); this.ignoreMalformed = ignoreMalformed; } diff --git a/x-pack/plugin/mapper-constant-keyword/src/main/java/org/elasticsearch/xpack/constantkeyword/mapper/ConstantKeywordFieldMapper.java b/x-pack/plugin/mapper-constant-keyword/src/main/java/org/elasticsearch/xpack/constantkeyword/mapper/ConstantKeywordFieldMapper.java index d854d8405c4..b98559e7b53 100644 --- a/x-pack/plugin/mapper-constant-keyword/src/main/java/org/elasticsearch/xpack/constantkeyword/mapper/ConstantKeywordFieldMapper.java +++ b/x-pack/plugin/mapper-constant-keyword/src/main/java/org/elasticsearch/xpack/constantkeyword/mapper/ConstantKeywordFieldMapper.java @@ -22,7 +22,6 @@ import org.apache.lucene.util.automaton.RegExp; import org.elasticsearch.common.geo.ShapeRelation; import org.elasticsearch.common.lucene.BytesRefs; import org.elasticsearch.common.regex.Regex; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.time.DateMathParser; import org.elasticsearch.common.unit.Fuzziness; import org.elasticsearch.common.xcontent.XContentBuilder; @@ -78,8 +77,7 @@ public class ConstantKeywordFieldMapper extends FieldMapper { @Override public ConstantKeywordFieldMapper build(BuilderContext context) { return new ConstantKeywordFieldMapper( - name, fieldType, new ConstantKeywordFieldType(buildFullName(context), value, meta), - context.indexSettings()); + name, fieldType, new ConstantKeywordFieldType(buildFullName(context), value, meta)); } } @@ -238,9 +236,8 @@ public class ConstantKeywordFieldMapper extends FieldMapper { } - ConstantKeywordFieldMapper(String simpleName, FieldType fieldType, MappedFieldType mappedFieldType, - Settings indexSettings) { - super(simpleName, fieldType, mappedFieldType, indexSettings, MultiFields.empty(), CopyTo.empty()); + ConstantKeywordFieldMapper(String simpleName, FieldType fieldType, MappedFieldType mappedFieldType) { + super(simpleName, fieldType, mappedFieldType, MultiFields.empty(), CopyTo.empty()); } @Override @@ -269,8 +266,7 @@ public class ConstantKeywordFieldMapper extends FieldMapper { if (fieldType().value == null) { ConstantKeywordFieldType newFieldType = new ConstantKeywordFieldType(fieldType().name(), value, fieldType().meta()); - Mapper update = new ConstantKeywordFieldMapper( - simpleName(), fieldType, newFieldType, context.indexSettings().getSettings()); + Mapper update = new ConstantKeywordFieldMapper(simpleName(), fieldType, newFieldType); context.addDynamicMapper(update); } else if (Objects.equals(fieldType().value, value) == false) { throw new IllegalArgumentException("[constant_keyword] field [" + name() + diff --git a/x-pack/plugin/mapper-flattened/src/main/java/org/elasticsearch/xpack/flattened/mapper/FlatObjectFieldMapper.java b/x-pack/plugin/mapper-flattened/src/main/java/org/elasticsearch/xpack/flattened/mapper/FlatObjectFieldMapper.java index 21425cdc39b..ff702414b39 100644 --- a/x-pack/plugin/mapper-flattened/src/main/java/org/elasticsearch/xpack/flattened/mapper/FlatObjectFieldMapper.java +++ b/x-pack/plugin/mapper-flattened/src/main/java/org/elasticsearch/xpack/flattened/mapper/FlatObjectFieldMapper.java @@ -21,7 +21,6 @@ import org.apache.lucene.search.SortField; import org.apache.lucene.search.TermQuery; import org.apache.lucene.util.BytesRef; import org.elasticsearch.common.lucene.Lucene; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.Fuzziness; import org.elasticsearch.common.util.BigArrays; import org.elasticsearch.common.xcontent.XContentBuilder; @@ -184,7 +183,7 @@ public final class FlatObjectFieldMapper extends DynamicKeyFieldMapper { if (eagerGlobalOrdinals) { ft.setEagerGlobalOrdinals(true); } - return new FlatObjectFieldMapper(name, fieldType, ft, ignoreAbove, depthLimit, nullValue, context.indexSettings()); + return new FlatObjectFieldMapper(name, fieldType, ft, ignoreAbove, depthLimit, nullValue); } } @@ -565,9 +564,8 @@ public final class FlatObjectFieldMapper extends DynamicKeyFieldMapper { MappedFieldType mappedFieldType, int ignoreAbove, int depthLimit, - String nullValue, - Settings indexSettings) { - super(simpleName, fieldType, mappedFieldType, indexSettings, CopyTo.empty()); + String nullValue) { + super(simpleName, fieldType, mappedFieldType, CopyTo.empty()); assert fieldType.indexOptions().compareTo(IndexOptions.DOCS_AND_FREQS) <= 0; this.depthLimit = depthLimit; diff --git a/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/GeoShapeWithDocValuesFieldMapper.java b/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/GeoShapeWithDocValuesFieldMapper.java index 69c370b7b96..4f604ff943a 100644 --- a/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/GeoShapeWithDocValuesFieldMapper.java +++ b/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/GeoShapeWithDocValuesFieldMapper.java @@ -15,7 +15,6 @@ import org.elasticsearch.Version; import org.elasticsearch.common.Explicit; import org.elasticsearch.common.geo.GeometryParser; import org.elasticsearch.common.geo.builders.ShapeBuilder; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.support.XContentMapValues; import org.elasticsearch.geometry.Geometry; import org.elasticsearch.index.fielddata.IndexFieldData; @@ -91,7 +90,7 @@ public class GeoShapeWithDocValuesFieldMapper extends GeoShapeFieldMapper { ft.setGeometryQueryBuilder(new VectorGeoShapeQueryProcessor()); ft.setOrientation(orientation().value()); return new GeoShapeWithDocValuesFieldMapper(name, fieldType, ft, ignoreMalformed(context), coerce(context), - ignoreZValue(), orientation(), context.indexSettings(), Version.V_7_8_0.onOrBefore(context.indexCreatedVersion()), + ignoreZValue(), orientation(), Version.V_7_8_0.onOrBefore(context.indexCreatedVersion()), multiFieldsBuilder.build(this, context), copyTo); } @@ -181,10 +180,8 @@ public class GeoShapeWithDocValuesFieldMapper extends GeoShapeFieldMapper { public GeoShapeWithDocValuesFieldMapper(String simpleName, FieldType fieldType, MappedFieldType mappedFieldType, Explicit ignoreMalformed, Explicit coerce, Explicit ignoreZValue, Explicit orientation, - Settings indexSettings, boolean defaultDocValues, - MultiFields multiFields, CopyTo copyTo) { - super(simpleName, fieldType, mappedFieldType, ignoreMalformed, coerce, ignoreZValue, orientation, indexSettings, - multiFields, copyTo); + boolean defaultDocValues, MultiFields multiFields, CopyTo copyTo) { + super(simpleName, fieldType, mappedFieldType, ignoreMalformed, coerce, ignoreZValue, orientation, multiFields, copyTo); this.defaultDocValues = defaultDocValues; } diff --git a/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/PointFieldMapper.java b/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/PointFieldMapper.java index 6440147615b..0a3e5ed0ec3 100644 --- a/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/PointFieldMapper.java +++ b/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/PointFieldMapper.java @@ -11,7 +11,6 @@ import org.apache.lucene.document.XYDocValuesField; import org.apache.lucene.document.XYPointField; import org.apache.lucene.index.IndexableField; import org.elasticsearch.common.Explicit; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.index.mapper.AbstractPointGeometryFieldMapper; import org.elasticsearch.index.mapper.MappedFieldType; @@ -41,14 +40,13 @@ public class PointFieldMapper extends AbstractPointGeometryFieldMapper ignoreMalformed, Explicit ignoreZValue, ParsedPoint nullValue, CopyTo copyTo) { PointFieldType ft = new PointFieldType(buildFullName(context), indexed, hasDocValues, meta); ft.setGeometryParser(new PointParser<>()); ft.setGeometryIndexer(new PointIndexer(ft)); ft.setGeometryQueryBuilder(new ShapeQueryPointProcessor()); - return new PointFieldMapper(simpleName, fieldType, ft, indexSettings, multiFields, + return new PointFieldMapper(simpleName, fieldType, ft, multiFields, ignoreMalformed, ignoreZValue(context), nullValue, copyTo); } @@ -91,9 +89,9 @@ public class PointFieldMapper extends AbstractPointGeometryFieldMapper ignoreMalformed, + MultiFields multiFields, Explicit ignoreMalformed, Explicit ignoreZValue, ParsedPoint nullValue, CopyTo copyTo) { - super(simpleName, fieldType, mappedFieldType, indexSettings, multiFields, ignoreMalformed, ignoreZValue, nullValue, copyTo); + super(simpleName, fieldType, mappedFieldType, multiFields, ignoreMalformed, ignoreZValue, nullValue, copyTo); } @Override diff --git a/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/ShapeFieldMapper.java b/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/ShapeFieldMapper.java index 656acf42898..cdddabc8e89 100644 --- a/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/ShapeFieldMapper.java +++ b/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/ShapeFieldMapper.java @@ -10,7 +10,6 @@ import org.apache.lucene.document.XYShape; import org.elasticsearch.common.Explicit; import org.elasticsearch.common.geo.GeometryParser; import org.elasticsearch.common.geo.builders.ShapeBuilder.Orientation; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.geometry.Geometry; import org.elasticsearch.index.mapper.AbstractShapeGeometryFieldMapper; import org.elasticsearch.index.mapper.MappedFieldType; @@ -59,7 +58,7 @@ public class ShapeFieldMapper extends AbstractShapeGeometryFieldMapper ignoreMalformed, Explicit coerce, Explicit ignoreZValue, Explicit orientation, - Settings indexSettings, MultiFields multiFields, CopyTo copyTo) { - super(simpleName, fieldType, mappedFieldType, ignoreMalformed, coerce, ignoreZValue, orientation, indexSettings, + MultiFields multiFields, CopyTo copyTo) { + super(simpleName, fieldType, mappedFieldType, ignoreMalformed, coerce, ignoreZValue, orientation, multiFields, copyTo); } diff --git a/x-pack/plugin/vectors/src/main/java/org/elasticsearch/xpack/vectors/mapper/DenseVectorFieldMapper.java b/x-pack/plugin/vectors/src/main/java/org/elasticsearch/xpack/vectors/mapper/DenseVectorFieldMapper.java index ec1a2621dc7..01faf432e7c 100644 --- a/x-pack/plugin/vectors/src/main/java/org/elasticsearch/xpack/vectors/mapper/DenseVectorFieldMapper.java +++ b/x-pack/plugin/vectors/src/main/java/org/elasticsearch/xpack/vectors/mapper/DenseVectorFieldMapper.java @@ -144,10 +144,13 @@ public class DenseVectorFieldMapper extends FieldMapper { } } + private final Version indexCreatedVersion; + private DenseVectorFieldMapper(String simpleName, FieldType fieldType, MappedFieldType mappedFieldType, Settings indexSettings, MultiFields multiFields, CopyTo copyTo) { - super(simpleName, fieldType, mappedFieldType, indexSettings, multiFields, copyTo); + super(simpleName, fieldType, mappedFieldType, multiFields, copyTo); assert fieldType.indexOptions() == IndexOptions.NONE; + this.indexCreatedVersion = Version.indexCreated(indexSettings); } @Override diff --git a/x-pack/plugin/vectors/src/main/java/org/elasticsearch/xpack/vectors/mapper/SparseVectorFieldMapper.java b/x-pack/plugin/vectors/src/main/java/org/elasticsearch/xpack/vectors/mapper/SparseVectorFieldMapper.java index 71ff56b1006..8062d039b04 100644 --- a/x-pack/plugin/vectors/src/main/java/org/elasticsearch/xpack/vectors/mapper/SparseVectorFieldMapper.java +++ b/x-pack/plugin/vectors/src/main/java/org/elasticsearch/xpack/vectors/mapper/SparseVectorFieldMapper.java @@ -15,8 +15,8 @@ import org.apache.lucene.search.DocValuesFieldExistsQuery; import org.apache.lucene.search.Query; import org.apache.lucene.util.ArrayUtil; import org.apache.lucene.util.BytesRef; +import org.elasticsearch.Version; import org.elasticsearch.common.logging.DeprecationLogger; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentParser.Token; import org.elasticsearch.index.fielddata.IndexFieldData; import org.elasticsearch.index.mapper.FieldMapper; @@ -70,7 +70,7 @@ public class SparseVectorFieldMapper extends FieldMapper { public SparseVectorFieldMapper build(BuilderContext context) { return new SparseVectorFieldMapper( name, fieldType, new SparseVectorFieldType(buildFullName(context), meta), - context.indexSettings(), multiFieldsBuilder.build(this, context), copyTo); + context.indexCreatedVersion(), multiFieldsBuilder.build(this, context), copyTo); } } @@ -125,11 +125,13 @@ public class SparseVectorFieldMapper extends FieldMapper { } } + private final Version indexCreatedVersion; private SparseVectorFieldMapper(String simpleName, FieldType fieldType, MappedFieldType mappedFieldType, - Settings indexSettings, MultiFields multiFields, CopyTo copyTo) { - super(simpleName, fieldType, mappedFieldType, indexSettings, multiFields, copyTo); + Version indexCreatedVersion, MultiFields multiFields, CopyTo copyTo) { + super(simpleName, fieldType, mappedFieldType, multiFields, copyTo); assert fieldType.indexOptions() == IndexOptions.NONE; + this.indexCreatedVersion = indexCreatedVersion; } @Override diff --git a/x-pack/plugin/wildcard/src/main/java/org/elasticsearch/xpack/wildcard/mapper/WildcardFieldMapper.java b/x-pack/plugin/wildcard/src/main/java/org/elasticsearch/xpack/wildcard/mapper/WildcardFieldMapper.java index abefce63342..bdce3c02a50 100644 --- a/x-pack/plugin/wildcard/src/main/java/org/elasticsearch/xpack/wildcard/mapper/WildcardFieldMapper.java +++ b/x-pack/plugin/wildcard/src/main/java/org/elasticsearch/xpack/wildcard/mapper/WildcardFieldMapper.java @@ -41,7 +41,6 @@ import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.geo.ShapeRelation; import org.elasticsearch.common.lucene.BytesRefs; import org.elasticsearch.common.lucene.Lucene; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.time.DateMathParser; import org.elasticsearch.common.unit.Fuzziness; import org.elasticsearch.common.xcontent.XContentBuilder; @@ -177,7 +176,7 @@ public class WildcardFieldMapper extends FieldMapper { public WildcardFieldMapper build(BuilderContext context) { return new WildcardFieldMapper( name, fieldType, new WildcardFieldType(buildFullName(context), meta), ignoreAbove, - context.indexSettings(), multiFieldsBuilder.build(this, context), copyTo, nullValue); + multiFieldsBuilder.build(this, context), copyTo, nullValue); } } @@ -604,7 +603,7 @@ public class WildcardFieldMapper extends FieldMapper { static boolean isMatchAll(Query q) { return q instanceof MatchAllDocsQuery || q instanceof MatchAllButRequireVerificationQuery; } - + protected String firstNgramToken(String fragment) { LinkedHashSet tokens = new LinkedHashSet<>(); getNgramTokens(tokens, fragment); @@ -695,7 +694,7 @@ public class WildcardFieldMapper extends FieldMapper { Query accelerationQuery = null; if (lowerTerm != null && upperTerm != null) { // Long common prefixes e.g. "C:/Program Files/a,txt" to "C:/Program Files/z,txt" - // can be accelerated by searching for all the common leading ngrams e.g. c:/, /pr, rog, gra etc + // can be accelerated by searching for all the common leading ngrams e.g. c:/, /pr, rog, gra etc StringBuilder commonPrefix = new StringBuilder(); String lowerS = addLineEndChars(toLowerCase(lower.utf8ToString())); String upperS = addLineEndChars(toLowerCase(upper.utf8ToString())); @@ -733,26 +732,26 @@ public class WildcardFieldMapper extends FieldMapper { BooleanQuery bq = bqBuilder.build(); if (bq.clauses().size() > 0) { accelerationQuery = bq; - } - } + } + } } if (accelerationQuery == null) { // Fallback - if there is no common prefix sequence then we look for the range of ngrams that appear at the start // of the string e.g. given 100 to 999 we would search for ngrams in the range - // TOKEN_START_OR_END_CHAR + "10" to + // TOKEN_START_OR_END_CHAR + "10" to // TOKEN_START_OR_END_CHAR + "99" BytesRef lowerNgram = lower == null ? null : new BytesRef(firstNgramToken( addLineEndChars(toLowerCase(lower.utf8ToString())))); BytesRef upperNgram = upper == null ? null : new BytesRef(firstNgramToken( addLineEndChars(toLowerCase(upper.utf8ToString())))); - accelerationQuery = new TermRangeQuery(name(), lowerNgram, upperNgram, true, true); + accelerationQuery = new TermRangeQuery(name(), lowerNgram, upperNgram, true, true); } - + Supplier deferredAutomatonSupplier = ()->{ return TermRangeQuery.toAutomaton(lower, upper, includeLower, includeUpper); }; AutomatonQueryOnBinaryDv slowQuery = new AutomatonQueryOnBinaryDv(name(), lower + "-" + upper, deferredAutomatonSupplier); - + BooleanQuery.Builder qBuilder = new BooleanQuery.Builder(); qBuilder.add(accelerationQuery, Occur.MUST); qBuilder.add(slowQuery, Occur.MUST); @@ -898,9 +897,9 @@ public class WildcardFieldMapper extends FieldMapper { private final FieldType ngramFieldType; private WildcardFieldMapper(String simpleName, FieldType fieldType, MappedFieldType mappedFieldType, - int ignoreAbove, Settings indexSettings, MultiFields multiFields, CopyTo copyTo, + int ignoreAbove, MultiFields multiFields, CopyTo copyTo, String nullValue) { - super(simpleName, fieldType, mappedFieldType, indexSettings, multiFields, copyTo); + super(simpleName, fieldType, mappedFieldType, multiFields, copyTo); this.nullValue = nullValue; this.ignoreAbove = ignoreAbove; this.ngramFieldType = new FieldType(fieldType);