Merge branch 'main' into esql_core_failrue

nik9000 · Jul 9, 2024 · c347f23 · c347f23
2 parents 9661fad + 5d26c67
commit c347f23
Show file tree

Hide file tree

Showing 250 changed files with 5,604 additions and 1,724 deletions.
diff --git a/.buildkite/pipelines/dra-workflow.yml b/.buildkite/pipelines/dra-workflow.yml
@@ -7,7 +7,7 @@ steps:
       image: family/elasticsearch-ubuntu-2204
       machineType: custom-32-98304
       buildDirectory: /dev/shm/bk
-      diskSizeGb: 250
+      diskSizeGb: 350
   - wait
   # The hadoop build depends on the ES artifact
   # So let's trigger the hadoop build any time we build a new staging artifact

diff --git a/benchmarks/build.gradle b/benchmarks/build.gradle
@@ -47,8 +47,8 @@ dependencies {
   api "org.openjdk.jmh:jmh-core:$versions.jmh"
   annotationProcessor "org.openjdk.jmh:jmh-generator-annprocess:$versions.jmh"
   // Dependencies of JMH
-  runtimeOnly 'net.sf.jopt-simple:jopt-simple:4.6'
-  runtimeOnly 'org.apache.commons:commons-math3:3.2'
+  runtimeOnly 'net.sf.jopt-simple:jopt-simple:5.0.4'
+  runtimeOnly 'org.apache.commons:commons-math3:3.6.1'
 }
 
 // enable the JMH's BenchmarkProcessor to generate the final benchmark classes

diff --git a/build-tools-internal/version.properties b/build-tools-internal/version.properties
@@ -49,7 +49,7 @@ commonsCompress   = 1.24.0
 reflections       = 0.10.2
 
 # benchmark dependencies
-jmh               = 1.26
+jmh               = 1.37
 
 # test dependencies
 # when updating this version, also update :qa:evil-tests

diff --git a/docs/changelog/109667.yaml b/docs/changelog/109667.yaml
@@ -0,0 +1,5 @@
+pr: 109667
+summary: Inference autoscaling
+area: Machine Learning
+type: feature
+issues: []
diff --git a/docs/changelog/110061.yaml b/docs/changelog/110061.yaml
@@ -0,0 +1,6 @@
+pr: 110061
+summary: Avoiding running watch jobs in TickerScheduleTriggerEngine if it is paused
+area: Watcher
+type: bug
+issues:
+ - 105933
diff --git a/docs/changelog/110399.yaml b/docs/changelog/110399.yaml
@@ -0,0 +1,6 @@
+pr: 110399
+summary: "[Inference API] Prevent inference endpoints from being deleted if they are\
+  \ referenced by semantic text"
+area: Machine Learning
+type: enhancement
+issues: []
diff --git a/docs/changelog/110476.yaml b/docs/changelog/110476.yaml
@@ -0,0 +1,7 @@
+pr: 110476
+summary: Fix bug in union-types with type-casting in grouping key of STATS
+area: ES|QL
+type: bug
+issues:
+ - 109922
+ - 110477
diff --git a/docs/changelog/110554.yaml b/docs/changelog/110554.yaml
@@ -0,0 +1,5 @@
+pr: 110554
+summary: Fix `MapperBuilderContext#isDataStream` when used in dynamic mappers
+area: "Mapping"
+type: bug
+issues: []
diff --git a/docs/changelog/110586.yaml b/docs/changelog/110586.yaml
@@ -0,0 +1,5 @@
+pr: 110586
+summary: "ESQL: Fix Max doubles bug with negatives and add tests for Max and Min"
+area: ES|QL
+type: bug
+issues: []
diff --git a/docs/reference/esql/functions/aggregation-functions.asciidoc b/docs/reference/esql/functions/aggregation-functions.asciidoc
@@ -8,13 +8,13 @@
 The <<esql-stats-by>> command supports these aggregate functions:
 
 // tag::agg_list[]
-* <<esql-agg-avg>>
+* <<esql-avg>>
 * <<esql-agg-count>>
 * <<esql-agg-count-distinct>>
-* <<esql-agg-max>>
+* <<esql-max>>
 * <<esql-agg-median>>
 * <<esql-agg-median-absolute-deviation>>
-* <<esql-agg-min>>
+* <<esql-min>>
 * <<esql-agg-percentile>>
 * experimental:[] <<esql-agg-st-centroid>>
 * <<esql-agg-sum>>
@@ -23,16 +23,16 @@ The <<esql-stats-by>> command supports these aggregate functions:
 * experimental:[] <<esql-agg-weighted-avg>>
 // end::agg_list[]
 
-include::avg.asciidoc[]
 include::count.asciidoc[]
 include::count-distinct.asciidoc[]
-include::max.asciidoc[]
 include::median.asciidoc[]
 include::median-absolute-deviation.asciidoc[]
-include::min.asciidoc[]
 include::percentile.asciidoc[]
 include::st_centroid_agg.asciidoc[]
 include::sum.asciidoc[]
+include::layout/avg.asciidoc[]
+include::layout/max.asciidoc[]
+include::layout/min.asciidoc[]
 include::layout/top.asciidoc[]
 include::values.asciidoc[]
 include::weighted-avg.asciidoc[]
diff --git a/docs/reference/esql/functions/avg.asciidoc b/docs/reference/esql/functions/avg.asciidoc
diff --git a/docs/reference/esql/functions/description/avg.asciidoc b/docs/reference/esql/functions/description/avg.asciidoc
diff --git a/docs/reference/esql/functions/description/max.asciidoc b/docs/reference/esql/functions/description/max.asciidoc
diff --git a/docs/reference/esql/functions/description/min.asciidoc b/docs/reference/esql/functions/description/min.asciidoc
diff --git a/docs/reference/esql/functions/examples/avg.asciidoc b/docs/reference/esql/functions/examples/avg.asciidoc
diff --git a/docs/reference/esql/functions/max.asciidoc → ...ence/esql/functions/examples/max.asciidoc b/docs/reference/esql/functions/max.asciidoc → ...ence/esql/functions/examples/max.asciidoc
diff --git a/docs/reference/esql/functions/min.asciidoc → ...ence/esql/functions/examples/min.asciidoc b/docs/reference/esql/functions/min.asciidoc → ...ence/esql/functions/examples/min.asciidoc
diff --git a/docs/reference/esql/functions/kibana/definition/avg.json b/docs/reference/esql/functions/kibana/definition/avg.json
diff --git a/docs/reference/esql/functions/kibana/definition/max.json b/docs/reference/esql/functions/kibana/definition/max.json