Skip to content

Remove DocumentParserContext#removeLastIgnoredField(...) #132644

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
martijnvg merged 6 commits into from
Aug 18, 2025
Merged

Remove DocumentParserContext#removeLastIgnoredField(...) #132644

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3d5f0a5
Remove DocumentParserContext#removeLastIgnoredField(...)
martijnvg Aug 11, 2025
dcb14c8
Merge remote-tracking branch 'es/main' into DocumentParserContext_cle…
martijnvg Aug 16, 2025
e6b374c
added bwc test suite
martijnvg Aug 16, 2025
b629d77
Merge remote-tracking branch 'es/main' into DocumentParserContext_cle…
martijnvg Aug 16, 2025
717da47
Merge remote-tracking branch 'es/main' into DocumentParserContext_cle…
martijnvg Aug 18, 2025
538c528
tweak test
martijnvg Aug 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions server/src/main/java/org/elasticsearch/index/mapper/DocumentParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -702,8 +702,6 @@ private static void parseNonDynamicArray(
boolean supportStoringArrayOffsets = mapper != null && mapper.supportStoringArrayOffsets();
String fullPath = context.path().pathAsText(arrayFieldName);

// Check if we need to record the array source. This only applies to synthetic source.
boolean canRemoveSingleLeafElement = false;
if (context.canAddIgnoredField() && supportStoringArrayOffsets == false) {
Mapper.SourceKeepMode mode = Mapper.SourceKeepMode.NONE;
boolean objectWithFallbackSyntheticSource = false;
Expand All @@ -721,13 +719,6 @@ private static void parseNonDynamicArray(
}
boolean copyToFieldHasValuesInDocument = context.isWithinCopyTo() == false && context.isCopyToDestinationField(fullPath);

canRemoveSingleLeafElement = mapper instanceof FieldMapper
&& mode == Mapper.SourceKeepMode.ARRAYS
&& context.inArrayScope() == false
&& mapper.leafName().equals(NOOP_FIELD_MAPPER_NAME) == false
&& fieldWithFallbackSyntheticSource == false
&& copyToFieldHasValuesInDocument == false;

if (objectWithFallbackSyntheticSource
|| fieldWithFallbackSyntheticSource
|| fieldWithStoredArraySource
Expand Down Expand Up @@ -776,9 +767,6 @@ private static void parseNonDynamicArray(
&& context.isImmediateParentAnArray()) {
context.getOffSetContext().maybeRecordEmptyArray(mapper.getOffsetFieldName());
}
if (elements <= 1 && canRemoveSingleLeafElement) {
context.removeLastIgnoredField(fullPath);
}
postProcessDynamicArrayMapping(context, lastFieldName);
}

Expand Down
6 changes: 0 additions & 6 deletions server/src/main/java/org/elasticsearch/index/mapper/DocumentParserContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,12 +335,6 @@ public final void addIgnoredField(IgnoredSourceFieldMapper.NameValue values) {
}
}

final void removeLastIgnoredField(String name) {
if (ignoredFieldValues.isEmpty() == false && ignoredFieldValues.getLast().name().equals(name)) {
ignoredFieldValues.removeLast();
}
}

/**
* Return the collection of values for fields that have been ignored so far.
*/
Expand Down