Skip to content

[9.0] Trim to size lists created in source fetchers (#130521) #130602

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
merged 1 commit into from
Jul 4, 2025
Merged

[9.0] Trim to size lists created in source fetchers (#130521) #130602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions docs/changelog/130521.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 130521
summary: Trim to size lists created in source fetchers
area: Search
type: bug
issues: []
3 changes: 2 additions & 1 deletion server/src/main/java/org/elasticsearch/index/mapper/ArraySourceValueFetcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public ArraySourceValueFetcher(Set<String> sourcePaths, Object nullValue) {

@Override
public List<Object> fetchValues(Source source, int doc, List<Object> ignoredValues) {
List<Object> values = new ArrayList<>();
ArrayList<Object> values = new ArrayList<>();
for (String path : sourcePaths) {
Object sourceValue = source.extractValue(path, nullValue);
if (sourceValue == null) {
Expand All @@ -70,6 +70,7 @@ public List<Object> fetchValues(Source source, int doc, List<Object> ignoredValu
ignoredValues.add(sourceValue);
}
}
values.trimToSize();
return values;
}

Expand Down
3 changes: 2 additions & 1 deletion server/src/main/java/org/elasticsearch/index/mapper/NestedValueFetcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public NestedValueFetcher(String nestedField, FieldFetcher nestedFieldFetcher) {

@Override
public List<Object> fetchValues(Source source, int doc, List<Object> includedValues) throws IOException {
List<Object> nestedEntriesToReturn = new ArrayList<>();
ArrayList<Object> nestedEntriesToReturn = new ArrayList<>();
Map<String, Object> filteredSource = new HashMap<>();
Map<String, Object> stub = createSourceMapStub(filteredSource);
List<?> nestedValues = XContentMapValues.extractNestedSources(nestedFieldPath, source.source());
Expand All @@ -69,6 +69,7 @@ public List<Object> fetchValues(Source source, int doc, List<Object> includedVal
nestedEntriesToReturn.add(nestedEntry);
}
}
nestedEntriesToReturn.trimToSize();
return nestedEntriesToReturn;
}

Expand Down
3 changes: 2 additions & 1 deletion server/src/main/java/org/elasticsearch/index/mapper/SourceValueFetcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public SourceValueFetcher(Set<String> sourcePaths, Object nullValue) {

@Override
public List<Object> fetchValues(Source source, int doc, List<Object> ignoredValues) {
List<Object> values = new ArrayList<>();
ArrayList<Object> values = new ArrayList<>();
for (String path : sourcePaths) {
Object sourceValue = source.extractValue(path, nullValue);
if (sourceValue == null) {
Expand Down Expand Up @@ -92,6 +92,7 @@ public List<Object> fetchValues(Source source, int doc, List<Object> ignoredValu
}
}
}
values.trimToSize();
return values;
}

Expand Down