Skip to content
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

Fix GET api returning _ignored_source as multi-value field #115853

Merged
merged 2 commits into from
Oct 30, 2024
Merged

Fix GET api returning _ignored_source as multi-value field #115853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6615a6c
fix: _ignored_source is a multi-value field
salvatore-campagna Oct 29, 2024
d544b6e
Merge branch 'main' into fix/get-api-ignored-field
elasticmachine Oct 29, 2024
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
6 changes: 0 additions & 6 deletions muted-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,18 +251,12 @@ tests:
- class: org.elasticsearch.oldrepos.OldRepositoryAccessIT
method: testOldRepoAccess
issue: https://github.com/elastic/elasticsearch/issues/115631
- class: org.elasticsearch.index.get.GetResultTests
method: testToAndFromXContent
issue: https://github.com/elastic/elasticsearch/issues/115688
- class: org.elasticsearch.action.update.UpdateResponseTests
method: testToAndFromXContent
issue: https://github.com/elastic/elasticsearch/issues/115689
- class: org.elasticsearch.xpack.shutdown.NodeShutdownIT
method: testStalledShardMigrationProperlyDetected
issue: https://github.com/elastic/elasticsearch/issues/115697
- class: org.elasticsearch.index.get.GetResultTests
method: testToAndFromXContentEmbedded
issue: https://github.com/elastic/elasticsearch/issues/115657
- class: org.elasticsearch.xpack.spatial.search.GeoGridAggAndQueryConsistencyIT
method: testGeoShapeGeoHash
issue: https://github.com/elastic/elasticsearch/issues/115664
Expand Down
5 changes: 3 additions & 2 deletions server/src/main/java/org/elasticsearch/index/get/GetResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import org.elasticsearch.common.logging.DeprecationLogger;
import org.elasticsearch.common.xcontent.XContentHelper;
import org.elasticsearch.index.mapper.IgnoredFieldMapper;
import org.elasticsearch.index.mapper.IgnoredSourceFieldMapper;
import org.elasticsearch.index.mapper.MapperService;
import org.elasticsearch.index.mapper.SourceFieldMapper;
import org.elasticsearch.search.lookup.Source;
Expand Down Expand Up @@ -247,7 +248,7 @@ public XContentBuilder toXContentEmbedded(XContentBuilder builder, Params params

for (DocumentField field : metaFields.values()) {
// TODO: can we avoid having an exception here?
if (field.getName().equals(IgnoredFieldMapper.NAME)) {
if (field.getName().equals(IgnoredFieldMapper.NAME) || field.getName().equals(IgnoredSourceFieldMapper.NAME)) {
builder.field(field.getName(), field.getValues());
} else {
builder.field(field.getName(), field.<Object>getValue());
Expand Down Expand Up @@ -341,7 +342,7 @@ public static GetResult fromXContentEmbedded(XContentParser parser, String index
parser.skipChildren(); // skip potential inner objects for forward compatibility
}
} else if (token == XContentParser.Token.START_ARRAY) {
if (IgnoredFieldMapper.NAME.equals(currentFieldName)) {
if (IgnoredFieldMapper.NAME.equals(currentFieldName) || IgnoredSourceFieldMapper.NAME.equals(currentFieldName)) {
metaFields.put(currentFieldName, new DocumentField(currentFieldName, parser.list()));
} else {
parser.skipChildren(); // skip potential inner arrays for forward compatibility
Expand Down