Skip to content

Commit 555d98f

Browse files
committed
hard code PatternedTextFieldMapper to use standard analyzer
1 parent 3eefef7 commit 555d98f

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

x-pack/plugin/logsdb/src/main/java/org/elasticsearch/xpack/logsdb/patternedtext/PatternedTextFieldMapper.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
import org.apache.lucene.document.SortedSetDocValuesField;
1313
import org.apache.lucene.index.IndexOptions;
1414
import org.apache.lucene.util.BytesRef;
15+
import org.elasticsearch.common.lucene.Lucene;
1516
import org.elasticsearch.common.util.FeatureFlag;
1617
import org.elasticsearch.index.IndexSettings;
1718
import org.elasticsearch.index.IndexVersion;
18-
import org.elasticsearch.index.analysis.IndexAnalyzers;
1919
import org.elasticsearch.index.analysis.NamedAnalyzer;
2020
import org.elasticsearch.index.mapper.CompositeSyntheticFieldLoader;
2121
import org.elasticsearch.index.mapper.DocumentParserContext;
@@ -78,15 +78,15 @@ public static class Builder extends FieldMapper.Builder {
7878
private final Parameter<String> indexOptions = patternedTextIndexOptions(m -> ((PatternedTextFieldMapper) m).indexOptions);
7979

8080
public Builder(String name, MappingParserContext context) {
81-
this(name, context.indexVersionCreated(), context.getIndexSettings(), context.getIndexAnalyzers());
81+
this(name, context.indexVersionCreated(), context.getIndexSettings());
8282
}
8383

84-
public Builder(String name, IndexVersion indexCreatedVersion, IndexSettings indexSettings, IndexAnalyzers indexAnalyzers) {
84+
public Builder(String name, IndexVersion indexCreatedVersion, IndexSettings indexSettings) {
8585
super(name);
8686
this.indexCreatedVersion = indexCreatedVersion;
8787
this.indexSettings = indexSettings;
8888
this.analyzers = new TextParams.Analyzers(
89-
indexAnalyzers,
89+
(type, name1) -> Lucene.STANDARD_ANALYZER,
9090
m -> ((PatternedTextFieldMapper) m).indexAnalyzer,
9191
m -> ((PatternedTextFieldMapper) m).positionIncrementGap,
9292
indexCreatedVersion
@@ -149,7 +149,6 @@ public PatternedTextFieldMapper build(MapperBuilderContext context) {
149149
public static final TypeParser PARSER = new TypeParser(Builder::new);
150150

151151
private final IndexVersion indexCreatedVersion;
152-
private final IndexAnalyzers indexAnalyzers;
153152
private final NamedAnalyzer indexAnalyzer;
154153
private final IndexSettings indexSettings;
155154
private final String indexOptions;
@@ -170,7 +169,6 @@ private PatternedTextFieldMapper(
170169
assert mappedFieldType.hasDocValues() == false;
171170
this.fieldType = fieldType;
172171
this.indexCreatedVersion = builder.indexCreatedVersion;
173-
this.indexAnalyzers = builder.analyzers.indexAnalyzers;
174172
this.indexAnalyzer = builder.analyzers.getIndexAnalyzer();
175173
this.indexSettings = builder.indexSettings;
176174
this.indexOptions = builder.indexOptions.getValue();
@@ -185,7 +183,7 @@ public Map<String, NamedAnalyzer> indexAnalyzers() {
185183

186184
@Override
187185
public FieldMapper.Builder getMergeBuilder() {
188-
return new Builder(leafName(), indexCreatedVersion, indexSettings, indexAnalyzers).init(this);
186+
return new Builder(leafName(), indexCreatedVersion, indexSettings).init(this);
189187
}
190188

191189
@Override

0 commit comments

Comments
 (0)