Changes

Author: Tim-Brooks

plugins/mapper-size/src/main/java/org/elasticsearch/index/mapper/size/SizeFieldMapper.java

@@ -90,7 +90,7 @@ public void postParse(DocumentParserContext context) {
             return;
         }
         // TODO: Will be incorrect after ingest modifications
-        final int value = context.sourceToParse().modernSource().originalSourceSize();
+        final int value = context.sourceToParse().source().originalSourceSize();
         NumberType.INTEGER.addFields(context.doc(), fullPath(), value, true, true, true);
     }
 

server/src/main/java/org/elasticsearch/action/index/ModernSource.java

@@ -90,6 +90,16 @@ public ESONFlat structuredSource() {
         return structuredSource;
     }
 
+    public boolean isSourceEmpty() {
+        // TODO: check this logic. What does an empty source get converted into?
+        if (structuredSource != null) {
+            return false;
+        } else {
+            return originalSource == null || originalSource.length() == 0;
+        }
+
+    }
+
     @Override
     public boolean equals(Object o) {
         // TODO: Improve

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

@@ -79,7 +79,8 @@ public final class DocumentParser {
      * @throws DocumentParsingException whenever there's a problem parsing the document
      */
     public ParsedDocument parseDocument(SourceToParse source, MappingLookup mappingLookup) throws DocumentParsingException {
-        if (source.source() != null && source.source().length() == 0) {
+        ModernSource modernSource = source.source();
+        if (modernSource.isSourceEmpty()) {
             throw new DocumentParsingException(new XContentLocation(0, 0), "failed to parse, document is empty");
         }
         final RootDocumentParserContext context;
@@ -123,7 +124,7 @@ public String documentDescription() {
 
     private XContentParser getParser(SourceToParse source, XContentType xContentType) throws IOException {
         XContentParserConfiguration config = parserConfiguration.withIncludeSourceOnError(source.getIncludeSourceOnError());
-        ModernSource modernSource = source.modernSource();
+        ModernSource modernSource = source.source();
         if (modernSource.isStructured()) {
             return new ESONXContentParser(modernSource.structuredSource(), config.registry(), config.deprecationHandler(), xContentType);
         } else {
@@ -184,7 +185,7 @@ private static void executeIndexTimeScripts(DocumentParserContext context) {
                     fto
                 )
             ).build(new IndexFieldDataCache.None(), new NoneCircuitBreakerService()),
-            (ctx, doc) -> Source.fromBytes(context.sourceToParse().modernSource().originalSourceBytes())
+            (ctx, doc) -> Source.fromBytes(context.sourceToParse().source().originalSourceBytes())
         );
         // field scripts can be called both by the loop at the end of this method and via
         // the document reader, so to ensure that we don't run them multiple times we

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

@@ -436,7 +436,7 @@ public boolean isComplete() {
     @Override
     public void preParse(DocumentParserContext context) throws IOException {
         SourceToParse sourceToParse = context.sourceToParse();
-        ModernSource modernSource = sourceToParse.modernSource();
+        ModernSource modernSource = sourceToParse.source();
         XContentType contentType = sourceToParse.getXContentType();
 
         final var storedSource = stored()

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

@@ -90,11 +90,7 @@ public SourceToParse(
         this(id, source, xContentType, routing, dynamicTemplates, true, XContentMeteringParserDecorator.NOOP);
     }
 
-    public BytesReference source() {
-        return this.modernSource().originalSourceBytes();
-    }
-
-    public ModernSource modernSource() {
+    public ModernSource source() {
         return this.modernSource;
     }
 

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

@@ -71,7 +71,7 @@ public static BytesRef createField(
                 || id.equals(
                     indexRouting.createId(
                         context.sourceToParse().getXContentType(),
-                        context.sourceToParse().modernSource().originalSourceBytes(),
+                        context.sourceToParse().source().originalSourceBytes(),
                         suffix
                     )
                 );

server/src/test/java/org/elasticsearch/index/mapper/vectors/SparseVectorFieldMapperTests.java

@@ -451,7 +451,7 @@ public void testValueFetcher() throws Exception {
                     var valueFetcher = fieldType.valueFetcher(searchContext, null);
                     valueFetcher.setNextReader(leafReader.getContext());
 
-                    var source = Source.fromBytes(sourceToParse.modernSource().originalSourceBytes());
+                    var source = Source.fromBytes(sourceToParse.source().originalSourceBytes());
                     var result = valueFetcher.fetchValues(source, 0, List.of());
                     assertThat(result.size(), equalTo(1));
                     assertThat(result.get(0), instanceOf(Map.class));

test/framework/src/main/java/org/elasticsearch/index/mapper/MapperTestCase.java

@@ -283,11 +283,11 @@ private void assertIgnoreMalformedFalse(
         });
         DocumentParsingException e = expectThrows(
             DocumentParsingException.class,
-            "didn't throw while parsing " + source.source().utf8ToString(),
+            "didn't throw while parsing " + source.source().originalSourceBytes().utf8ToString(),
             () -> mapperService.documentMapper().parse(source)
         );
         assertThat(
-            "incorrect exception while parsing " + source.source().utf8ToString(),
+            "incorrect exception while parsing " + source.source().originalSourceBytes().utf8ToString(),
             e.getCause().getMessage(),
             exceptionMessageMatcher
         );

x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/highlight/SemanticTextHighlighterTests.java

@@ -274,7 +274,7 @@ private void assertHighlightOneDoc(
                     getOnlyLeafReader(reader).getContext(),
                     docID,
                     Map.of(),
-                    Source.fromBytes(source.modernSource().originalSourceBytes()),
+                    Source.fromBytes(source.source().originalSourceBytes()),
                     new RankDoc(docID, Float.NaN, 0)
                 );
                 try {