mirrors
/
elasticsearch
mirror of https://mirror.osredm.com/root/elasticsearch.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove redundant fields on TextFieldMapper and KeywordFieldMapper (#99666) 

These fields were also on the mapped field types, no need to waste bytes
on them.
This commit is contained in:
Armin Braun 2023-09-19 16:43:42 +02:00 committed by GitHub
parent 7fc1f3a8c9
commit 6fc05a6bb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/mapper-annotated-text/src/main/java/org/elasticsearch/index/mapper/annotatedtext/AnnotatedTextFieldMapper.java
View File

@ -480,7 +480,7 @@ public class AnnotatedTextFieldMapper extends FieldMapper {
boolean isSyntheticSource,
Map<String, String> meta
) {
super(name, true, store, tsi, isSyntheticSource, null, meta);
super(name, true, store, tsi, isSyntheticSource, null, meta, false, false);
}
public AnnotatedTextFieldType(String name, Map<String, String> meta) {

6
server/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java
View File

@ -161,7 +161,9 @@ public final class KeywordFieldMapper extends FieldMapper {
private final Parameter<String> indexOptions = TextParams.keywordIndexOptions(m -> toType(m).indexOptions);
private final Parameter<Boolean> hasNorms = TextParams.norms(false, m -> toType(m).fieldType.omitNorms() == false);
private final Parameter<SimilarityProvider> similarity = TextParams.similarity(m -> toType(m).similarity);
private final Parameter<SimilarityProvider> similarity = TextParams.similarity(
m -> toType(m).fieldType().getTextSearchInfo().similarity()
);
private final Parameter<String> normalizer;
@ -808,7 +810,6 @@ public final class KeywordFieldMapper extends FieldMapper {
private final boolean hasDocValues;
private final String indexOptions;
private final FieldType fieldType;
private final SimilarityProvider similarity;
private final String normalizerName;
private final boolean splitQueriesOnWhitespace;
private final Script script;
@ -833,7 +834,6 @@ public final class KeywordFieldMapper extends FieldMapper {
this.hasDocValues = builder.hasDocValues.getValue();
this.indexOptions = builder.indexOptions.getValue();
this.fieldType = freezeAndDeduplicateFieldType(fieldType);
this.similarity = builder.similarity.getValue();
this.normalizerName = builder.normalizer.getValue();
this.splitQueriesOnWhitespace = builder.splitQueriesOnWhitespace.getValue();
this.script = builder.script.get();

2
server/src/main/java/org/elasticsearch/index/mapper/MapperService.java
View File

@ -128,7 +128,6 @@ public class MapperService extends AbstractIndexComponent implements Closeable {
private final IndexVersion indexVersionCreated;
private final MapperRegistry mapperRegistry;
private final Supplier<MappingParserContext> mappingParserContextSupplier;
private final Supplier<DocumentParsingObserver> documentParsingObserverSupplier;
private volatile DocumentMapper mapper;
@ -186,7 +185,6 @@ public class MapperService extends AbstractIndexComponent implements Closeable {
indexSettings,
idFieldMapper
);
this.documentParsingObserverSupplier = documentParsingObserverSupplier;
this.documentParser = new DocumentParser(
parserConfiguration,
this.mappingParserContextSupplier.get(),

41
server/src/main/java/org/elasticsearch/index/mapper/TextFieldMapper.java
View File

@ -258,11 +258,16 @@ public class TextFieldMapper extends FieldMapper {
final Parameter<Boolean> eagerGlobalOrdinals = Parameter.boolParam(
"eager_global_ordinals",
true,
m -> ((TextFieldMapper) m).eagerGlobalOrdinals,
m -> ((TextFieldMapper) m).fieldType().eagerGlobalOrdinals,
false
);
final Parameter<Boolean> indexPhrases = Parameter.boolParam("index_phrases", false, m -> ((TextFieldMapper) m).indexPhrases, false);
final Parameter<Boolean> indexPhrases = Parameter.boolParam(
"index_phrases",
false,
m -> ((TextFieldMapper) m).fieldType().indexPhrases,
false
);
final Parameter<PrefixConfig> indexPrefixes = new Parameter<>(
"index_prefixes",
false,
@ -366,9 +371,10 @@ public class TextFieldMapper extends FieldMapper {
tsi,
context.isSourceSynthetic(),
syntheticSourceDelegate(fieldType, multiFields),
meta.getValue()
meta.getValue(),
eagerGlobalOrdinals.getValue(),
indexPhrases.getValue()
);
ft.eagerGlobalOrdinals = eagerGlobalOrdinals.getValue();
if (fieldData.getValue()) {
ft.setFielddata(true, freqFilter.getValue());
}
@ -443,7 +449,6 @@ 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);
parent.setIndexPhrases();
PhraseWrappedAnalyzer a = new PhraseWrappedAnalyzer(
analyzers.getIndexAnalyzer().analyzer(),
analyzers.positionIncrementGap.get()
@ -648,8 +653,8 @@ public class TextFieldMapper extends FieldMapper {
private boolean fielddata;
private FielddataFrequencyFilter filter;
private PrefixFieldType prefixFieldType;
private boolean indexPhrases = false;
private boolean eagerGlobalOrdinals = false;
private final boolean indexPhrases;
private final boolean eagerGlobalOrdinals;
private final boolean isSyntheticSource;
/**
* In some configurations text fields use a sub-keyword field to provide
@ -665,12 +670,16 @@ public class TextFieldMapper extends FieldMapper {
TextSearchInfo tsi,
boolean isSyntheticSource,
KeywordFieldMapper.KeywordFieldType syntheticSourceDelegate,
Map<String, String> meta
Map<String, String> meta,
boolean eagerGlobalOrdinals,
boolean indexPhrases
) {
super(name, indexed, stored, false, tsi, meta);
fielddata = false;
this.isSyntheticSource = isSyntheticSource;
this.syntheticSourceDelegate = syntheticSourceDelegate;
this.eagerGlobalOrdinals = eagerGlobalOrdinals;
this.indexPhrases = indexPhrases;
}
public TextFieldType(String name, boolean indexed, boolean stored, Map<String, String> meta) {
@ -685,6 +694,8 @@ public class TextFieldMapper extends FieldMapper {
fielddata = false;
isSyntheticSource = false;
syntheticSourceDelegate = null;
eagerGlobalOrdinals = false;
indexPhrases = false;
}
public TextFieldType(String name, boolean isSyntheticSource) {
@ -695,7 +706,9 @@ public class TextFieldMapper extends FieldMapper {
new TextSearchInfo(Defaults.FIELD_TYPE, null, Lucene.STANDARD_ANALYZER, Lucene.STANDARD_ANALYZER),
isSyntheticSource,
null,
Collections.emptyMap()
Collections.emptyMap(),
false,
false
);
}
@ -733,10 +746,6 @@ public class TextFieldMapper extends FieldMapper {
this.prefixFieldType = new PrefixFieldType(this, minChars, maxChars);
}
void setIndexPhrases() {
this.indexPhrases = true;
}
public PrefixFieldType getPrefixFieldType() {
return this.prefixFieldType;
}
@ -1005,7 +1014,7 @@ public class TextFieldMapper extends FieldMapper {
public static class ConstantScoreTextFieldType extends TextFieldType {
public ConstantScoreTextFieldType(String name, boolean indexed, boolean stored, TextSearchInfo tsi, Map<String, String> meta) {
super(name, indexed, stored, tsi, false, null, meta);
super(name, indexed, stored, tsi, false, null, meta, false, false);
}
public ConstantScoreTextFieldType(String name) {
@ -1114,11 +1123,9 @@ public class TextFieldMapper extends FieldMapper {
private final NamedAnalyzer indexAnalyzer;
private final IndexAnalyzers indexAnalyzers;
private final int positionIncrementGap;
private final boolean eagerGlobalOrdinals;
private final PrefixConfig indexPrefixes;
private final FielddataFrequencyFilter freqFilter;
private final boolean fieldData;
private final boolean indexPhrases;
private final FieldType fieldType;
private final SubFieldInfo prefixFieldInfo;
private final SubFieldInfo phraseFieldInfo;
@ -1152,11 +1159,9 @@ public class TextFieldMapper extends FieldMapper {
this.indexOptions = builder.indexOptions.getValue();
this.norms = builder.norms.getValue();
this.termVectors = builder.termVectors.getValue();
this.eagerGlobalOrdinals = builder.eagerGlobalOrdinals.getValue();
this.indexPrefixes = builder.indexPrefixes.getValue();
this.freqFilter = builder.freqFilter.getValue();
this.fieldData = builder.fieldData.get();
this.indexPhrases = builder.indexPhrases.getValue();
}
@Override