Merge remote-tracking branch 'es/master' into index_mapping_source_mode

elastic · Oct 21, 2024 · 9bf8181 · 9bf8181
2 parents 38ce118 + 1268b05
commit 9bf8181
Show file tree

Hide file tree

Showing 3 changed files with 74 additions and 8 deletions.
diff --git a/catalog-info.yaml b/catalog-info.yaml
@@ -24,8 +24,9 @@ spec:
     - "resource:rally-tracks-it"
     - "resource:rally-tracks-it-serverless"
 
-# yaml-language-server: $schema=https://gist.githubusercontent.com/elasticmachine/988b80dae436cafea07d9a4a460a011d/raw/rre.schema.json
+
 ---
+# yaml-language-server: $schema=https://gist.githubusercontent.com/elasticmachine/988b80dae436cafea07d9a4a460a011d/raw/rre.schema.json
 apiVersion: backstage.io/v1alpha1
 kind: Resource
 metadata:
@@ -46,6 +47,9 @@ spec:
     metadata:
       name: Rally Tracks - IT
     spec:
+      env:
+        ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
+        SLACK_NOTIFICATIONS_CHANNEL: '#es-perf-build'
       pipeline_file: .buildkite/it/pipeline.yml
       repository: elastic/rally-tracks
       teams:
@@ -55,8 +59,9 @@ spec:
         everyone:
           access_level: READ_ONLY
 
-# yaml-language-server: $schema=https://gist.githubusercontent.com/elasticmachine/988b80dae436cafea07d9a4a460a011d/raw/rre.schema.json
+
 ---
+# yaml-language-server: $schema=https://gist.githubusercontent.com/elasticmachine/988b80dae436cafea07d9a4a460a011d/raw/rre.schema.json
 apiVersion: backstage.io/v1alpha1
 kind: Resource
 metadata:
@@ -77,6 +82,9 @@ spec:
     metadata:
       name: Rally Tracks - IT Serverless
     spec:
+      env:
+        ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
+        SLACK_NOTIFICATIONS_CHANNEL: '#es-perf-build'
       pipeline_file: .buildkite/it/serverless-pipeline.yml
       repository: elastic/rally-tracks
       schedules:

diff --git a/geopoint/challenges/default.json b/geopoint/challenges/default.json
@@ -283,12 +283,24 @@
           "iterations": 50,
           "tags": ["distance", "esql"]
         },
+        {
+          "operation": "distanceFilterCount200x300-alt",
+          "warmup-iterations": 50,
+          "iterations": 50,
+          "tags": ["distance", "esql"]
+        },
         {
           "operation": "distanceFilterCount200x300-esql",
           "warmup-iterations": 50,
           "iterations": 50,
           "tags": ["distance", "esql"]
         },
+        {
+          "operation": "distanceFilterCount200x300-esql-evals",
+          "warmup-iterations": 10,
+          "iterations": 10,
+          "tags": ["distance", "esql"]
+        },
         {
           "operation": "distanceFilterCount300",
           "warmup-iterations": 50,
@@ -315,14 +327,14 @@
         },
         {
           "operation": "distanceSort",
-          "warmup-iterations": 200,
-          "iterations": 100,
+          "warmup-iterations": 50,
+          "iterations": 50,
           "tags": ["distance", "sort"]
         },
         {
           "operation": "distanceSort-esql",
-          "warmup-iterations": 1,
-          "iterations": 1,
+          "warmup-iterations": 50,
+          "iterations": 50,
           "tags": ["distance", "esql", "sort"]
         },
         {
@@ -333,8 +345,8 @@
         },
         {
           "operation": "distanceFilterSort-esql",
-          "warmup-iterations": 1,
-          "iterations": 1,
+          "warmup-iterations": 200,
+          "iterations": 100,
           "tags": ["distance", "esql", "sort"]
         },
         {

diff --git a/geopoint/operations/default.json b/geopoint/operations/default.json
@@ -453,11 +453,57 @@
         }
       }
     },
+    {
+      "name": "distanceFilterCount200x300-alt",
+      "operation-type": "search",
+      "body": {
+        "query": {
+          "bool": {
+            "must": [
+              {
+              "geo_shape": {
+                "location": {
+                    "shape": { "type": "circle", "radius": "300km", "coordinates": [7, 55] },
+                    "relation": "intersects"
+                  }
+                }
+              },
+              {
+                "bool": {
+                  "must_not": [
+                    {
+                      "geo_shape": {
+                        "location": {
+                          "shape": { "type": "circle", "radius": "200km", "coordinates": [7, 55] },
+                          "relation": "intersects"
+                        }
+                      }
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        },
+        "aggs": {
+          "count": {
+            "value_count": {
+              "field": "location"
+            }
+          }
+        }
+      }
+    },
     {
       "name": "distanceFilterCount200x300-esql",
       "operation-type": "esql",
       "query": "FROM osmgeopoints | WHERE ST_Distance(location, TO_GEOPOINT(\"POINT(7.0 55.0)\")) >= 200000 AND ST_Distance(location, TO_GEOPOINT(\"POINT(7.0 55.0)\")) <= 300000 | STATS count=COUNT(*)"
     },
+    {
+      "name": "distanceFilterCount200x300-esql-evals",
+      "operation-type": "esql",
+      "query": "FROM osmgeopoints | EVAL point=TO_GEOPOINT(\"POINT(7.0 55.0)\") | EVAL distance=ST_Distance(location, point) | WHERE distance >= 200000 AND distance <= 300000 | STATS count=COUNT(*)"
+    },
     {
       "name": "distanceFilterCount300",
       "operation-type": "search",