add range agg in noaa and big5 workloads (opensearch-project#310)

* add range agg in noaa Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com> * add range agg Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com> * address comments Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com> --------- Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
vpehkone · Jun 18, 2024 · 12504df · 12504df
1 parent c060115
commit 12504df
Show file tree

Hide file tree

Showing 4 changed files with 113 additions and 0 deletions.
diff --git a/big5/operations/default.json b/big5/operations/default.json
@@ -636,6 +636,76 @@
         }
       }
     },
+    {
+      "name": "range-agg-1",
+      "operation-type": "search",
+      "index": "{{index_name | default('big5')}}",
+      "body": {
+        "size": 0,
+        "aggs": {
+          "tmax": {
+            "range": {
+              "field": "metrics.size",
+              "ranges": [
+                {
+                  "to": -10
+                },
+                {
+                  "from": -10,
+                  "to": 10
+                },
+                {
+                  "from": 10,
+                  "to": 100
+                },
+                {
+                  "from": 100,
+                  "to": 1000
+                },
+                {
+                  "from": 1000,
+                  "to": 2000
+                },
+                {
+                  "from": 2000
+                }
+              ]
+            }
+          }
+        }
+      }
+    },
+    {
+      "name": "range-agg-2",
+      "operation-type": "search",
+      "index": "{{index_name | default('big5')}}",
+      "body": {
+        "size": 0,
+        "aggs": {
+          "tmax": {
+            "range": {
+              "field": "metrics.size",
+              "ranges": [
+                {
+                  "to": 100
+                },
+                {
+                  "from": 100,
+                  "to": 1000
+                },
+                {
+                  "from": 1000,
+                  "to": 2000
+                },
+                {
+                  "from": 2000
+                }
+              ]
+            }
+          }
+        }
+      }
+    },
     {
       "name": "multi_terms-keyword",
       "operation-type": "search",

diff --git a/big5/test_procedures/common/big5-schedule.json b/big5/test_procedures/common/big5-schedule.json
@@ -315,4 +315,18 @@
   "iterations": {{ test_iterations | default(100) | tojson }},
   "target-throughput": {{ target_throughput | default(2) | tojson }},
   "clients": {{ search_clients | default(1) }}
+},
+{
+  "operation": "range-agg-1",
+  "warmup-iterations": {{ warmup_iterations | default(200) | tojson }},
+  "iterations": {{ test_iterations | default(100) | tojson }},
+  "target-throughput": {{ target_throughput | default(2) | tojson }},
+  "clients": {{ search_clients | default(1) }}
+},
+{
+  "operation": "range-agg-2",
+  "warmup-iterations": {{ warmup_iterations | default(200) | tojson }},
+  "iterations": {{ test_iterations | default(100) | tojson }},
+  "target-throughput": {{ target_throughput | default(2) | tojson }},
+  "clients": {{ search_clients | default(1) }}
 }
diff --git a/noaa/operations/default.json b/noaa/operations/default.json
@@ -1128,6 +1128,28 @@
         }
       }
     },
+    {
+      "name": "range-aggregation",
+      "operation-type": "search",
+      "body": {
+        "size": 0,
+        "aggs": {
+          "tmax": {
+            "range": {
+              "field": "TMAX",
+              "ranges": [
+                {"to":   -10},
+                {"from": -10, "to":  0},
+                {"from":   0, "to": 10},
+                {"from":  10, "to": 20},
+                {"from":  20, "to": 30},
+                {"from":  30}
+              ]
+            }
+          }
+        }
+      }
+    },
     {
       "name": "range-numeric-significant-terms",
       "operation-type": "search",

diff --git a/noaa/test_procedures/default.json b/noaa/test_procedures/default.json
@@ -752,6 +752,13 @@
           "iterations": 50,
           "target-interval": 4
         },
+        {
+          "operation": "range-aggregation",
+          "clients": 1,
+          "warmup-iterations": 10,
+          "iterations": 50,
+          "target-interval": 3
+        },
         {
           "operation": "range-numeric-significant-terms",
           "clients": 1,