Merge branch 'main' into fix-fips-artifacts-in-release-tests

Author: breskeby

docs/changelog/128960.yaml

@@ -0,0 +1,5 @@
+pr: 128960
+summary: Throw ISE instead of IAE for illegal block in page
+area: ES|QL
+type: bug
+issues: []

x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/data/Page.java

@@ -84,7 +84,7 @@ private Page(boolean copyBlocks, int positionCount, Block[] blocks) {
     private Page(Page prev, Block[] toAdd) {
         for (Block block : toAdd) {
             if (prev.positionCount != block.getPositionCount()) {
-                throw new IllegalArgumentException(
+                throw new IllegalStateException(
                     "Block [" + block + "] does not have same position count: " + block.getPositionCount() + " != " + prev.positionCount
                 );
             }

x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/60_usage.yml

@@ -228,7 +228,7 @@ setup:
   - gt: {esql.functions.to_long: $functions_to_long}
   - match: {esql.functions.coalesce: $functions_coalesce}
   - gt: {esql.functions.categorize: $functions_categorize}
-  - length: {esql.functions: 144} # check the "sister" test above for a likely update to the same esql.functions length check
+  - length: {esql.functions: 145} # check the "sister" test above for a likely update to the same esql.functions length check
 
 ---
 took: