Merge remote-tracking branch 'origin/main' into ignore-dynamic-beyond…

…-limit
felixbarny · Sep 13, 2023 · def096d · def096d
2 parents a0e5a01 + b925b13
commit def096d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/docs/reference/search/search-your-data/semantic-search-elser.asciidoc b/docs/reference/search/search-your-data/semantic-search-elser.asciidoc
@@ -182,7 +182,7 @@ follow the progress.
 
 To perform semantic search, use the `text_expansion` query, and provide the 
 query text and the ELSER model ID. The example below uses the query text "How to 
-avoid muscle soreness after running?", the `ml-tokens` field contains the 
+avoid muscle soreness after running?", the `ml.tokens` field contains the 
 generated ELSER output:
 
 [source,console]

diff --git a/server/src/test/java/org/elasticsearch/cluster/ClusterStateTests.java b/server/src/test/java/org/elasticsearch/cluster/ClusterStateTests.java
@@ -1178,7 +1178,7 @@ public void testGetMinTransportVersion() throws IOException {
     public static int expectedChunkCount(ToXContent.Params params, ClusterState clusterState) {
         final var metrics = ClusterState.Metric.parseString(params.param("metric", "_all"), true);
 
-        int chunkCount = 0;
+        long chunkCount = 0;
 
         // header chunk
         chunkCount += 1;
@@ -1242,6 +1242,6 @@ public static int expectedChunkCount(ToXContent.Params params, ClusterState clus
             }
         }
 
-        return chunkCount;
+        return Math.toIntExact(chunkCount);
     }
 }
diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataTests.java
@@ -2170,7 +2170,7 @@ public static int expectedChunkCount(ToXContent.Params params, Metadata metadata
         final var context = Metadata.XContentContext.valueOf(params.param(CONTEXT_MODE_PARAM, CONTEXT_MODE_API));
 
         // 2 chunks at the beginning
-        int chunkCount = 2;
+        long chunkCount = 2;
         // 1 optional chunk for persistent settings
         if (context != Metadata.XContentContext.API && metadata.persistentSettings().isEmpty() == false) {
             chunkCount += 1;
@@ -2216,7 +2216,7 @@ public static int expectedChunkCount(ToXContent.Params params, Metadata metadata
         // 1 chunk to close metadata
         chunkCount += 1;
 
-        return chunkCount;
+        return Math.toIntExact(chunkCount);
     }
 
     /**