Merge branch 'main' into fix/top_hits_fetch_phase_lookup

javanna · Apr 2, 2024 · 3c6a71d · 3c6a71d
2 parents aa9a371 + 646ac4f
commit 3c6a71d
Show file tree

Hide file tree

Showing 166 changed files with 6,225 additions and 1,263 deletions.
diff --git a/.buildkite/pipelines/intake.yml b/.buildkite/pipelines/intake.yml
@@ -48,7 +48,7 @@ steps:
         timeout_in_minutes: 300
         matrix:
           setup:
-            BWC_VERSION: ["7.17.20", "8.13.1", "8.14.0"]
+            BWC_VERSION: ["7.17.20", "8.13.2", "8.14.0"]
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2004

diff --git a/.buildkite/pipelines/periodic-packaging.yml b/.buildkite/pipelines/periodic-packaging.yml
@@ -529,8 +529,8 @@ steps:
         env:
           BWC_VERSION: 8.12.2
 
-      - label: "{{matrix.image}} / 8.13.1 / packaging-tests-upgrade"
-        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.13.1
+      - label: "{{matrix.image}} / 8.13.2 / packaging-tests-upgrade"
+        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.13.2
         timeout_in_minutes: 300
         matrix:
           setup:
@@ -543,7 +543,7 @@ steps:
           machineType: custom-16-32768
           buildDirectory: /dev/shm/bk
         env:
-          BWC_VERSION: 8.13.1
+          BWC_VERSION: 8.13.2
 
       - label: "{{matrix.image}} / 8.14.0 / packaging-tests-upgrade"
         command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.14.0

diff --git a/.buildkite/pipelines/periodic.yml b/.buildkite/pipelines/periodic.yml
@@ -312,16 +312,16 @@ steps:
           buildDirectory: /dev/shm/bk
         env:
           BWC_VERSION: 8.12.2
-      - label: 8.13.1 / bwc
-        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.13.1#bwcTest
+      - label: 8.13.2 / bwc
+        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.13.2#bwcTest
         timeout_in_minutes: 300
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2004
           machineType: n1-standard-32
           buildDirectory: /dev/shm/bk
         env:
-          BWC_VERSION: 8.13.1
+          BWC_VERSION: 8.13.2
       - label: 8.14.0 / bwc
         command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.14.0#bwcTest
         timeout_in_minutes: 300
@@ -396,7 +396,7 @@ steps:
           setup:
             ES_RUNTIME_JAVA:
               - openjdk17
-            BWC_VERSION: ["7.17.20", "8.13.1", "8.14.0"]
+            BWC_VERSION: ["7.17.20", "8.13.2", "8.14.0"]
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2004
@@ -438,7 +438,7 @@ steps:
               - graalvm-ce17
               - openjdk17
               - openjdk21
-            BWC_VERSION: ["7.17.20", "8.13.1", "8.14.0"]
+            BWC_VERSION: ["7.17.20", "8.13.2", "8.14.0"]
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2004

diff --git a/.ci/bwcVersions b/.ci/bwcVersions
@@ -30,5 +30,5 @@ BWC_VERSION:
   - "8.10.4"
   - "8.11.4"
   - "8.12.2"
-  - "8.13.1"
+  - "8.13.2"
   - "8.14.0"
diff --git a/.ci/snapshotBwcVersions b/.ci/snapshotBwcVersions
@@ -1,4 +1,4 @@
 BWC_VERSION:
   - "7.17.20"
-  - "8.13.1"
+  - "8.13.2"
   - "8.14.0"
diff --git a/docs/changelog/106503.yaml b/docs/changelog/106503.yaml
@@ -0,0 +1,5 @@
+pr: 106503
+summary: "Support ST_CONTAINS and ST_WITHIN"
+area: "ES|QL"
+type: enhancement
+issues: []
diff --git a/docs/changelog/106564.yaml b/docs/changelog/106564.yaml
diff --git a/docs/changelog/106602.yaml b/docs/changelog/106602.yaml
diff --git a/docs/changelog/106655.yaml b/docs/changelog/106655.yaml
diff --git a/docs/changelog/106678.yaml b/docs/changelog/106678.yaml
diff --git a/docs/changelog/106793.yaml b/docs/changelog/106793.yaml
diff --git a/docs/changelog/106799.yaml b/docs/changelog/106799.yaml
diff --git a/docs/changelog/106878.yaml b/docs/changelog/106878.yaml
diff --git a/docs/reference/cluster/delete-desired-balance.asciidoc b/docs/reference/cluster/delete-desired-balance.asciidoc
@@ -6,9 +6,13 @@
 
 NOTE: {cloud-only}
 
