canAddIgnoredField(...) change

martijnvg · martijnvg · commit 2a72a770a9f3 · 2025-02-24T10:18:43.000+01:00
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/IpFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/IpFieldMapper.java
@@ -585,7 +585,7 @@ protected void parseCreateField(DocumentParserContext context) throws IOExceptio
         if (address != null) {
             indexValue(context, address);
         }
-        if (offsetsFieldName != null && context.isImmediateParentAnArray() && context.getRecordedSource() == false) {
+        if (offsetsFieldName != null && context.isImmediateParentAnArray() && context.canAddIgnoredField()) {
             if (address != null) {
                 BytesRef sortableValue = new BytesRef(InetAddressPoint.encode(address));
                 context.getOffSetContext().recordOffset(offsetsFieldName, sortableValue);
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java
@@ -1107,7 +1107,7 @@ protected void parseCreateField(DocumentParserContext context) throws IOExceptio
         }
 
         boolean indexed = indexValue(context, value);
-        if (offsetsFieldName != null && context.isImmediateParentAnArray() && context.getRecordedSource() == false) {
+        if (offsetsFieldName != null && context.isImmediateParentAnArray() && context.canAddIgnoredField()) {
             if (indexed) {
                 context.getOffSetContext().recordOffset(offsetsFieldName, value);
             } else if (value == null) {

Original file line number	Diff line number	Diff line change
`@@ -585,7 +585,7 @@ protected void parseCreateField(DocumentParserContext context) throws IOExceptio`
`585`	`585`	`if (address != null) {`
`586`	`586`	`indexValue(context, address);`
`587`	`587`	`}`
`588`		`- if (offsetsFieldName != null && context.isImmediateParentAnArray() && context.getRecordedSource() == false) {`
	`588`	`+ if (offsetsFieldName != null && context.isImmediateParentAnArray() && context.canAddIgnoredField()) {`
`589`	`589`	`if (address != null) {`
`590`	`590`	`BytesRef sortableValue = new BytesRef(InetAddressPoint.encode(address));`
`591`	`591`	`context.getOffSetContext().recordOffset(offsetsFieldName, sortableValue);`
Original file line number	Diff line number	Diff line change
`@@ -1107,7 +1107,7 @@ protected void parseCreateField(DocumentParserContext context) throws IOExceptio`
`1107`	`1107`	`}`
`1108`	`1108`
`1109`	`1109`	`boolean indexed = indexValue(context, value);`
`1110`		`- if (offsetsFieldName != null && context.isImmediateParentAnArray() && context.getRecordedSource() == false) {`
	`1110`	`+ if (offsetsFieldName != null && context.isImmediateParentAnArray() && context.canAddIgnoredField()) {`
`1111`	`1111`	`if (indexed) {`
`1112`	`1112`	`context.getOffSetContext().recordOffset(offsetsFieldName, value);`
`1113`	`1113`	`} else if (value == null) {`