Skip to content

Fix double array for sub_searches in toXContent #96963

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 8 commits into from
Jun 20, 2023
Merged

Fix double array for sub_searches in toXContent #96963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
97cc52c
fix toXContent for sub_searches list
jdconrad Jun 20, 2023
9f4df43
fix ShardSearchRequestTests.testForceSyntheticUnsupported
jdconrad Jun 20, 2023
5561411
Merge branch 'main' into failure96896
jdconrad Jun 20, 2023
d948c45
unmute test
jdconrad Jun 20, 2023
ba2bdcd
unmute test
jdconrad Jun 20, 2023
e74ce81
Update docs/changelog/96963.yaml
jdconrad Jun 20, 2023
44cdbf7
Delete docs/changelog/96963.yaml
jdconrad Jun 20, 2023
59b9d47
response to pr comment
jdconrad Jun 20, 2023
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
2 changes: 1 addition & 1 deletion server/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1616,7 +1616,7 @@ public XContentBuilder innerToXContent(XContentBuilder builder, Params params) t
if (subSearchSourceBuilders.size() == 1) {
builder.field(QUERY_FIELD.getPreferredName(), subSearchSourceBuilders.get(0).getQueryBuilder());
} else {
builder.array(SUB_SEARCHES_FIELD.getPreferredName(), subSearchSourceBuilders);
builder.xContentList(SUB_SEARCHES_FIELD.getPreferredName(), subSearchSourceBuilders);
Copy link
Member

@benwtrent benwtrent Jun 20, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TIL about xContentList nice.

}
}

Expand Down
1 change: 0 additions & 1 deletion server/src/test/java/org/elasticsearch/action/get/MultiGetShardRequestTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ protected MultiGetShardRequest mutateInstance(MultiGetShardRequest instance) thr
}
}

@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/96910")
public void testForceSyntheticUnsupported() {
MultiGetShardRequest request = createTestInstance(true);
StreamOutput out = new BytesStreamOutput();
Expand Down
5 changes: 4 additions & 1 deletion server/src/test/java/org/elasticsearch/search/internal/ShardSearchRequestTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@

import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.atomic.AtomicBoolean;
Expand Down Expand Up @@ -257,11 +258,13 @@ public void testWillCallRequestCacheKeyDifferentiators() throws IOException {
assertThat(invoked.get(), is(true));
}

@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/96910")
public void testForceSyntheticUnsupported() throws IOException {
SearchRequest request = createSearchRequest();
if (request.source() != null) {
request.source().rankBuilder(null);
if (request.source().subSearches().size() >= 2) {
request.source().subSearches(new ArrayList<>());
}
}
request.setForceSyntheticSource(true);
ShardSearchRequest shardRequest = createShardSearchReqest(request);
Expand Down