Merge remote-tracking branch 'upstream/main' into native_int7_overflow

jimczi · May 10, 2024 · e60ce34 · e60ce34
2 parents 0883f37 + b6874a5
commit e60ce34
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/capabilities/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/capabilities/10_basic.yml
@@ -1,6 +1,9 @@
 ---
 "Capabilities API":
 
+  - skip:
+      awaits_fix: "https://github.com/elastic/elasticsearch/issues/108509"
+
   - requires:
       capabilities:
         - method: GET

diff --git a/...va/org/elasticsearch/xpack/transform/transforms/TransformIndexerFailureHandlingTests.java b/...va/org/elasticsearch/xpack/transform/transforms/TransformIndexerFailureHandlingTests.java
@@ -992,7 +992,7 @@ private MockedTransformIndexer createMockIndexer(
 
     private static Function<SearchRequest, SearchResponse> returnHit() {
         return request -> new SearchResponse(
-            new SearchHits(new SearchHit[] { new SearchHit(1) }, new TotalHits(1L, TotalHits.Relation.EQUAL_TO), 1.0f),
+            SearchHits.unpooled(new SearchHit[] { SearchHit.unpooled(1) }, new TotalHits(1L, TotalHits.Relation.EQUAL_TO), 1.0f),
             // Simulate completely null aggs
             null,
             new Suggest(Collections.emptyList()),

diff --git a/...rc/test/java/org/elasticsearch/xpack/transform/transforms/TransformIndexerStateTests.java b/...rc/test/java/org/elasticsearch/xpack/transform/transforms/TransformIndexerStateTests.java
@@ -88,7 +88,7 @@
 public class TransformIndexerStateTests extends ESTestCase {
 
     private static final SearchResponse ONE_HIT_SEARCH_RESPONSE = new SearchResponse(
-        new SearchHits(new SearchHit[] { new SearchHit(1) }, new TotalHits(1L, TotalHits.Relation.EQUAL_TO), 1.0f),
+        SearchHits.unpooled(new SearchHit[] { SearchHit.unpooled(1) }, new TotalHits(1L, TotalHits.Relation.EQUAL_TO), 1.0f),
         // Simulate completely null aggs
         null,
         new Suggest(Collections.emptyList()),