From 97cc52cde96ea620fb42d2dd0319e2d51d99f25a Mon Sep 17 00:00:00 2001 From: Jack Conradson Date: Tue, 20 Jun 2023 11:56:01 -0700 Subject: [PATCH 1/7] fix toXContent for sub_searches list --- .../org/elasticsearch/search/builder/SearchSourceBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java b/server/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java index 08187dc4a6ef7..a03c24e755cd8 100644 --- a/server/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java @@ -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); } } From 9f4df4384f5d0d5c643eb9d67b6a66663ef9200b Mon Sep 17 00:00:00 2001 From: Jack Conradson Date: Tue, 20 Jun 2023 11:58:52 -0700 Subject: [PATCH 2/7] fix ShardSearchRequestTests.testForceSyntheticUnsupported --- .../elasticsearch/search/internal/ShardSearchRequestTests.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/src/test/java/org/elasticsearch/search/internal/ShardSearchRequestTests.java b/server/src/test/java/org/elasticsearch/search/internal/ShardSearchRequestTests.java index 946dc81a55b08..427df9349a21b 100644 --- a/server/src/test/java/org/elasticsearch/search/internal/ShardSearchRequestTests.java +++ b/server/src/test/java/org/elasticsearch/search/internal/ShardSearchRequestTests.java @@ -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; @@ -261,6 +262,7 @@ public void testForceSyntheticUnsupported() throws IOException { SearchRequest request = createSearchRequest(); if (request.source() != null) { request.source().rankBuilder(null); + request.source().subSearches(new ArrayList<>()); } request.setForceSyntheticSource(true); ShardSearchRequest shardRequest = createShardSearchReqest(request); From d948c45b1d8d1d0b0c7ab7c1a9bb97bc8749828f Mon Sep 17 00:00:00 2001 From: Jack Conradson Date: Tue, 20 Jun 2023 12:20:30 -0700 Subject: [PATCH 3/7] unmute test --- .../elasticsearch/search/internal/ShardSearchRequestTests.java | 1 - 1 file changed, 1 deletion(-) diff --git a/server/src/test/java/org/elasticsearch/search/internal/ShardSearchRequestTests.java b/server/src/test/java/org/elasticsearch/search/internal/ShardSearchRequestTests.java index 318e36b492f8a..427df9349a21b 100644 --- a/server/src/test/java/org/elasticsearch/search/internal/ShardSearchRequestTests.java +++ b/server/src/test/java/org/elasticsearch/search/internal/ShardSearchRequestTests.java @@ -258,7 +258,6 @@ 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) { From ba2bdcdd4a8c9680892b0bac76451030f339f616 Mon Sep 17 00:00:00 2001 From: Jack Conradson Date: Tue, 20 Jun 2023 12:27:32 -0700 Subject: [PATCH 4/7] unmute test --- .../org/elasticsearch/action/get/MultiGetShardRequestTests.java | 1 - 1 file changed, 1 deletion(-) diff --git a/server/src/test/java/org/elasticsearch/action/get/MultiGetShardRequestTests.java b/server/src/test/java/org/elasticsearch/action/get/MultiGetShardRequestTests.java index 54fd178ce671f..2f76127b88e26 100644 --- a/server/src/test/java/org/elasticsearch/action/get/MultiGetShardRequestTests.java +++ b/server/src/test/java/org/elasticsearch/action/get/MultiGetShardRequestTests.java @@ -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(); From e74ce81ed1f08d0f1a4919d82557db1a70ebc567 Mon Sep 17 00:00:00 2001 From: Jack Conradson Date: Tue, 20 Jun 2023 12:30:09 -0700 Subject: [PATCH 5/7] Update docs/changelog/96963.yaml --- docs/changelog/96963.yaml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 docs/changelog/96963.yaml diff --git a/docs/changelog/96963.yaml b/docs/changelog/96963.yaml new file mode 100644 index 0000000000000..ecf28e6a3dedc --- /dev/null +++ b/docs/changelog/96963.yaml @@ -0,0 +1,7 @@ +pr: 96963 +summary: Fix double array for `sub_searches` in toXContent +area: Ranking +type: bug +issues: + - 96896 + - 96910 From 44cdbf7179e46bdd5e53f223509c36d6ca194e87 Mon Sep 17 00:00:00 2001 From: Jack Conradson Date: Tue, 20 Jun 2023 12:47:53 -0700 Subject: [PATCH 6/7] Delete docs/changelog/96963.yaml --- docs/changelog/96963.yaml | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 docs/changelog/96963.yaml diff --git a/docs/changelog/96963.yaml b/docs/changelog/96963.yaml deleted file mode 100644 index ecf28e6a3dedc..0000000000000 --- a/docs/changelog/96963.yaml +++ /dev/null @@ -1,7 +0,0 @@ -pr: 96963 -summary: Fix double array for `sub_searches` in toXContent -area: Ranking -type: bug -issues: - - 96896 - - 96910 From 59b9d4718e8e226946447171080b1eec3bea2b86 Mon Sep 17 00:00:00 2001 From: Jack Conradson Date: Tue, 20 Jun 2023 12:55:44 -0700 Subject: [PATCH 7/7] response to pr comment --- .../search/internal/ShardSearchRequestTests.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server/src/test/java/org/elasticsearch/search/internal/ShardSearchRequestTests.java b/server/src/test/java/org/elasticsearch/search/internal/ShardSearchRequestTests.java index 427df9349a21b..f27e8beb1d1d9 100644 --- a/server/src/test/java/org/elasticsearch/search/internal/ShardSearchRequestTests.java +++ b/server/src/test/java/org/elasticsearch/search/internal/ShardSearchRequestTests.java @@ -262,7 +262,9 @@ public void testForceSyntheticUnsupported() throws IOException { SearchRequest request = createSearchRequest(); if (request.source() != null) { request.source().rankBuilder(null); - request.source().subSearches(new ArrayList<>()); + if (request.source().subSearches().size() >= 2) { + request.source().subSearches(new ArrayList<>()); + } } request.setForceSyntheticSource(true); ShardSearchRequest shardRequest = createShardSearchReqest(request);