Skip to content

Commit 8ca74fb

Browse files
authored
Revert "Extract synthetic source logic from DocumentParser (#116049)" (#119530)
This reverts commit e8d32af.
1 parent 5960af6 commit 8ca74fb

File tree

31 files changed

+130
-2299
lines changed

31 files changed

+130
-2299
lines changed

benchmarks/src/main/java/org/elasticsearch/benchmark/index/mapper/LogsDbDocumentParsingBenchmark.java

Lines changed: 0 additions & 400 deletions
This file was deleted.

modules/data-streams/src/test/java/org/elasticsearch/datastreams/DataStreamGetWriteIndexTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ public void setup() throws Exception {
241241
new MetadataFieldMapper[] { dtfm },
242242
Collections.emptyMap()
243243
);
244-
MappingLookup mappingLookup = MappingLookup.fromMappers(mapping, List.of(dtfm, dateFieldMapper), List.of(), null);
244+
MappingLookup mappingLookup = MappingLookup.fromMappers(mapping, List.of(dtfm, dateFieldMapper), List.of());
245245
indicesService = DataStreamTestHelper.mockIndicesServices(mappingLookup);
246246
}
247247

server/src/main/java/org/elasticsearch/index/mapper/CustomSyntheticSourceFieldLookup.java

Lines changed: 0 additions & 88 deletions
This file was deleted.

server/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ public static DocumentMapper createEmpty(MapperService mapperService) {
4949
mapping,
5050
mapping.toCompressedXContent(),
5151
IndexVersion.current(),
52-
mapperService.getIndexSettings(),
5352
mapperService.getMapperMetrics(),
5453
mapperService.index().getName()
5554
);
@@ -60,13 +59,12 @@ public static DocumentMapper createEmpty(MapperService mapperService) {
6059
Mapping mapping,
6160
CompressedXContent source,
6261
IndexVersion version,
63-
IndexSettings indexSettings,
6462
MapperMetrics mapperMetrics,
6563
String indexName
6664
) {
6765
this.documentParser = documentParser;
6866
this.type = mapping.getRoot().fullPath();
69-
this.mappingLookup = MappingLookup.fromMapping(mapping, indexSettings);
67+
this.mappingLookup = MappingLookup.fromMapping(mapping);
7068
this.mappingSource = source;
7169
this.mapperMetrics = mapperMetrics;
7270
this.indexVersion = version;

0 commit comments

Comments
 (0)