Revert "Extract synthetic source logic from DocumentParser (elastic#1…

…16049)" (elastic#119530) This reverts commit e8d32af.
zhongshanhao · Jan 3, 2025 · 8ca74fb · 8ca74fb
1 parent 5960af6
commit 8ca74fb
Show file tree

Hide file tree

Showing 31 changed files with 130 additions and 2,299 deletions.
diff --git a/...rc/main/java/org/elasticsearch/benchmark/index/mapper/LogsDbDocumentParsingBenchmark.java b/...rc/main/java/org/elasticsearch/benchmark/index/mapper/LogsDbDocumentParsingBenchmark.java
diff --git a/...ata-streams/src/test/java/org/elasticsearch/datastreams/DataStreamGetWriteIndexTests.java b/...ata-streams/src/test/java/org/elasticsearch/datastreams/DataStreamGetWriteIndexTests.java
@@ -241,7 +241,7 @@ public void setup() throws Exception {
                 new MetadataFieldMapper[] { dtfm },
                 Collections.emptyMap()
             );
-            MappingLookup mappingLookup = MappingLookup.fromMappers(mapping, List.of(dtfm, dateFieldMapper), List.of(), null);
+            MappingLookup mappingLookup = MappingLookup.fromMappers(mapping, List.of(dtfm, dateFieldMapper), List.of());
             indicesService = DataStreamTestHelper.mockIndicesServices(mappingLookup);
         }
 

diff --git a/server/src/main/java/org/elasticsearch/index/mapper/CustomSyntheticSourceFieldLookup.java b/server/src/main/java/org/elasticsearch/index/mapper/CustomSyntheticSourceFieldLookup.java
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java
@@ -49,7 +49,6 @@ public static DocumentMapper createEmpty(MapperService mapperService) {
             mapping,
             mapping.toCompressedXContent(),
             IndexVersion.current(),
-            mapperService.getIndexSettings(),
             mapperService.getMapperMetrics(),
             mapperService.index().getName()
         );
@@ -60,13 +59,12 @@ public static DocumentMapper createEmpty(MapperService mapperService) {
         Mapping mapping,
         CompressedXContent source,
         IndexVersion version,
-        IndexSettings indexSettings,
         MapperMetrics mapperMetrics,
         String indexName
     ) {
         this.documentParser = documentParser;
         this.type = mapping.getRoot().fullPath();
-        this.mappingLookup = MappingLookup.fromMapping(mapping, indexSettings);
+        this.mappingLookup = MappingLookup.fromMapping(mapping);
         this.mappingSource = source;
         this.mapperMetrics = mapperMetrics;
         this.indexVersion = version;