-Resets the desired balance and starts a new computation from the current allocation.
-This API may be used if desired balance computation diverged from the current state
-and is trying to move too many shards.
+Discards the current desired balance and computes a new desired balance starting from the current allocation of shards.
+This can sometimes help {es} find a desired balance which needs fewer shard movements to achieve, especially if the
+cluster has experienced changes so substantial that the current desired balance is no longer optimal without {es} having
+detected that the current desired balance will take more shard movements to achieve than needed. However, this API
+imposes a heavy load on the elected master node and may not always have the expected effect. Calling this API should
+never be necessary. Consider instead <<shards-rebalancing-heuristics,increasing the value of
+`cluster.routing.allocation.balance.threshold`>> to avoid excessive shard movements.
 
 [[delete-desired-balance-request]]
 ==== {api-request-title}

diff --git a/docs/reference/esql/functions/aggregation-functions.asciidoc b/docs/reference/esql/functions/aggregation-functions.asciidoc
@@ -16,7 +16,7 @@ The <<esql-stats-by>> function supports these aggregate functions:
 * <<esql-agg-median-absolute-deviation>>
 * <<esql-agg-min>>
 * <<esql-agg-percentile>>
-* <<esql-agg-st-centroid>>
+* experimental:[] <<esql-agg-st-centroid>>
 * <<esql-agg-sum>>
 * <<esql-agg-values>>
 // end::agg_list[]

diff --git a/docs/reference/esql/functions/description/st_contains.asciidoc b/docs/reference/esql/functions/description/st_contains.asciidoc
@@ -0,0 +1,7 @@
+// This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.
+
+*Description*
+
+Returns whether the first geometry contains the second geometry.
+
+NOTE: The second parameter must also have the same coordinate system as the first. This means it is not possible to combine `geo_*` and `cartesian_*` parameters.
diff --git a/docs/reference/esql/functions/description/st_intersects.asciidoc b/docs/reference/esql/functions/description/st_intersects.asciidoc
@@ -3,3 +3,5 @@
 *Description*
 
 Returns whether the two geometries or geometry columns intersect.
