Skip to content

Speed up stored field spec management #122645

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 5 commits into from
Mar 3, 2025
Merged

Speed up stored field spec management #122645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ba201a2
Speed up stored field spec management
nik9000 Feb 14, 2025
e58094e
Merge branch 'main' into stored_field_spec_merge_faster
nik9000 Mar 3, 2025
42e51d4
Explain and test
nik9000 Mar 3, 2025
2a01180
[CI] Auto commit changes from spotless
Mar 3, 2025
09b95d3
Merge branch 'main' into stored_field_spec_merge_faster
nik9000 Mar 3, 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
13 changes: 11 additions & 2 deletions server/src/main/java/org/elasticsearch/search/fetch/StoredFieldsSpec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,17 @@ public StoredFieldsSpec merge(StoredFieldsSpec other) {
if (this == other) {
return this;
}
Set<String> mergedFields = new HashSet<>(this.requiredStoredFields);
mergedFields.addAll(other.requiredStoredFields);
Set<String> mergedFields;
if (other.requiredStoredFields.isEmpty()) {
/*
* In the very very common case that we don't need new stored fields
* let's not clone the existing array.
*/
mergedFields = this.requiredStoredFields;
} else {
mergedFields = new HashSet<>(this.requiredStoredFields);
mergedFields.addAll(other.requiredStoredFields);
}
return new StoredFieldsSpec(
this.requiresSource || other.requiresSource,
this.requiresMetadata || other.requiresMetadata,
Expand Down
14 changes: 14 additions & 0 deletions server/src/test/java/org/elasticsearch/search/fetch/StoredFieldsSpecTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@
import org.elasticsearch.search.internal.SearchContext;
import org.elasticsearch.test.ESTestCase;

import java.util.Set;

import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.Matchers.sameInstance;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

Expand Down Expand Up @@ -67,6 +70,17 @@ public void testScriptFieldsEnableMetadata() {
assertTrue(spec.requiresMetadata());
}

public void testNoCloneOnMerge() {
StoredFieldsSpec spec = StoredFieldsSpec.NO_REQUIREMENTS;
spec = spec.merge(StoredFieldsSpec.NEEDS_SOURCE);
assertThat(spec.requiredStoredFields(), sameInstance(StoredFieldsSpec.NO_REQUIREMENTS.requiredStoredFields()));

StoredFieldsSpec needsCat = new StoredFieldsSpec(false, false, Set.of("cat"));
StoredFieldsSpec withCat = spec.merge(needsCat);
spec = withCat.merge(StoredFieldsSpec.NO_REQUIREMENTS);
assertThat(spec.requiredStoredFields(), sameInstance(withCat.requiredStoredFields()));
}

private static SearchContext searchContext(SearchSourceBuilder sourceBuilder) {
SearchContext sc = mock(SearchContext.class);
when(sc.fetchSourceContext()).thenReturn(sourceBuilder.fetchSource());
Expand Down