Merge branch 'main' into add-cardi-agg

opensearch-project · Jun 18, 2024 · 3e7ae2a · 3e7ae2a
2 parents abaad42 + 12504df
commit 3e7ae2a
Show file tree

Hide file tree

Showing 16 changed files with 150 additions and 1,165 deletions.
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
@@ -4,11 +4,12 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 
 ## Current Maintainers
 
-| Maintainer              | GitHub ID                                             | Affiliation |
-| ----------------------- | ----------------------------------------------------- | ----------- |
-| Ian Hoang               | [IanHoang](https://github.com/IanHoang)               | Amazon      |
-| Govind Kamat            | [gkamat](https://github.com/gkamat)                   | Amazon      |
-| Mingyang Shi            | [beaioun](https://github.com/beaioun)                 | OSCI        |
-| Chinmay Gadgil          | [cgchinmay](https://github.com/cgchinmay)             | Amazon      |
-| Rishabh Singh           | [rishabh6788](https://github.com/rishabh6788)         | Amazon      |
-| Vijayan Balasubramanian | [VijayanB](https://github.com/VijayanB)               | Amazon      |
+| Maintainer              | GitHub ID                                             | Affiliation | Email Address                     |
+| ----------------------- | ----------------------------------------------------- | ----------- | --------------------------------- |
+| Ian Hoang               | [IanHoang](https://github.com/IanHoang)               | Amazon      | ianhoang16@gmail.com              |
+| Govind Kamat            | [gkamat](https://github.com/gkamat)                   | Amazon      | govind_kamat@yahoo.com            |
+| Mingyang Shi            | [beaioun](https://github.com/beaioun)                 | OSCI        | mmyyshi@gmail.com                 |
+| Chinmay Gadgil          | [cgchinmay](https://github.com/cgchinmay)             | Amazon      | chinmay5j@gmail.com               |
+| Rishabh Singh           | [rishabh6788](https://github.com/rishabh6788)         | Amazon      | rishabhksingh@gmail.com           |
+| Vijayan Balasubramanian | [VijayanB](https://github.com/VijayanB)               | Amazon      | vijayan.balasubramanian@gmail.com |
+
diff --git a/big5/README.md b/big5/README.md
@@ -65,7 +65,7 @@ This workload allows the following parameters to be specified using `--workload-
 * `requests_cache_enabled` (default: false): Whether the requests cache should be enabled.
 * `search_clients`: (default: 1): Number of clients that issue search requests.
 * `test_iterations` (default: 200): Number of test iterations per query that will have their latency and throughput measured.
-* `target_throughput` (default: 2): Target throughput for each query operation in requests per second, use "" for no limit.
+* `target_throughput` (default: 2): Target throughput for each query operation in requests per second, use 0 or "" for no throughput throttling.
 * `warmup_iterations` (default: 100): Number of warmup query iterations prior to actual measurements commencing.
 
 

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
@@ -316,6 +316,20 @@
   "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) }}
+},
 {
   "operation": "cardinality-agg-low",
   "warmup-iterations": {{ warmup_iterations | default(200) | tojson }},
@@ -329,4 +343,4 @@
   "iterations": {{ test_iterations | default(100) | tojson }},
   "target-throughput": {{ target_throughput | default(2) | tojson }},
   "clients": {{ search_clients | default(1) }}
-}
+}
diff --git a/big5/workload.json b/big5/workload.json
@@ -35,7 +35,7 @@
             "compressed-bytes": 53220934846,
             "uncompressed-bytes": 943679382267
           }
-        {% elif corpus_size == 1000-full %}
+        {% elif corpus_size == "1000-full" %}
           {
             "source-file": "documents-1000-full.json.bz2",
             "document-count": 1160800000,

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,

diff --git a/noaa_semantic_search/README.md b/noaa_semantic_search/README.md
@@ -67,13 +67,13 @@ opensearch-benchmark execute-test \
     --kill-running-processes
 ```
 
-Below is another example of command. In this example we refer to a workload by its name, use file for workflow params and choose a non-default test procedure.
+Below is another example of command. In this example we refer to a workload by its name, use file for workflow params and choose a non-default test procedure. Keep workload parameters in file is helping to keep command for workload short and decreases chance of errors. Users are welcome to use one of example parameter files from `params` folder
 
 ```
 # OpenSearch Cluster End point url with hostname and port
 export ENDPOINT=  
 # Absolute file path of Workload param file
-export PARAMS_FILE=
+export PARAMS_FILE=./noaa_semantic_search/params/one_replica_with_concurrent_segment_search.json
 
 opensearch-benchmark execute-test \
     --target-hosts $ENDPOINT \