+
+NOTE: The second parameter must also have the same coordinate system as the first. This means it is not possible to combine `geo_*` and `cartesian_*` parameters.
diff --git a/docs/reference/esql/functions/description/st_within.asciidoc b/docs/reference/esql/functions/description/st_within.asciidoc
@@ -0,0 +1,7 @@
+// This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.
+
+*Description*
+
+Returns whether the first geometry is within the second geometry.
+
+NOTE: The second parameter must also have the same coordinate system as the first. This means it is not possible to combine `geo_*` and `cartesian_*` parameters.
diff --git a/docs/reference/esql/functions/examples/st_contains.asciidoc b/docs/reference/esql/functions/examples/st_contains.asciidoc
@@ -0,0 +1,13 @@
+// This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.
+
+*Example*
+
+[source.merge.styled,esql]
+----
+include::{esql-specs}/spatial_shapes.csv-spec[tag=st_contains-airport_city_boundaries]
+----
+[%header.monospaced.styled,format=dsv,separator=|]
+|===
+include::{esql-specs}/spatial_shapes.csv-spec[tag=st_contains-airport_city_boundaries-result]
+|===
+
diff --git a/docs/reference/esql/functions/examples/st_intersects.asciidoc b/docs/reference/esql/functions/examples/st_intersects.asciidoc
@@ -0,0 +1,13 @@
+// This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.
+
+*Example*
+
+[source.merge.styled,esql]
+----
+include::{esql-specs}/spatial.csv-spec[tag=st_intersects-airports]
+----
+[%header.monospaced.styled,format=dsv,separator=|]
+|===
+include::{esql-specs}/spatial.csv-spec[tag=st_intersects-airports-result]
+|===
+
diff --git a/docs/reference/esql/functions/examples/st_within.asciidoc b/docs/reference/esql/functions/examples/st_within.asciidoc
@@ -0,0 +1,13 @@
+// This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.
+
+*Example*
+
+[source.merge.styled,esql]
+----
+include::{esql-specs}/spatial_shapes.csv-spec[tag=st_within-airport_city_boundaries]
+----
+[%header.monospaced.styled,format=dsv,separator=|]
+|===
+include::{esql-specs}/spatial_shapes.csv-spec[tag=st_within-airport_city_boundaries-result]
+|===
+
diff --git a/docs/reference/esql/functions/layout/st_contains.asciidoc b/docs/reference/esql/functions/layout/st_contains.asciidoc
@@ -0,0 +1,15 @@
+// This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.
+
+[discrete]
+[[esql-st_contains]]
+=== `ST_CONTAINS`
+
+*Syntax*
+
+[.text-center]
+image::esql/functions/signature/st_contains.svg[Embedded,opts=inline]
+
+include::../parameters/st_contains.asciidoc[]
+include::../description/st_contains.asciidoc[]
+include::../types/st_contains.asciidoc[]
+include::../examples/st_contains.asciidoc[]
diff --git a/docs/reference/esql/functions/layout/st_intersects.asciidoc b/docs/reference/esql/functions/layout/st_intersects.asciidoc
@@ -12,3 +12,4 @@ image::esql/functions/signature/st_intersects.svg[Embedded,opts=inline]
 include::../parameters/st_intersects.asciidoc[]
 include::../description/st_intersects.asciidoc[]
 include::../types/st_intersects.asciidoc[]
+include::../examples/st_intersects.asciidoc[]
diff --git a/docs/reference/esql/functions/layout/st_within.asciidoc b/docs/reference/esql/functions/layout/st_within.asciidoc
@@ -0,0 +1,15 @@
+// This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.
+
+[discrete]
+[[esql-st_within]]
+=== `ST_WITHIN`
+
+*Syntax*
+
+[.text-center]
+image::esql/functions/signature/st_within.svg[Embedded,opts=inline]
+
+include::../parameters/st_within.asciidoc[]
+include::../description/st_within.asciidoc[]
+include::../types/st_within.asciidoc[]
+include::../examples/st_within.asciidoc[]
diff --git a/docs/reference/esql/functions/parameters/st_contains.asciidoc b/docs/reference/esql/functions/parameters/st_contains.asciidoc
@@ -0,0 +1,7 @@
+*Parameters*
+
+`geomA`::
+Geometry column name or variable of geometry type
+
+`geomB`::
+Geometry column name or variable of geometry type
diff --git a/docs/reference/esql/functions/parameters/st_within.asciidoc b/docs/reference/esql/functions/parameters/st_within.asciidoc
@@ -0,0 +1,7 @@
+*Parameters*
+
+`geomA`::
+Geometry column name or variable of geometry type
+
+`geomB`::
+Geometry column name or variable of geometry type
diff --git a/docs/reference/esql/functions/signature/st_contains.svg b/docs/reference/esql/functions/signature/st_contains.svg
diff --git a/docs/reference/esql/functions/signature/st_within.svg b/docs/reference/esql/functions/signature/st_within.svg
diff --git a/docs/reference/esql/functions/spatial-functions.asciidoc b/docs/reference/esql/functions/spatial-functions.asciidoc
@@ -8,11 +8,15 @@
 {esql} supports these spatial functions:
 
 // tag::spatial_list[]
-* <<esql-st_intersects>>
-* <<esql-st_x>>
-* <<esql-st_y>>
+* experimental:[] <<esql-st_intersects>>
+* experimental:[] <<esql-st_contains>>
+* experimental:[] <<esql-st_within>>
+* experimental:[] <<esql-st_x>>
+* experimental:[] <<esql-st_y>>
 // end::spatial_list[]
 
 include::st_intersects.asciidoc[]
+include::st_contains.asciidoc[]
+include::st_within.asciidoc[]
 include::st_x.asciidoc[]
 include::st_y.asciidoc[]
diff --git a/docs/reference/esql/functions/st_centroid.asciidoc b/docs/reference/esql/functions/st_centroid.asciidoc
@@ -2,6 +2,8 @@
 [[esql-agg-st-centroid]]
 === `ST_CENTROID`
 
+experimental::[]
+
 Calculate the spatial centroid over a field with spatial point geometry type.
 
 [source.merge.styled,esql]

diff --git a/docs/reference/esql/functions/st_contains.asciidoc b/docs/reference/esql/functions/st_contains.asciidoc
@@ -0,0 +1,26 @@
+[discrete]
+[[esql-st_contains]]
+=== `ST_CONTAINS`
+
+experimental::[]
+
+*Syntax*
+
+[.text-center]
+image::esql/functions/signature/st_contains.svg[Embedded,opts=inline]
+
+*Parameters*
+
+`geomA`::
+Expression of type `geo_point`, `cartesian_point`, `geo_shape` or `cartesian_shape`. If `null`, the function returns `null`.
+
+`geomB`::
+Expression of type `geo_point`, `cartesian_point`, `geo_shape` or `cartesian_shape`. If `null`, the function returns `null`.
+The second parameter must also have the same coordinate system as the first.
+This means it is not possible to combine `geo_*` and `cartesian_*` parameters.
+
+include::description/st_contains.asciidoc[]
+This is the inverse of the `<<esql-st_within,ST_WITHIN>>` function.
+
+include::types/st_contains.asciidoc[]
+include::examples/st_contains.asciidoc[]
diff --git a/docs/reference/esql/functions/st_intersects.asciidoc b/docs/reference/esql/functions/st_intersects.asciidoc
@@ -2,6 +2,8 @@
 [[esql-st_intersects]]
 === `ST_INTERSECTS`
 
+experimental::[]
+
 *Syntax*
 
 [.text-center]
@@ -24,17 +26,5 @@ They intersect if they have any point in common, including their interior points
 (points along lines or within polygons).
 In mathematical terms: ST_Intersects(A, B) ⇔ A ⋂ B ≠ ∅
 
-*Supported types*
-
 include::types/st_intersects.asciidoc[]
-
-*Example*
-
-[source.merge.styled,esql]
-----
-include::{esql-specs}/spatial.csv-spec[tag=st_intersects-airports]
-----
-[%header.monospaced.styled,format=dsv,separator=|]
-|===
-include::{esql-specs}/spatial.csv-spec[tag=st_intersects-airports-results]
-|===
+include::examples/st_intersects.asciidoc[]
diff --git a/docs/reference/esql/functions/st_within.asciidoc b/docs/reference/esql/functions/st_within.asciidoc
@@ -0,0 +1,26 @@
+[discrete]
+[[esql-st_within]]
+=== `ST_WITHIN`
+
+experimental::[]
+
+*Syntax*
+
+[.text-center]
+image::esql/functions/signature/st_within.svg[Embedded,opts=inline]
+
+*Parameters*
+
+`geomA`::
+Expression of type `geo_point`, `cartesian_point`, `geo_shape` or `cartesian_shape`. If `null`, the function returns `null`.
+
+`geomB`::
+Expression of type `geo_point`, `cartesian_point`, `geo_shape` or `cartesian_shape`. If `null`, the function returns `null`.
+The second parameter must also have the same coordinate system as the first.
+This means it is not possible to combine `geo_*` and `cartesian_*` parameters.
+
+include::description/st_within.asciidoc[]
+This is the inverse of the `<<esql-st_contains,ST_CONTAINS>>` function.
+
+include::types/st_within.asciidoc[]
+include::examples/st_within.asciidoc[]
diff --git a/docs/reference/esql/functions/st_x.asciidoc b/docs/reference/esql/functions/st_x.asciidoc
@@ -2,6 +2,8 @@
 [[esql-st_x]]
 === `ST_X`
 
+experimental::[]
+
 *Syntax*
 
 [.text-center]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,3 +3,5 @@
		Description

		Returns whether the two geometries or geometry columns intersect.

		NOTE: The second parameter must also have the same coordinate system as the first. This means it is not possible to combine `geo_` and `cartesian_` parameters.