From 90943b527908b0a2c74bfd9ffbac67124f1ae7c1 Mon Sep 17 00:00:00 2001 From: John Verwolf Date: Wed, 19 Jul 2023 15:34:14 +0200 Subject: [PATCH 01/24] NYC Taxis append-no-conflicts --- nyc_taxis/operations/default.json | 240 ++++++++++++++++++++---------- 1 file changed, 160 insertions(+), 80 deletions(-) diff --git a/nyc_taxis/operations/default.json b/nyc_taxis/operations/default.json index 72aae95f..f77292ba 100644 --- a/nyc_taxis/operations/default.json +++ b/nyc_taxis/operations/default.json @@ -37,108 +37,188 @@ }, { "name": "default_1k", - "operation-type": "search", - "body": { - "query": { - "match_all": {} - }, - "size": 1000 + "operation": { + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "operation-type": "raw-request", + "method": "POST", + "path": "/_internal/blob_caches/clear" + }, + { + "operation-type": "search", + "body": { + "query": { + "match_all": {} + }, + "size": 1000 + } + } + ] + } + ] } }, { "name": "range", - "operation-type": "search", - "body": { - "query": { - "range": { - "total_amount": { - "gte": 5, - "lt": 15 - } + "operation": { + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "operation-type": "raw-request", + "method": "POST", + "path": "/_internal/blob_caches/clear" + }, + { + "operation-type": "search", + "body": { + "query": { + "range": { + "total_amount": { + "gte": 5, + "lt": 15 + } + } + } + } + } + ] } - } + ] } }, { "name": "distance_amount_agg", - "operation-type": "search", - "body": { - "size": 0, - "query": { - "bool": { - "filter": { - "range": { - "trip_distance": { - "lt": 50, - "gte": 0 - } - } - } - } - }, - "aggs": { - "distance_histo": { - "histogram": { - "field": "trip_distance", - "interval": 1 - }, - "aggs": { - "total_amount_stats": { - "stats": { - "field": "total_amount" + "operation": { + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "operation-type": "raw-request", + "method": "POST", + "path": "/_internal/blob_caches/clear" + }, + { + "operation-type": "search", + "body": { + "size": 0, + "query": { + "bool": { + "filter": { + "range": { + "trip_distance": { + "lt": 50, + "gte": 0 + } + } + } + } + }, + "aggs": { + "distance_histo": { + "histogram": { + "field": "trip_distance", + "interval": 1 + }, + "aggs": { + "total_amount_stats": { + "stats": { + "field": "total_amount" + } + } + } + } + } } } - } + ] } - } + ] } }, { "name": "autohisto_agg", - "operation-type": "search", - "body": { - "size": 0, - "query": { - "range": { - "dropoff_datetime": { - "gte": "01/01/2015", - "lte": "21/01/2015", - "format": "dd/MM/yyyy" - } - } - }, - "aggs": { - "dropoffs_over_time": { - "auto_date_histogram": { - "field": "dropoff_datetime", - "buckets": 20 - } + "operation": { + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "operation-type": "raw-request", + "method": "POST", + "path": "/_internal/blob_caches/clear" + }, + { + "operation-type": "search", + "body": { + "size": 0, + "query": { + "range": { + "dropoff_datetime": { + "gte": "01/01/2015", + "lte": "21/01/2015", + "format": "dd/MM/yyyy" + } + } + }, + "aggs": { + "dropoffs_over_time": { + "auto_date_histogram": { + "field": "dropoff_datetime", + "buckets": 20 + } + } + } + } + } + ] } - } + ] } }, { "name": "date_histogram_agg", - "operation-type": "search", - "body": { - "size": 0, - "query": { - "range": { - "dropoff_datetime": { - "gte": "01/01/2015", - "lte": "21/01/2015", - "format": "dd/MM/yyyy" - } - } - }, - "aggs": { - "dropoffs_over_time": { - "date_histogram": { - "field": "dropoff_datetime", - "calendar_interval": "day" - } + "operation": { + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "operation-type": "raw-request", + "method": "POST", + "path": "/_internal/blob_caches/clear" + }, + { + "operation-type": "search", + "body": { + "size": 0, + "query": { + "range": { + "dropoff_datetime": { + "gte": "01/01/2015", + "lte": "21/01/2015", + "format": "dd/MM/yyyy" + } + } + }, + "aggs": { + "dropoffs_over_time": { + "date_histogram": { + "field": "dropoff_datetime", + "calendar_interval": "day" + } + } + } + } + } + ] } - } + ] } }, { From 92fde9957e647d55b230a877a2ddd14eccbeea1b Mon Sep 17 00:00:00 2001 From: John Verwolf Date: Thu, 20 Jul 2023 10:01:49 +0200 Subject: [PATCH 02/24] NYC Taxis append-no-conflicts --- nyc_taxis/operations/default.json | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/nyc_taxis/operations/default.json b/nyc_taxis/operations/default.json index f77292ba..12744dc3 100644 --- a/nyc_taxis/operations/default.json +++ b/nyc_taxis/operations/default.json @@ -1,4 +1,4 @@ - { +[{ "name": "index", "operation-type": "bulk", "bulk-size": {{bulk_size | default(10000)}}, @@ -28,11 +28,27 @@ }, { "name": "default", - "operation-type": "search", - "body": { - "query": { - "match_all": {} - } + "operation": { + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "operation-type": "raw-request", + "method": "POST", + "path": "/_internal/blob_caches/clear" + }, + { + "operation-type": "search", + "body": { + "query": + "match_all": {} + } + } + } + ] + } + ] } }, { From 81fdf7c3fbc387d210e499e08732a7a47a478876 Mon Sep 17 00:00:00 2001 From: John Verwolf Date: Thu, 20 Jul 2023 10:02:35 +0200 Subject: [PATCH 03/24] Dense Vector, index and search --- dense_vector/operations/default.json | 202 ++++++++++++++++++++++----- 1 file changed, 165 insertions(+), 37 deletions(-) diff --git a/dense_vector/operations/default.json b/dense_vector/operations/default.json index e4a48f32..4b104a4b 100644 --- a/dense_vector/operations/default.json +++ b/dense_vector/operations/default.json @@ -1,61 +1,189 @@ { "name": "knn-search-10-100", - "operation-type": "search", - "param-source": "knn-param-source", - "k": 10, - "num-candidates": 100 + "operation": { + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "operation-type": "raw-request", + "method": "POST", + "path": "/_internal/blob_caches/clear" + }, + { + "operation-type": "search", + "param-source": "knn-param-source", + "k": 10, + "num-candidates": 100 + } + ] + } + ] + } }, { "name": "knn-search-100-1000", - "operation-type": "search", - "param-source": "knn-param-source", - "k": 100, - "num-candidates": 1000 + "operation": { + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "operation-type": "raw-request", + "method": "POST", + "path": "/_internal/blob_caches/clear" + }, + { + "operation-type": "search", + "param-source": "knn-param-source", + "k": 100, + "num-candidates": 1000 + } + ] + } + ] + } }, { "name": "script-score-query", - "operation-type": "search", - "param-source": "knn-param-source", - "k": 10, - "exact": true + "operation": { + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "operation-type": "raw-request", + "method": "POST", + "path": "/_internal/blob_caches/clear" + }, + { + "operation-type": "search", + "param-source": "knn-param-source", + "k": 10, + "exact": true + } + ] + } + ] + } }, { "name": "knn-recall-10-100", - "operation-type": "knn-recall", - "param-source": "knn-recall-param-source", - "k": 10, - "num-candidates": 100, - "include-in-reporting": false + "operation": { + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "operation-type": "raw-request", + "method": "POST", + "path": "/_internal/blob_caches/clear" + }, + { + "operation-type": "knn-recall", + "param-source": "knn-recall-param-source", + "k": 10, + "num-candidates": 100, + "include-in-reporting": false + } + ] + } + ] + } }, { "name": "knn-recall-100-1000", - "operation-type": "knn-recall", - "param-source": "knn-recall-param-source", - "k": 100, - "num-candidates": 1000, - "include-in-reporting": false + "operation": { + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "operation-type": "raw-request", + "method": "POST", + "path": "/_internal/blob_caches/clear" + }, + { + "operation-type": "knn-recall", + "param-source": "knn-recall-param-source", + "k": 100, + "num-candidates": 1000, + "include-in-reporting": false + } + ] + } + ] + } }, { "name": "knn-recall-10-10", - "operation-type": "knn-recall", - "param-source": "knn-recall-param-source", - "k": 10, - "num-candidates": 10, - "include-in-reporting": false + "operation": { + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "operation-type": "raw-request", + "method": "POST", + "path": "/_internal/blob_caches/clear" + }, + { + "operation-type": "knn-recall", + "param-source": "knn-recall-param-source", + "k": 10, + "num-candidates": 10, + "include-in-reporting": false + } + ] + } + ] + } }, { "name": "knn-recall-100-100", - "operation-type": "knn-recall", - "param-source": "knn-recall-param-source", - "k": 100, - "num-candidates": 100, - "include-in-reporting": false + "operation": { + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "operation-type": "raw-request", + "method": "POST", + "path": "/_internal/blob_caches/clear" + }, + { + "operation-type": "knn-recall", + "param-source": "knn-recall-param-source", + "k": 100, + "num-candidates": 100, + "include-in-reporting": false + } + ] + } + ] + } }, { "name": "knn-recall-1000-1000", - "operation-type": "knn-recall", - "param-source": "knn-recall-param-source", - "k": 1000, - "num-candidates": 1000, - "include-in-reporting": false + "operation": { + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "operation-type": "raw-request", + "method": "POST", + "path": "/_internal/blob_caches/clear" + }, + { + "operation-type": "knn-recall", + "param-source": "knn-recall-param-source", + "k": 1000, + "num-candidates": 1000, + "include-in-reporting": false + } + ] + } + ] + } } From 2d336e831ab29a874734d1265fdec64e3370a12b Mon Sep 17 00:00:00 2001 From: John Verwolf Date: Thu, 20 Jul 2023 12:03:41 +0200 Subject: [PATCH 04/24] Fix NCY Track bug with missing paren --- nyc_taxis/operations/default.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nyc_taxis/operations/default.json b/nyc_taxis/operations/default.json index 12744dc3..b9403e42 100644 --- a/nyc_taxis/operations/default.json +++ b/nyc_taxis/operations/default.json @@ -41,7 +41,7 @@ { "operation-type": "search", "body": { - "query": + "query": { "match_all": {} } } From 867d5a4b2be27e38bc5ea13248f0dd4696e3743b Mon Sep 17 00:00:00 2001 From: John Verwolf Date: Thu, 20 Jul 2023 12:20:36 +0200 Subject: [PATCH 05/24] Fix NCY Track bug --- nyc_taxis/operations/default.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nyc_taxis/operations/default.json b/nyc_taxis/operations/default.json index b9403e42..391e9080 100644 --- a/nyc_taxis/operations/default.json +++ b/nyc_taxis/operations/default.json @@ -1,4 +1,4 @@ -[{ + { "name": "index", "operation-type": "bulk", "bulk-size": {{bulk_size | default(10000)}}, From 44ebd1fe881775ace962019a1d75822312b9a6e7 Mon Sep 17 00:00:00 2001 From: John Verwolf Date: Thu, 20 Jul 2023 16:01:15 +0200 Subject: [PATCH 06/24] Fix NCY Track bug --- nyc_taxis/operations/default.json | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/nyc_taxis/operations/default.json b/nyc_taxis/operations/default.json index 391e9080..8d77efb7 100644 --- a/nyc_taxis/operations/default.json +++ b/nyc_taxis/operations/default.json @@ -27,8 +27,7 @@ "include-in-reporting": false }, { - "name": "default", - "operation": { + "name": "default", "operation-type": "composite", "requests": [ { @@ -49,11 +48,9 @@ ] } ] - } }, { "name": "default_1k", - "operation": { "operation-type": "composite", "requests": [ { @@ -75,11 +72,9 @@ ] } ] - } }, { "name": "range", - "operation": { "operation-type": "composite", "requests": [ { @@ -105,11 +100,9 @@ ] } ] - } }, { "name": "distance_amount_agg", - "operation": { "operation-type": "composite", "requests": [ { @@ -155,11 +148,9 @@ ] } ] - } }, { "name": "autohisto_agg", - "operation": { "operation-type": "composite", "requests": [ { @@ -195,11 +186,9 @@ ] } ] - } }, { "name": "date_histogram_agg", - "operation": { "operation-type": "composite", "requests": [ { @@ -235,7 +224,6 @@ ] } ] - } }, { "name": "date_histogram_calendar_interval", From faac4b01367f614daa308b394d97fdbf48329fe3 Mon Sep 17 00:00:00 2001 From: John Verwolf Date: Mon, 24 Jul 2023 16:46:17 -0700 Subject: [PATCH 07/24] Fix NCY Track bug --- nyc_taxis/operations/default.json | 50 +++++++++++++++++++++++-------- 1 file changed, 37 insertions(+), 13 deletions(-) diff --git a/nyc_taxis/operations/default.json b/nyc_taxis/operations/default.json index 8d77efb7..a95245bd 100644 --- a/nyc_taxis/operations/default.json +++ b/nyc_taxis/operations/default.json @@ -27,17 +27,20 @@ "include-in-reporting": false }, { - "name": "default", + "name": "default", + "operation": { "operation-type": "composite", "requests": [ { "stream": [ { + "name": "cache-clear", "operation-type": "raw-request", - "method": "POST", - "path": "/_internal/blob_caches/clear" + "path": "/_internal/blob_caches/clear", + "method": "POST" }, { + "name": "default-op", "operation-type": "search", "body": { "query": { @@ -48,19 +51,23 @@ ] } ] + } }, { "name": "default_1k", + "operation": { "operation-type": "composite", "requests": [ { "stream": [ { + "name": "cache-clear", "operation-type": "raw-request", - "method": "POST", - "path": "/_internal/blob_caches/clear" + "path": "/_internal/blob_caches/clear", + "method": "POST" }, { + "name": "default_1k-op", "operation-type": "search", "body": { "query": { @@ -72,19 +79,23 @@ ] } ] + } }, { "name": "range", + "operation": { "operation-type": "composite", "requests": [ { "stream": [ { + "name": "cache-clear", "operation-type": "raw-request", - "method": "POST", - "path": "/_internal/blob_caches/clear" + "path": "/_internal/blob_caches/clear", + "method": "POST" }, { + "name": "range-op", "operation-type": "search", "body": { "query": { @@ -100,19 +111,23 @@ ] } ] + } }, { "name": "distance_amount_agg", + "operation": { "operation-type": "composite", "requests": [ { "stream": [ { + "name": "cache-clear", "operation-type": "raw-request", - "method": "POST", - "path": "/_internal/blob_caches/clear" + "path": "/_internal/blob_caches/clear", + "method": "POST" }, { + "name": "distance_amount_agg-op", "operation-type": "search", "body": { "size": 0, @@ -148,19 +163,23 @@ ] } ] + } }, { "name": "autohisto_agg", + "operation": { "operation-type": "composite", "requests": [ { "stream": [ { + "name": "cache-clear", "operation-type": "raw-request", - "method": "POST", - "path": "/_internal/blob_caches/clear" + "path": "/_internal/blob_caches/clear", + "method": "POST" }, { + "name": "autohisto_agg-op", "operation-type": "search", "body": { "size": 0, @@ -186,19 +205,23 @@ ] } ] + } }, { "name": "date_histogram_agg", + "operation": { "operation-type": "composite", "requests": [ { "stream": [ { + "name": "cache-clear", "operation-type": "raw-request", - "method": "POST", - "path": "/_internal/blob_caches/clear" + "path": "/_internal/blob_caches/clear", + "method": "POST" }, { + "name": "date_histogram_agg-op", "operation-type": "search", "body": { "size": 0, @@ -224,6 +247,7 @@ ] } ] + } }, { "name": "date_histogram_calendar_interval", From 615d5d791e8855fcd820bf03585888e2f5b8d787 Mon Sep 17 00:00:00 2001 From: John Verwolf Date: Tue, 25 Jul 2023 09:32:45 -0700 Subject: [PATCH 08/24] Add percolator cold cache implementation --- percolator/challenges/default.json | 210 ++++++++++++++++++++++++----- 1 file changed, 177 insertions(+), 33 deletions(-) diff --git a/percolator/challenges/default.json b/percolator/challenges/default.json index ca11ff48..b4cda474 100644 --- a/percolator/challenges/default.json +++ b/percolator/challenges/default.json @@ -59,53 +59,197 @@ } }, { - "operation": "percolator_with_content_president_bush", - "warmup-iterations": 100, - "iterations": 100, - "target-throughput": 50 + "name": "percolator_with_content_president_bush", + "operation": { + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "operation": "percolator_with_content_president_bush-op", + "warmup-iterations": 100, + "iterations": 100, + "target-throughput": 50 + } + ] + } + ] + } }, { - "operation": "percolator_with_content_saddam_hussein", - "warmup-iterations": 100, - "iterations": 100, - "target-throughput": 50 + "name": "percolator_with_content_saddam_hussein", + "operation": { + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "operation": "percolator_with_content_saddam_hussein-op", + "warmup-iterations": 100, + "iterations": 100, + "target-throughput": 50 + } + ] + } + ] + } }, { - "operation": "percolator_with_content_hurricane_katrina", - "warmup-iterations": 100, - "iterations": 100, - "target-throughput": 50 + "name": "percolator_with_content_hurricane_katrina", + "operation": { + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "operation": "percolator_with_content_hurricane_katrina-op", + "warmup-iterations": 100, + "iterations": 100, + "target-throughput": 50 + } + ] + } + ] + } }, { - "operation": "percolator_with_content_google", - "warmup-iterations": 100, - "iterations": 100, - "target-throughput": 27 + "name": "default", + "operation": { + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "operation": "percolator_with_content_google", + "warmup-iterations": 100, + "iterations": 100, + "target-throughput": 27 + } + ] + } + ] + } }, { - "operation": "percolator_no_score_with_content_google", - "warmup-iterations": 100, - "iterations": 100, - "target-throughput": 100 + "name": "percolator_no_score_with_content_google", + "operation": { + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "operation": "percolator_no_score_with_content_google-op", + "warmup-iterations": 100, + "iterations": 100, + "target-throughput": 100 + } + ] + } + ] + } }, { - "operation": "percolator_with_highlighting", - "warmup-iterations": 100, - "iterations": 100, - "target-throughput": 50 + "name": "percolator_with_highlighting", + "operation": { + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "operation": "percolator_with_highlighting-op", + "warmup-iterations": 100, + "iterations": 100, + "target-throughput": 50 + } + ] + } + ] + } }, { - "operation": "percolator_with_content_ignore_me", - "warmup-iterations": 10, - "iterations": 100, - "#COMMENT": "Be aware that we specify *target-interval* here! This means we issue one query every 12 seconds", - "target-interval": 12 + "name": "percolator_with_content_ignore_me", + "operation": { + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "operation": "percolator_with_content_ignore_me-op", + "warmup-iterations": 10, + "iterations": 100, + "#COMMENT": "Be aware that we specify *target-interval* here! This means we issue one query every 12 seconds", + "target-interval": 12 + } + ] + } + ] + } }, { - "operation": "percolator_no_score_with_content_ignore_me", - "warmup-iterations": 100, - "iterations": 100, - "target-throughput": 15 + "name": "percolator_no_score_with_content_ignore_me", + "operation": { + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "operation": "percolator_no_score_with_content_ignore_me-op", + "warmup-iterations": 100, + "iterations": 100, + "target-throughput": 15 + } + ] + } + ] + } } ] } From 060b4cf565de658efa8d3f05bc1e08dbb3db68b4 Mon Sep 17 00:00:00 2001 From: John Verwolf Date: Tue, 25 Jul 2023 16:17:10 -0700 Subject: [PATCH 09/24] wip --- nyc_taxis/operations/default.json | 346 ++++++++++++++---------------- 1 file changed, 167 insertions(+), 179 deletions(-) diff --git a/nyc_taxis/operations/default.json b/nyc_taxis/operations/default.json index a95245bd..003711a7 100644 --- a/nyc_taxis/operations/default.json +++ b/nyc_taxis/operations/default.json @@ -28,226 +28,214 @@ }, { "name": "default", - "operation": { - "operation-type": "composite", - "requests": [ - { - "stream": [ - { - "name": "cache-clear", - "operation-type": "raw-request", - "path": "/_internal/blob_caches/clear", - "method": "POST" - }, - { - "name": "default-op", - "operation-type": "search", - "body": { - "query": { - "match_all": {} - } + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "default-op", + "operation-type": "search", + "body": { + "query": { + "match_all": {} } } - ] - } - ] - } + } + ] + } + ] }, { "name": "default_1k", - "operation": { - "operation-type": "composite", - "requests": [ - { - "stream": [ - { - "name": "cache-clear", - "operation-type": "raw-request", - "path": "/_internal/blob_caches/clear", - "method": "POST" - }, - { - "name": "default_1k-op", - "operation-type": "search", - "body": { - "query": { - "match_all": {} - }, - "size": 1000 - } + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "default_1k-op", + "operation-type": "search", + "body": { + "query": { + "match_all": {} + }, + "size": 1000 } - ] - } - ] - } + } + ] + } + ] }, { "name": "range", - "operation": { - "operation-type": "composite", - "requests": [ - { - "stream": [ - { - "name": "cache-clear", - "operation-type": "raw-request", - "path": "/_internal/blob_caches/clear", - "method": "POST" - }, - { - "name": "range-op", - "operation-type": "search", - "body": { - "query": { - "range": { - "total_amount": { - "gte": 5, - "lt": 15 - } + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "range-op", + "operation-type": "search", + "body": { + "query": { + "range": { + "total_amount": { + "gte": 5, + "lt": 15 } } } } - ] - } - ] - } + } + ] + } + ] }, { "name": "distance_amount_agg", - "operation": { - "operation-type": "composite", - "requests": [ - { - "stream": [ - { - "name": "cache-clear", - "operation-type": "raw-request", - "path": "/_internal/blob_caches/clear", - "method": "POST" - }, - { - "name": "distance_amount_agg-op", - "operation-type": "search", - "body": { - "size": 0, - "query": { - "bool": { - "filter": { - "range": { - "trip_distance": { - "lt": 50, - "gte": 0 - } + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "distance_amount_agg-op", + "operation-type": "search", + "body": { + "size": 0, + "query": { + "bool": { + "filter": { + "range": { + "trip_distance": { + "lt": 50, + "gte": 0 } } } - }, - "aggs": { - "distance_histo": { - "histogram": { - "field": "trip_distance", - "interval": 1 - }, - "aggs": { - "total_amount_stats": { - "stats": { - "field": "total_amount" - } + } + }, + "aggs": { + "distance_histo": { + "histogram": { + "field": "trip_distance", + "interval": 1 + }, + "aggs": { + "total_amount_stats": { + "stats": { + "field": "total_amount" } } } } } } - ] - } - ] - } + } + ] + } + ] }, { "name": "autohisto_agg", - "operation": { - "operation-type": "composite", - "requests": [ - { - "stream": [ - { - "name": "cache-clear", - "operation-type": "raw-request", - "path": "/_internal/blob_caches/clear", - "method": "POST" - }, - { - "name": "autohisto_agg-op", - "operation-type": "search", - "body": { - "size": 0, - "query": { - "range": { - "dropoff_datetime": { - "gte": "01/01/2015", - "lte": "21/01/2015", - "format": "dd/MM/yyyy" - } + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "autohisto_agg-op", + "operation-type": "search", + "body": { + "size": 0, + "query": { + "range": { + "dropoff_datetime": { + "gte": "01/01/2015", + "lte": "21/01/2015", + "format": "dd/MM/yyyy" } - }, - "aggs": { - "dropoffs_over_time": { - "auto_date_histogram": { - "field": "dropoff_datetime", - "buckets": 20 - } + } + }, + "aggs": { + "dropoffs_over_time": { + "auto_date_histogram": { + "field": "dropoff_datetime", + "buckets": 20 } } } } - ] - } - ] - } + } + ] + } + ] }, { "name": "date_histogram_agg", - "operation": { - "operation-type": "composite", - "requests": [ - { - "stream": [ - { - "name": "cache-clear", - "operation-type": "raw-request", - "path": "/_internal/blob_caches/clear", - "method": "POST" - }, - { - "name": "date_histogram_agg-op", - "operation-type": "search", - "body": { - "size": 0, - "query": { - "range": { - "dropoff_datetime": { - "gte": "01/01/2015", - "lte": "21/01/2015", - "format": "dd/MM/yyyy" - } + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "date_histogram_agg-op", + "operation-type": "search", + "body": { + "size": 0, + "query": { + "range": { + "dropoff_datetime": { + "gte": "01/01/2015", + "lte": "21/01/2015", + "format": "dd/MM/yyyy" } - }, - "aggs": { - "dropoffs_over_time": { - "date_histogram": { - "field": "dropoff_datetime", - "calendar_interval": "day" - } + } + }, + "aggs": { + "dropoffs_over_time": { + "date_histogram": { + "field": "dropoff_datetime", + "calendar_interval": "day" } } } } - ] - } - ] - } + } + ] + } + ] }, { "name": "date_histogram_calendar_interval", From 949a382a51458e04c8278e9a232a44de82aeea46 Mon Sep 17 00:00:00 2001 From: John Verwolf Date: Tue, 25 Jul 2023 21:39:43 -0700 Subject: [PATCH 10/24] wip --- nyc_taxis/operations/default.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nyc_taxis/operations/default.json b/nyc_taxis/operations/default.json index 003711a7..a669959c 100644 --- a/nyc_taxis/operations/default.json +++ b/nyc_taxis/operations/default.json @@ -41,6 +41,7 @@ { "name": "default-op", "operation-type": "search", + "index": "nyc_taxis", "body": { "query": { "match_all": {} @@ -66,6 +67,7 @@ { "name": "default_1k-op", "operation-type": "search", + "index": "nyc_taxis", "body": { "query": { "match_all": {} @@ -92,6 +94,7 @@ { "name": "range-op", "operation-type": "search", + "index": "nyc_taxis", "body": { "query": { "range": { @@ -122,6 +125,7 @@ { "name": "distance_amount_agg-op", "operation-type": "search", + "index": "nyc_taxis", "body": { "size": 0, "query": { @@ -172,6 +176,7 @@ { "name": "autohisto_agg-op", "operation-type": "search", + "index": "nyc_taxis", "body": { "size": 0, "query": { @@ -211,6 +216,7 @@ }, { "name": "date_histogram_agg-op", + "index": "nyc_taxis", "operation-type": "search", "body": { "size": 0, From bf04ad25c1fed081e3c75f2693df07c8878ef5a8 Mon Sep 17 00:00:00 2001 From: John Verwolf Date: Wed, 26 Jul 2023 07:41:33 -0700 Subject: [PATCH 11/24] Revert percolator changes --- percolator/challenges/default.json | 358 +++++++++-------------------- 1 file changed, 107 insertions(+), 251 deletions(-) diff --git a/percolator/challenges/default.json b/percolator/challenges/default.json index b4cda474..90553b9c 100644 --- a/percolator/challenges/default.json +++ b/percolator/challenges/default.json @@ -1,255 +1,111 @@ +{ + "name": "append-no-conflicts", + "description": "Indexes the whole document corpus using Elasticsearch default settings. We only adjust the number of replicas as we benchmark a single node cluster and Rally will only start the benchmark if the cluster turns green and we want to ensure that we don't use the query cache. Document ids are unique so all index operations are append only. After that a couple of queries are run.", + "default": true, + "schedule": [ { - "name": "append-no-conflicts", - "description": "Indexes the whole document corpus using Elasticsearch default settings. We only adjust the number of replicas as we benchmark a single node cluster and Rally will only start the benchmark if the cluster turns green and we want to ensure that we don't use the query cache. Document ids are unique so all index operations are append only. After that a couple of queries are run.", - "default": true, - "schedule": [ - { - "operation": "delete-index" - }, - { - "operation": { - "operation-type": "create-index", - "settings": {{index_settings | default({}) | tojson}} - } - }, - { - "name": "check-cluster-health", - "operation": { - "operation-type": "cluster-health", - "index": "queries", - "request-params": { - "wait_for_status": "{{cluster_health | default('green')}}", - "wait_for_no_relocating_shards": "true" - }, - "retry-until-success": true - } - }, - { - "operation": "index", - "#COMMENT": "This is an incredibly short warmup time period but it is necessary to get also measurement samples. As this benchmark is rather about search than indexing this is ok.", - "warmup-time-period": 10, - "clients": {{bulk_indexing_clients | default(8)}}, - "ignore-response-error-level": "{{error_level | default('non-fatal')}}" - }, - { - "name": "refresh-after-index", - "operation": "refresh" - }, - { - "operation": { - "operation-type": "force-merge", - "request-timeout": 7200 - } - }, - { - "name": "refresh-after-force-merge", - "operation": "refresh" - }, - { - "name": "wait-until-merges-finish", - "operation": { - "operation-type": "index-stats", - "index": "_all", - "condition": { - "path": "_all.total.merges.current", - "expected-value": 0 - }, - "retry-until-success": true, - "include-in-reporting": false - } - }, - { - "name": "percolator_with_content_president_bush", - "operation": { - "operation-type": "composite", - "requests": [ - { - "stream": [ - { - "name": "cache-clear", - "operation-type": "raw-request", - "path": "/_internal/blob_caches/clear", - "method": "POST" - }, - { - "operation": "percolator_with_content_president_bush-op", - "warmup-iterations": 100, - "iterations": 100, - "target-throughput": 50 - } - ] - } - ] - } - }, - { - "name": "percolator_with_content_saddam_hussein", - "operation": { - "operation-type": "composite", - "requests": [ - { - "stream": [ - { - "name": "cache-clear", - "operation-type": "raw-request", - "path": "/_internal/blob_caches/clear", - "method": "POST" - }, - { - "operation": "percolator_with_content_saddam_hussein-op", - "warmup-iterations": 100, - "iterations": 100, - "target-throughput": 50 - } - ] - } - ] - } - }, - { - "name": "percolator_with_content_hurricane_katrina", - "operation": { - "operation-type": "composite", - "requests": [ - { - "stream": [ - { - "name": "cache-clear", - "operation-type": "raw-request", - "path": "/_internal/blob_caches/clear", - "method": "POST" - }, - { - "operation": "percolator_with_content_hurricane_katrina-op", - "warmup-iterations": 100, - "iterations": 100, - "target-throughput": 50 - } - ] - } - ] - } - }, - { - "name": "default", - "operation": { - "operation-type": "composite", - "requests": [ - { - "stream": [ - { - "name": "cache-clear", - "operation-type": "raw-request", - "path": "/_internal/blob_caches/clear", - "method": "POST" - }, - { - "operation": "percolator_with_content_google", - "warmup-iterations": 100, - "iterations": 100, - "target-throughput": 27 - } - ] - } - ] - } - }, - { - "name": "percolator_no_score_with_content_google", - "operation": { - "operation-type": "composite", - "requests": [ - { - "stream": [ - { - "name": "cache-clear", - "operation-type": "raw-request", - "path": "/_internal/blob_caches/clear", - "method": "POST" - }, - { - "operation": "percolator_no_score_with_content_google-op", - "warmup-iterations": 100, - "iterations": 100, - "target-throughput": 100 - } - ] - } - ] - } - }, - { - "name": "percolator_with_highlighting", - "operation": { - "operation-type": "composite", - "requests": [ - { - "stream": [ - { - "name": "cache-clear", - "operation-type": "raw-request", - "path": "/_internal/blob_caches/clear", - "method": "POST" - }, - { - "operation": "percolator_with_highlighting-op", - "warmup-iterations": 100, - "iterations": 100, - "target-throughput": 50 - } - ] - } - ] - } + "operation": "delete-index" + }, + { + "operation": { + "operation-type": "create-index", + "settings": {{index_settings | default({}) | tojson}} + } + }, + { + "name": "check-cluster-health", + "operation": { + "operation-type": "cluster-health", + "index": "queries", + "request-params": { + "wait_for_status": "{{cluster_health | default('green')}}", + "wait_for_no_relocating_shards": "true" }, - { - "name": "percolator_with_content_ignore_me", - "operation": { - "operation-type": "composite", - "requests": [ - { - "stream": [ - { - "name": "cache-clear", - "operation-type": "raw-request", - "path": "/_internal/blob_caches/clear", - "method": "POST" - }, - { - "operation": "percolator_with_content_ignore_me-op", - "warmup-iterations": 10, - "iterations": 100, - "#COMMENT": "Be aware that we specify *target-interval* here! This means we issue one query every 12 seconds", - "target-interval": 12 - } - ] - } - ] - } + "retry-until-success": true + } + }, + { + "operation": "index", + "#COMMENT": "This is an incredibly short warmup time period but it is necessary to get also measurement samples. As this benchmark is rather about search than indexing this is ok.", + "warmup-time-period": 10, + "clients": {{bulk_indexing_clients | default(8)}}, + "ignore-response-error-level": "{{error_level | default('non-fatal')}}" + }, + { + "name": "refresh-after-index", + "operation": "refresh" + }, + { + "operation": { + "operation-type": "force-merge", + "request-timeout": 7200 + } + }, + { + "name": "refresh-after-force-merge", + "operation": "refresh" + }, + { + "name": "wait-until-merges-finish", + "operation": { + "operation-type": "index-stats", + "index": "_all", + "condition": { + "path": "_all.total.merges.current", + "expected-value": 0 }, - { - "name": "percolator_no_score_with_content_ignore_me", - "operation": { - "operation-type": "composite", - "requests": [ - { - "stream": [ - { - "name": "cache-clear", - "operation-type": "raw-request", - "path": "/_internal/blob_caches/clear", - "method": "POST" - }, - { - "operation": "percolator_no_score_with_content_ignore_me-op", - "warmup-iterations": 100, - "iterations": 100, - "target-throughput": 15 - } - ] - } - ] - } - } - ] + "retry-until-success": true, + "include-in-reporting": false + } + }, + { + "operation": "percolator_with_content_president_bush", + "warmup-iterations": 100, + "iterations": 100, + "target-throughput": 50 + }, + { + "operation": "percolator_with_content_saddam_hussein", + "warmup-iterations": 100, + "iterations": 100, + "target-throughput": 50 + }, + { + "operation": "percolator_with_content_hurricane_katrina", + "warmup-iterations": 100, + "iterations": 100, + "target-throughput": 50 + }, + { + "operation": "percolator_with_content_google", + "warmup-iterations": 100, + "iterations": 100, + "target-throughput": 27 + }, + { + "operation": "percolator_no_score_with_content_google", + "warmup-iterations": 100, + "iterations": 100, + "target-throughput": 100 + }, + { + "operation": "percolator_with_highlighting", + "warmup-iterations": 100, + "iterations": 100, + "target-throughput": 50 + }, + { + "operation": "percolator_with_content_ignore_me", + "warmup-iterations": 10, + "iterations": 100, + "#COMMENT": "Be aware that we specify *target-interval* here! This means we issue one query every 12 seconds", + "target-interval": 12 + }, + { + "operation": "percolator_no_score_with_content_ignore_me", + "warmup-iterations": 100, + "iterations": 100, + "target-throughput": 15 } + ] +} From 755faf676319b36096e4a56765e7742b7d1e760c Mon Sep 17 00:00:00 2001 From: John Verwolf Date: Wed, 26 Jul 2023 07:53:53 -0700 Subject: [PATCH 12/24] Add percolator cold cache implementation --- percolator/operations/default.json | 298 +++++++++++++++++++++-------- 1 file changed, 217 insertions(+), 81 deletions(-) diff --git a/percolator/operations/default.json b/percolator/operations/default.json index 533f14d1..7288326d 100644 --- a/percolator/operations/default.json +++ b/percolator/operations/default.json @@ -6,126 +6,262 @@ }, { "name": "percolator_with_content_president_bush", - "operation-type": "search", - "body": { - "query": { - "percolate": { - "field": "query", - "document": { - "body": "president bush" + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "percolator_with_content_president_bush-op", + "operation-type": "search", + "index": "queries", + "body": { + "query": { + "percolate": { + "field": "query", + "document": { + "body": "president bush" + } + } + } + } } - } + ] } - } + ] }, { "name": "percolator_with_content_saddam_hussein", - "operation-type": "search", - "body": { - "query": { - "percolate": { - "field": "query", - "document": { - "body": "saddam hussein" + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "percolator_with_content_saddam_hussein-op", + "operation-type": "search", + "index": "queries", + "body": { + "query": { + "percolate": { + "field": "query", + "document": { + "body": "saddam hussein" + } + } + } + } } - } + ] } - } + ] }, { "name": "percolator_with_content_hurricane_katrina", - "operation-type": "search", - "body": { - "query": { - "percolate": { - "field": "query", - "document": { - "body": "hurricane katrina" + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "percolator_with_content_hurricane_katrina-op", + "operation-type": "search", + "index": "queries", + "body": { + "query": { + "percolate": { + "field": "query", + "document": { + "body": "hurricane katrina" + } + } + } + } } - } + ] } - } + ] }, { "name": "percolator_with_content_google", - "operation-type": "search", - "body": { - "query": { - "percolate": { - "field": "query", - "document": { - "body": "google" + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "percolator_with_content_google-op", + "operation-type": "search", + "index": "queries", + "body": { + "query": { + "percolate": { + "field": "query", + "document": { + "body": "google" + } + } + } + } } - } + ] } - } + ] }, { "name": "percolator_no_score_with_content_google", - "operation-type": "search", - "body": { - "query": { - "constant_score": { - "filter": { - "percolate": { - "field": "query", - "document": { - "body": "google" + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "percolator_no_score_with_content_google-op", + "operation-type": "search", + "index": "queries", + "body": { + "query": { + "constant_score": { + "filter": { + "percolate": { + "field": "query", + "document": { + "body": "google" + } + } + } + } } } } - } + ] } - } + ] }, { "name": "percolator_with_highlighting", - "operation-type": "search", - "body": { - "query": { - "percolate": { - "field": "query", - "document": { - "body": "Israeli prime minister Ariel Sharon suffers a massive stroke; he is replaced by acting prime minister Ehud Olmert" + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "percolator_with_highlighting-op", + "operation-type": "search", + "index": "queries", + "body": { + "query": { + "percolate": { + "field": "query", + "document": { + "body": "Israeli prime minister Ariel Sharon suffers a massive stroke; he is replaced by acting prime minister Ehud Olmert" + } + } + }, + "highlight": { + "fields": { + "body": {} + } + } + } } - } - }, - "highlight": { - "fields": { - "body": {} - } + ] } - } + ] }, { "name": "percolator_with_content_ignore_me", - "operation-type": "search", - "body": { - "query": { - "percolate": { - "field": "query", - "document": { - "body": "ignore me" + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "percolator_with_content_ignore_me-op", + "operation-type": "search", + "index": "queries", + "body": { + "query": { + "percolate": { + "field": "query", + "document": { + "body": "ignore me" + } + } + } + } } - } + ] } - } + ] }, { "name": "percolator_no_score_with_content_ignore_me", - "operation-type": "search", - "body": { - "query": { - "constant_score": { - "filter": { - "percolate": { - "field": "query", - "document": { - "body": "ignore me" + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "percolator_no_score_with_content_ignore_me-op", + "operation-type": "search", + "index": "queries", + "body": { + "query": { + "constant_score": { + "filter": { + "percolate": { + "field": "query", + "document": { + "body": "ignore me" + } + } + } + } } } } - } + ] } - } + ] } \ No newline at end of file From 20bcb42e74a3e6ded5f6137fd3456561b639d6bf Mon Sep 17 00:00:00 2001 From: John Verwolf Date: Thu, 27 Jul 2023 10:58:41 -0700 Subject: [PATCH 13/24] separate percolator baseline --- percolator/challenges/default.json | 113 +++++++++++++++++++++- percolator/operations/default.json | 149 +++++++++++++++++++++++++++-- 2 files changed, 253 insertions(+), 9 deletions(-) diff --git a/percolator/challenges/default.json b/percolator/challenges/default.json index 90553b9c..14bf0789 100644 --- a/percolator/challenges/default.json +++ b/percolator/challenges/default.json @@ -108,4 +108,115 @@ "target-throughput": 15 } ] -} +}, + { + "name": "append-no-conflicts-cold-cache", + "description": "Indexes the whole document corpus using Elasticsearch default settings. We only adjust the number of replicas as we benchmark a single node cluster and Rally will only start the benchmark if the cluster turns green and we want to ensure that we don't use the query cache. Document ids are unique so all index operations are append only. After that a couple of queries are run.", + "default": false, + "schedule": [ + { + "operation": "delete-index" + }, + { + "operation": { + "operation-type": "create-index", + "settings": {{index_settings | default({}) | tojson}} + } + }, + { + "name": "check-cluster-health", + "operation": { + "operation-type": "cluster-health", + "index": "queries", + "request-params": { + "wait_for_status": "{{cluster_health | default('green')}}", + "wait_for_no_relocating_shards": "true" + }, + "retry-until-success": true + } + }, + { + "operation": "index", + "#COMMENT": "This is an incredibly short warmup time period but it is necessary to get also measurement samples. As this benchmark is rather about search than indexing this is ok.", + "warmup-time-period": 10, + "clients": {{bulk_indexing_clients | default(8)}}, + "ignore-response-error-level": "{{error_level | default('non-fatal')}}" + }, + { + "name": "refresh-after-index", + "operation": "refresh" + }, + { + "operation": { + "operation-type": "force-merge", + "request-timeout": 7200 + } + }, + { + "name": "refresh-after-force-merge", + "operation": "refresh" + }, + { + "name": "wait-until-merges-finish", + "operation": { + "operation-type": "index-stats", + "index": "_all", + "condition": { + "path": "_all.total.merges.current", + "expected-value": 0 + }, + "retry-until-success": true, + "include-in-reporting": false + } + }, + { + "operation": "percolator_with_content_president_bush-cold_cache", + "warmup-iterations": 100, + "iterations": 100, + "target-throughput": 50 + }, + { + "operation": "percolator_with_content_saddam_hussein-cold_cache", + "warmup-iterations": 100, + "iterations": 100, + "target-throughput": 50 + }, + { + "operation": "percolator_with_content_hurricane_katrina-cold_cache", + "warmup-iterations": 100, + "iterations": 100, + "target-throughput": 50 + }, + { + "operation": "percolator_with_content_google-cold_cache", + "warmup-iterations": 100, + "iterations": 100, + "target-throughput": 27 + }, + { + "operation": "percolator_no_score_with_content_google-cold_cache", + "warmup-iterations": 100, + "iterations": 100, + "target-throughput": 100 + }, + { + "operation": "percolator_with_highlighting-cold_cache", + "warmup-iterations": 100, + "iterations": 100, + "target-throughput": 50 + }, + { + "operation": "percolator_with_content_ignore_me-cold_cache", + "warmup-iterations": 10, + "iterations": 100, + "#COMMENT": "Be aware that we specify *target-interval* here! This means we issue one query every 12 seconds", + "target-interval": 12 + }, + { + "operation": "percolator_no_score_with_content_ignore_me-cold_cache", + "warmup-iterations": 100, + "iterations": 100, + "target-throughput": 15 + } + ] + } diff --git a/percolator/operations/default.json b/percolator/operations/default.json index 7288326d..4d837f36 100644 --- a/percolator/operations/default.json +++ b/percolator/operations/default.json @@ -6,6 +6,21 @@ }, { "name": "percolator_with_content_president_bush", + "operation-type": "search", + "index": "queries", + "body": { + "query": { + "percolate": { + "field": "query", + "document": { + "body": "president bush" + } + } + } + } + }, + { + "name": "percolator_with_content_president_bush-cold_cache", "operation-type": "composite", "requests": [ { @@ -17,7 +32,7 @@ "method": "POST" }, { - "name": "percolator_with_content_president_bush-op", + "name": "percolator_with_content_president_bush", "operation-type": "search", "index": "queries", "body": { @@ -37,6 +52,21 @@ }, { "name": "percolator_with_content_saddam_hussein", + "operation-type": "search", + "index": "queries", + "body": { + "query": { + "percolate": { + "field": "query", + "document": { + "body": "saddam hussein" + } + } + } + } + }, + { + "name": "percolator_with_content_saddam_hussein-cold_cache", "operation-type": "composite", "requests": [ { @@ -48,7 +78,7 @@ "method": "POST" }, { - "name": "percolator_with_content_saddam_hussein-op", + "name": "percolator_with_content_saddam_hussein", "operation-type": "search", "index": "queries", "body": { @@ -68,6 +98,21 @@ }, { "name": "percolator_with_content_hurricane_katrina", + "operation-type": "search", + "index": "queries", + "body": { + "query": { + "percolate": { + "field": "query", + "document": { + "body": "hurricane katrina" + } + } + } + } + }, + { + "name": "percolator_with_content_hurricane_katrina-cold_cache", "operation-type": "composite", "requests": [ { @@ -79,7 +124,7 @@ "method": "POST" }, { - "name": "percolator_with_content_hurricane_katrina-op", + "name": "percolator_with_content_hurricane_katrina", "operation-type": "search", "index": "queries", "body": { @@ -99,6 +144,21 @@ }, { "name": "percolator_with_content_google", + "operation-type": "search", + "index": "queries", + "body": { + "query": { + "percolate": { + "field": "query", + "document": { + "body": "google" + } + } + } + } + }, + { + "name": "percolator_with_content_google-cold_cache", "operation-type": "composite", "requests": [ { @@ -110,7 +170,7 @@ "method": "POST" }, { - "name": "percolator_with_content_google-op", + "name": "percolator_with_content_google", "operation-type": "search", "index": "queries", "body": { @@ -130,6 +190,25 @@ }, { "name": "percolator_no_score_with_content_google", + "operation-type": "search", + "index": "queries", + "body": { + "query": { + "constant_score": { + "filter": { + "percolate": { + "field": "query", + "document": { + "body": "google" + } + } + } + } + } + } + }, + { + "name": "percolator_no_score_with_content_google-cold_cache", "operation-type": "composite", "requests": [ { @@ -141,7 +220,7 @@ "method": "POST" }, { - "name": "percolator_no_score_with_content_google-op", + "name": "percolator_no_score_with_content_google", "operation-type": "search", "index": "queries", "body": { @@ -165,6 +244,26 @@ }, { "name": "percolator_with_highlighting", + "operation-type": "search", + "index": "queries", + "body": { + "query": { + "percolate": { + "field": "query", + "document": { + "body": "Israeli prime minister Ariel Sharon suffers a massive stroke; he is replaced by acting prime minister Ehud Olmert" + } + } + }, + "highlight": { + "fields": { + "body": {} + } + } + } + }, + { + "name": "percolator_with_highlighting-cold_cache", "operation-type": "composite", "requests": [ { @@ -176,7 +275,7 @@ "method": "POST" }, { - "name": "percolator_with_highlighting-op", + "name": "percolator_with_highlighting", "operation-type": "search", "index": "queries", "body": { @@ -201,6 +300,21 @@ }, { "name": "percolator_with_content_ignore_me", + "operation-type": "search", + "index": "queries", + "body": { + "query": { + "percolate": { + "field": "query", + "document": { + "body": "ignore me" + } + } + } + } + }, + { + "name": "percolator_with_content_ignore_me-cold_cache", "operation-type": "composite", "requests": [ { @@ -212,7 +326,7 @@ "method": "POST" }, { - "name": "percolator_with_content_ignore_me-op", + "name": "percolator_with_content_ignore_me", "operation-type": "search", "index": "queries", "body": { @@ -232,6 +346,25 @@ }, { "name": "percolator_no_score_with_content_ignore_me", + "operation-type": "search", + "index": "queries", + "body": { + "query": { + "constant_score": { + "filter": { + "percolate": { + "field": "query", + "document": { + "body": "ignore me" + } + } + } + } + } + } + }, + { + "name": "percolator_no_score_with_content_ignore_me-cold_cache", "operation-type": "composite", "requests": [ { @@ -243,7 +376,7 @@ "method": "POST" }, { - "name": "percolator_no_score_with_content_ignore_me-op", + "name": "percolator_no_score_with_content_ignore_me", "operation-type": "search", "index": "queries", "body": { From 345e7be70e5af15db9e1868cf2a5036f4f562ad3 Mon Sep 17 00:00:00 2001 From: John Verwolf Date: Mon, 31 Jul 2023 10:07:58 -0700 Subject: [PATCH 14/24] revert dense vector changes --- dense_vector/operations/default.json | 202 +++++---------------------- 1 file changed, 37 insertions(+), 165 deletions(-) diff --git a/dense_vector/operations/default.json b/dense_vector/operations/default.json index 4b104a4b..e4a48f32 100644 --- a/dense_vector/operations/default.json +++ b/dense_vector/operations/default.json @@ -1,189 +1,61 @@ { "name": "knn-search-10-100", - "operation": { - "operation-type": "composite", - "requests": [ - { - "stream": [ - { - "operation-type": "raw-request", - "method": "POST", - "path": "/_internal/blob_caches/clear" - }, - { - "operation-type": "search", - "param-source": "knn-param-source", - "k": 10, - "num-candidates": 100 - } - ] - } - ] - } + "operation-type": "search", + "param-source": "knn-param-source", + "k": 10, + "num-candidates": 100 }, { "name": "knn-search-100-1000", - "operation": { - "operation-type": "composite", - "requests": [ - { - "stream": [ - { - "operation-type": "raw-request", - "method": "POST", - "path": "/_internal/blob_caches/clear" - }, - { - "operation-type": "search", - "param-source": "knn-param-source", - "k": 100, - "num-candidates": 1000 - } - ] - } - ] - } + "operation-type": "search", + "param-source": "knn-param-source", + "k": 100, + "num-candidates": 1000 }, { "name": "script-score-query", - "operation": { - "operation-type": "composite", - "requests": [ - { - "stream": [ - { - "operation-type": "raw-request", - "method": "POST", - "path": "/_internal/blob_caches/clear" - }, - { - "operation-type": "search", - "param-source": "knn-param-source", - "k": 10, - "exact": true - } - ] - } - ] - } + "operation-type": "search", + "param-source": "knn-param-source", + "k": 10, + "exact": true }, { "name": "knn-recall-10-100", - "operation": { - "operation-type": "composite", - "requests": [ - { - "stream": [ - { - "operation-type": "raw-request", - "method": "POST", - "path": "/_internal/blob_caches/clear" - }, - { - "operation-type": "knn-recall", - "param-source": "knn-recall-param-source", - "k": 10, - "num-candidates": 100, - "include-in-reporting": false - } - ] - } - ] - } + "operation-type": "knn-recall", + "param-source": "knn-recall-param-source", + "k": 10, + "num-candidates": 100, + "include-in-reporting": false }, { "name": "knn-recall-100-1000", - "operation": { - "operation-type": "composite", - "requests": [ - { - "stream": [ - { - "operation-type": "raw-request", - "method": "POST", - "path": "/_internal/blob_caches/clear" - }, - { - "operation-type": "knn-recall", - "param-source": "knn-recall-param-source", - "k": 100, - "num-candidates": 1000, - "include-in-reporting": false - } - ] - } - ] - } + "operation-type": "knn-recall", + "param-source": "knn-recall-param-source", + "k": 100, + "num-candidates": 1000, + "include-in-reporting": false }, { "name": "knn-recall-10-10", - "operation": { - "operation-type": "composite", - "requests": [ - { - "stream": [ - { - "operation-type": "raw-request", - "method": "POST", - "path": "/_internal/blob_caches/clear" - }, - { - "operation-type": "knn-recall", - "param-source": "knn-recall-param-source", - "k": 10, - "num-candidates": 10, - "include-in-reporting": false - } - ] - } - ] - } + "operation-type": "knn-recall", + "param-source": "knn-recall-param-source", + "k": 10, + "num-candidates": 10, + "include-in-reporting": false }, { "name": "knn-recall-100-100", - "operation": { - "operation-type": "composite", - "requests": [ - { - "stream": [ - { - "operation-type": "raw-request", - "method": "POST", - "path": "/_internal/blob_caches/clear" - }, - { - "operation-type": "knn-recall", - "param-source": "knn-recall-param-source", - "k": 100, - "num-candidates": 100, - "include-in-reporting": false - } - ] - } - ] - } + "operation-type": "knn-recall", + "param-source": "knn-recall-param-source", + "k": 100, + "num-candidates": 100, + "include-in-reporting": false }, { "name": "knn-recall-1000-1000", - "operation": { - "operation-type": "composite", - "requests": [ - { - "stream": [ - { - "operation-type": "raw-request", - "method": "POST", - "path": "/_internal/blob_caches/clear" - }, - { - "operation-type": "knn-recall", - "param-source": "knn-recall-param-source", - "k": 1000, - "num-candidates": 1000, - "include-in-reporting": false - } - ] - } - ] - } + "operation-type": "knn-recall", + "param-source": "knn-recall-param-source", + "k": 1000, + "num-candidates": 1000, + "include-in-reporting": false } From 7e97ef083c1cd9352601540caade65e4c3e5e934 Mon Sep 17 00:00:00 2001 From: John Verwolf Date: Mon, 31 Jul 2023 13:12:43 -0700 Subject: [PATCH 15/24] Broken dense vector, not sure why --- dense_vector/challenges/default.json | 164 +++++++++++++- dense_vector/operations/default.json | 313 +++++++++++++++++++++------ 2 files changed, 407 insertions(+), 70 deletions(-) diff --git a/dense_vector/challenges/default.json b/dense_vector/challenges/default.json index c1aeb109..76885973 100644 --- a/dense_vector/challenges/default.json +++ b/dense_vector/challenges/default.json @@ -69,7 +69,7 @@ }, { "name": "knn-search-100-1000-concurrent-with-indexing", - "operation": "knn-search-100-1000" + "operation": "compareme-knn-search-100-1000" } ] } @@ -110,36 +110,182 @@ }, { "name": "knn-search-10-100", - "operation": "knn-search-10-100", + "operation": "compareme-knn-search-10-100", "warmup-iterations": 100, "iterations": 1000 }, { "name": "knn-search-100-1000", - "operation": "knn-search-100-1000", + "operation": "compareme-knn-search-100-1000", "warmup-iterations": 100, "iterations": 1000 }, { "name": "script-score-query", - "operation": "script-score-query", + "operation": "compareme-script-score-query", "warmup-iterations": 100, "iterations": 1000 }, { - "operation": "knn-recall-10-100" + "operation": "compareme-knn-recall-10-100" }, { - "operation": "knn-recall-100-1000" + "operation": "compareme-knn-recall-100-1000" }, { - "operation": "knn-recall-10-10" + "operation": "compareme-knn-recall-10-10" }, { - "operation": "knn-recall-100-100" + "operation": "compareme-knn-recall-100-100" }, { - "operation": "knn-recall-1000-1000" + "operation": "compareme-knn-recall-1000-1000" + } + ] +}, +{ + "name": "index-and-search-cold-cache", + "description": "Indexes vectors, then executes searches under various conditions", + "default": false, + "schedule": [ + { + "operation": { + "operation-type": "delete-index" + } + }, + { + "operation": { + "operation-type": "create-index", + "settings": {{index_settings | default({}) | tojson}} + } + }, + { + "operation": { + "operation-type": "cluster-health", + "request-params": { + "wait_for_status": "green" + }, + "retry-until-success": true + } + }, + { + "name": "index-append", + "operation": { + "operation-type": "bulk", + "bulk-size": {{bulk_size | default(5000)}}, + "ingest-percentage": 20 + }, + "warmup-time-period": {{ bulk_warmup | default(40) | int }}, + "clients": {{bulk_indexing_clients | default(1)}} + }, + { + "name": "refresh-after-index", + "operation": { + "operation-type": "refresh", + "request-timeout": 1000, + "include-in-reporting": true + } + }, + { + "name": "wait-until-merges-finish-after-index", + "operation": { + "operation-type": "index-stats", + "index": "_all", + "condition": { + "path": "_all.total.merges.current", + "expected-value": 0 + }, + "retry-until-success": true, + "include-in-reporting": false + } + }, + { + "parallel": { + "warmup-time-period": 10, + "completed-by": "index-update-concurrent-with-searches", + "tasks": [ + { + "name": "index-update-concurrent-with-searches", + "operation": { + "operation-type": "bulk", + "bulk-size": 5000, + "ingest-percentage": 5 + } + }, + { + "name": "knn-search-100-1000-concurrent-with-indexing", + "operation": "knn-search-100-1000-cold_cache" + } + ] + } + }, + { + "name": "refresh-after-update", + "operation": { + "operation-type": "refresh", + "request-timeout": 1000, + "include-in-reporting": true + } + }, + { + "operation": { + "operation-type": "force-merge", + "mode" : "polling", + "max-num-segments": 1, + "request-timeout": 7200, + "include-in-reporting": true + } + }, + { + "name": "refresh-after-force-merge", + "operation": "refresh" + }, + { + "name": "wait-until-merges-finish", + "operation": { + "operation-type": "index-stats", + "index": "_all", + "condition": { + "path": "_all.total.merges.current", + "expected-value": 0 + }, + "retry-until-success": true, + "include-in-reporting": false + } + }, + { + "name": "cold-cache-knn-search-10-100", + "operation": "knn-search-10-100-cold_cache", + "warmup-iterations": 100, + "iterations": 1000 + }, + { + "name": "cold-cache-knn-search-100-1000", + "operation": "knn-search-100-1000-cold_cache", + "warmup-iterations": 100, + "iterations": 1000 + }, + { + "name": "cold-cache-script-score-query", + "operation": "script-score-query-cold_cache", + "warmup-iterations": 100, + "iterations": 1000 + }, + { + "operation": "knn-recall-10-100-cold_cache" + }, + { + "operation": "knn-recall-100-1000-cold_cache" + }, + { + "operation": "knn-recall-10-10-cold_cache" + }, + { + "operation": "knn-recall-100-100-cold_cache" + }, + { + "operation": "knn-recall-1000-1000-cold_cache" } ] } + diff --git a/dense_vector/operations/default.json b/dense_vector/operations/default.json index e4a48f32..3d1c8143 100644 --- a/dense_vector/operations/default.json +++ b/dense_vector/operations/default.json @@ -1,61 +1,252 @@ -{ - "name": "knn-search-10-100", - "operation-type": "search", - "param-source": "knn-param-source", - "k": 10, - "num-candidates": 100 -}, -{ - "name": "knn-search-100-1000", - "operation-type": "search", - "param-source": "knn-param-source", - "k": 100, - "num-candidates": 1000 -}, -{ - "name": "script-score-query", - "operation-type": "search", - "param-source": "knn-param-source", - "k": 10, - "exact": true -}, -{ - "name": "knn-recall-10-100", - "operation-type": "knn-recall", - "param-source": "knn-recall-param-source", - "k": 10, - "num-candidates": 100, - "include-in-reporting": false -}, -{ - "name": "knn-recall-100-1000", - "operation-type": "knn-recall", - "param-source": "knn-recall-param-source", - "k": 100, - "num-candidates": 1000, - "include-in-reporting": false -}, -{ - "name": "knn-recall-10-10", - "operation-type": "knn-recall", - "param-source": "knn-recall-param-source", - "k": 10, - "num-candidates": 10, - "include-in-reporting": false -}, -{ - "name": "knn-recall-100-100", - "operation-type": "knn-recall", - "param-source": "knn-recall-param-source", - "k": 100, - "num-candidates": 100, - "include-in-reporting": false -}, -{ - "name": "knn-recall-1000-1000", - "operation-type": "knn-recall", - "param-source": "knn-recall-param-source", - "k": 1000, - "num-candidates": 1000, - "include-in-reporting": false -} + + { + "name": "compareme-knn-search-10-100", + "operation-type": "search", + "param-source": "knn-param-source", + "k": 10, + "num-candidates": 100 + }, + { + "name": "knn-search-10-100-cold_cache", + "param-source": "knn-param-source", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-knn-search-10-100", + "operation-type": "search", + "param-source": "knn-param-source", + "k": 10, + "num-candidates": 100 + } + ] + } + ] + }, + { + "name": "compareme-knn-search-100-1000", + "operation-type": "search", + "param-source": "knn-param-source", + "k": 100, + "num-candidates": 1000 + }, + { + "name": "knn-search-100-1000-cold_cache", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-knn-search-100-1000", + "param-source": "knn-param-source", + "operation-type": "search", + "k": 100, + "num-candidates": 1000 + } + ] + } + ] + }, + { + "name": "compareme-script-score-query", + "operation-type": "search", + "param-source": "knn-param-source", + "k": 10, + "exact": true + }, + { + "name": "script-score-query-cold_cache", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-script-score-query", + "operation-type": "search", + "param-source": "knn-param-source", + "k": 10, + "exact": true + } + ] + } + ] + }, + { + "name": "compareme-knn-recall-10-100", + "operation-type": "knn-recall", + "param-source": "knn-recall-param-source", + "k": 10, + "num-candidates": 100, + "include-in-reporting": false + }, + { + "name": "knn-recall-10-100-cold_cache", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-knn-recall-10-100", + "operation-type": "knn-recall", + "param-source": "knn-recall-param-source", + "k": 10, + "num-candidates": 100, + "include-in-reporting": false + } + ] + } + ] + }, + { + "name": "compareme-knn-recall-100-1000", + "operation-type": "knn-recall", + "param-source": "knn-recall-param-source", + "k": 100, + "num-candidates": 1000, + "include-in-reporting": false + }, + { + "name": "knn-recall-100-1000-cold_cache", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-knn-recall-100-1000", + "operation-type": "knn-recall", + "param-source": "knn-recall-param-source", + "k": 100, + "num-candidates": 1000, + "include-in-reporting": false + } + ] + } + ] + }, + { + "name": "compareme-knn-recall-10-10", + "operation-type": "knn-recall", + "param-source": "knn-recall-param-source", + "k": 10, + "num-candidates": 10, + "include-in-reporting": false + }, + { + "name": "knn-recall-10-10-cold_cache", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-knn-recall-10-10", + "operation-type": "knn-recall", + "param-source": "knn-recall-param-source", + "k": 10, + "num-candidates": 10, + "include-in-reporting": false + } + ] + } + ] + }, + { + "name": "compareme-knn-recall-100-100", + "operation-type": "knn-recall", + "param-source": "knn-recall-param-source", + "k": 100, + "num-candidates": 100, + "include-in-reporting": false + }, + { + "name": "knn-recall-100-100-cold_cache", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-knn-recall-100-100", + "operation-type": "knn-recall", + "param-source": "knn-recall-param-source", + "k": 100, + "num-candidates": 100, + "include-in-reporting": false + } + ] + } + ] + }, + { + "name": "compareme-knn-recall-1000-1000", + "operation-type": "knn-recall", + "param-source": "knn-recall-param-source", + "k": 1000, + "num-candidates": 1000, + "include-in-reporting": false + }, + { + "name": "knn-recall-1000-1000-cold_cache", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-knn-recall-1000-1000", + "operation-type": "knn-recall", + "param-source": "knn-recall-param-source", + "k": 1000, + "num-candidates": 1000, + "include-in-reporting": false + } + ] + } + ] + } From 083d3109e7b2d457416944f630938bba2dcdb9e0 Mon Sep 17 00:00:00 2001 From: John Verwolf Date: Wed, 2 Aug 2023 08:06:47 -0700 Subject: [PATCH 16/24] Geopoinshape: prepend compareme --- geopointshape/challenges/default.json | 16 ++++++++-------- geopointshape/operations/default.json | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/geopointshape/challenges/default.json b/geopointshape/challenges/default.json index 96db6220..d7404f78 100644 --- a/geopointshape/challenges/default.json +++ b/geopointshape/challenges/default.json @@ -59,44 +59,44 @@ } }, { - "operation": "polygon", + "operation": "compareme-polygon", "warmup-iterations": 200, "iterations": 100, "target-throughput": 2 }, { - "operation": "bbox", + "operation": "compareme-bbox", "warmup-iterations": 200, "iterations": 100, "target-throughput": 2 }, { - "operation": "geoGrid_geohash", + "operation": "compareme-geoGrid_geohash", "warmup-iterations": 200, "iterations": 100 }, { - "operation": "geoGrid_geotile", + "operation": "compareme-geoGrid_geotile", "warmup-iterations": 200, "iterations": 100 }, { - "operation": "geoGrid_geohex", + "operation": "compareme-geoGrid_geohex", "warmup-iterations": 200, "iterations": 100 }, { - "operation": "geoGrid_aggs_geohash", + "operation": "compareme-geoGrid_aggs_geohash", "warmup-iterations": 200, "iterations": 100 }, { - "operation": "geoGrid_aggs_geotile", + "operation": "compareme-geoGrid_aggs_geotile", "warmup-iterations": 200, "iterations": 100 }, { - "operation": "geoGrid_aggs_geohex", + "operation": "compareme-geoGrid_aggs_geohex", "warmup-iterations": 200, "iterations": 100 } diff --git a/geopointshape/operations/default.json b/geopointshape/operations/default.json index 63724415..7d658783 100644 --- a/geopointshape/operations/default.json +++ b/geopointshape/operations/default.json @@ -15,7 +15,7 @@ "recency": {{recency | default(0)}} }, { - "name": "polygon", + "name": "compareme-polygon", "operation-type": "search", "body": { "query": { @@ -38,7 +38,7 @@ } }, { - "name": "bbox", + "name": "compareme-bbox", "operation-type": "search", "body": { "query": { @@ -54,7 +54,7 @@ } }, { - "name": "geoGrid_geohash", + "name": "compareme-geoGrid_geohash", "operation-type": "search", "body": { "query": { @@ -67,7 +67,7 @@ } }, { - "name": "geoGrid_geotile", + "name": "compareme-geoGrid_geotile", "operation-type": "search", "body": { "query": { @@ -80,7 +80,7 @@ } }, { - "name": "geoGrid_geohex", + "name": "compareme-geoGrid_geohex", "operation-type": "search", "body": { "query": { @@ -93,7 +93,7 @@ } }, { - "name": "geoGrid_aggs_geohash", + "name": "compareme-geoGrid_aggs_geohash", "operation-type": "search", "body": { "query": { @@ -120,7 +120,7 @@ } }, { - "name": "geoGrid_aggs_geotile", + "name": "compareme-geoGrid_aggs_geotile", "operation-type": "search", "body": { "query": { @@ -147,7 +147,7 @@ } }, { - "name": "geoGrid_aggs_geohex", + "name": "compareme-geoGrid_aggs_geohex", "operation-type": "search", "body": { "query": { From 9cab90af78bd80a1d9505950afe4f9076c8952cd Mon Sep 17 00:00:00 2001 From: John Verwolf Date: Wed, 2 Aug 2023 08:08:54 -0700 Subject: [PATCH 17/24] Geopoinshape: create cold-cache track template --- geopointshape/challenges/default.json | 104 ++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) diff --git a/geopointshape/challenges/default.json b/geopointshape/challenges/default.json index d7404f78..c5232197 100644 --- a/geopointshape/challenges/default.json +++ b/geopointshape/challenges/default.json @@ -102,6 +102,110 @@ } ] }, + { + "name": "append-no-conflicts-cold-cache", + "description": "Indexes the whole document corpus using Elasticsearch default settings. We only adjust the number of replicas as we benchmark a single node cluster and Rally will only start the benchmark if the cluster turns green. Document ids are unique so all index operations are append only. After that a couple of queries are run.", + "default": false, + "schedule": [ + { + "operation": "delete-index" + }, + { + "operation": { + "operation-type": "create-index", + "settings": {{index_settings | default({}) | tojson}} + } + }, + { + "name": "check-cluster-health", + "operation": { + "operation-type": "cluster-health", + "index": "osmgeoshapes", + "request-params": { + "wait_for_status": "{{cluster_health | default('green')}}", + "wait_for_no_relocating_shards": "true" + }, + "retry-until-success": true + } + }, + { + "operation": "index-append", + "warmup-time-period": 120, + "clients": {{bulk_indexing_clients | default(8)}}, + "ignore-response-error-level": "{{error_level | default('non-fatal')}}" + }, + { + "name": "refresh-after-index", + "operation": "refresh" + }, + { + "operation": { + "operation-type": "force-merge", + "max-num-segments": 1, + "request-timeout": 7200 + } + }, + { + "name": "refresh-after-force-merge", + "operation": "refresh" + }, + { + "name": "wait-until-merges-finish", + "operation": { + "operation-type": "index-stats", + "index": "_all", + "condition": { + "path": "_all.total.merges.current", + "expected-value": 0 + }, + "retry-until-success": true, + "include-in-reporting": false + } + }, + { + "operation": "compareme-polygon", + "warmup-iterations": 200, + "iterations": 100, + "target-throughput": 2 + }, + { + "operation": "compareme-bbox", + "warmup-iterations": 200, + "iterations": 100, + "target-throughput": 2 + }, + { + "operation": "compareme-geoGrid_geohash", + "warmup-iterations": 200, + "iterations": 100 + }, + { + "operation": "compareme-geoGrid_geotile", + "warmup-iterations": 200, + "iterations": 100 + }, + { + "operation": "compareme-geoGrid_geohex", + "warmup-iterations": 200, + "iterations": 100 + }, + { + "operation": "compareme-geoGrid_aggs_geohash", + "warmup-iterations": 200, + "iterations": 100 + }, + { + "operation": "compareme-geoGrid_aggs_geotile", + "warmup-iterations": 200, + "iterations": 100 + }, + { + "operation": "compareme-geoGrid_aggs_geohex", + "warmup-iterations": 200, + "iterations": 100 + } + ] + }, { "name": "append-no-conflicts-index-only", "description": "Indexes the whole document corpus using Elasticsearch default settings. We only adjust the number of replicas as we benchmark a single node cluster and Rally will only start the benchmark if the cluster turns green. Document ids are unique so all index operations are append only.", From 385ed66c91b1a19b9a63bf2de6993bd06711d7ff Mon Sep 17 00:00:00 2001 From: John Verwolf Date: Wed, 2 Aug 2023 08:26:19 -0700 Subject: [PATCH 18/24] Geopoinshape: create cold-cache track complete --- geopointshape/challenges/default.json | 16 +- geopointshape/operations/default.json | 295 ++++++++++++++++++++++++++ 2 files changed, 303 insertions(+), 8 deletions(-) diff --git a/geopointshape/challenges/default.json b/geopointshape/challenges/default.json index c5232197..08aa7731 100644 --- a/geopointshape/challenges/default.json +++ b/geopointshape/challenges/default.json @@ -163,44 +163,44 @@ } }, { - "operation": "compareme-polygon", + "operation": "cold-cache-polygon", "warmup-iterations": 200, "iterations": 100, "target-throughput": 2 }, { - "operation": "compareme-bbox", + "operation": "cold-cache-bbox", "warmup-iterations": 200, "iterations": 100, "target-throughput": 2 }, { - "operation": "compareme-geoGrid_geohash", + "operation": "cold-cache-geoGrid_geohash", "warmup-iterations": 200, "iterations": 100 }, { - "operation": "compareme-geoGrid_geotile", + "operation": "cold-cache-geoGrid_geotile", "warmup-iterations": 200, "iterations": 100 }, { - "operation": "compareme-geoGrid_geohex", + "operation": "cold-cache-geoGrid_geohex", "warmup-iterations": 200, "iterations": 100 }, { - "operation": "compareme-geoGrid_aggs_geohash", + "operation": "cold-cache-geoGrid_aggs_geohash", "warmup-iterations": 200, "iterations": 100 }, { - "operation": "compareme-geoGrid_aggs_geotile", + "operation": "cold-cache-geoGrid_aggs_geotile", "warmup-iterations": 200, "iterations": 100 }, { - "operation": "compareme-geoGrid_aggs_geohex", + "operation": "cold-cache-geoGrid_aggs_geohex", "warmup-iterations": 200, "iterations": 100 } diff --git a/geopointshape/operations/default.json b/geopointshape/operations/default.json index 7d658783..3464e622 100644 --- a/geopointshape/operations/default.json +++ b/geopointshape/operations/default.json @@ -37,6 +37,46 @@ } } }, + { + "name": "cold-cache-polygon", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-polygon", + "operation-type": "search", + "index": "osmgeoshapes", + "body": { + "query": { + "geo_shape": { + "location": { + "shape": { + "type": "polygon", + "coordinates" : [[ + [-0.1, 49.0], + [5.0, 48.0], + [15.0, 49.0], + [14.0, 60.0], + [-0.1, 61.0], + [-0.1, 49.0] + ]] + } + } + } + } + } + } + ] + } + ] + }, { "name": "compareme-bbox", "operation-type": "search", @@ -53,6 +93,39 @@ } } }, + { + "name": "cold-cache-bbox", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-bbox", + "operation-type": "search", + "index": "osmgeoshapes", + "body": { + "query": { + "geo_shape": { + "location": { + "shape": { + "type": "envelope", + "coordinates" : [[-0.1, 61.0], [15.0, 48.0]] + } + } + } + } + } + } + ] + } + ] + }, { "name": "compareme-geoGrid_geohash", "operation-type": "search", @@ -66,6 +139,36 @@ } } }, + { + "name": "cold-cache-geoGrid_geohash", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-geoGrid_geohash", + "operation-type": "search", + "index": "osmgeoshapes", + "body": { + "query": { + "geo_grid": { + "location": { + "geohash": "u0" + } + } + } + } + } + ] + } + ] + }, { "name": "compareme-geoGrid_geotile", "operation-type": "search", @@ -79,6 +182,36 @@ } } }, + { + "name": "cold-cache-geoGrid_geotile", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-geoGrid_geotile", + "operation-type": "search", + "index": "osmgeoshapes", + "body": { + "query": { + "geo_grid": { + "location": { + "geotile" : "6/32/22" + } + } + } + } + } + ] + } + ] + }, { "name": "compareme-geoGrid_geohex", "operation-type": "search", @@ -92,6 +225,36 @@ } } }, + { + "name": "cold-cache-geoGrid_geohex", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-geoGrid_geohex", + "operation-type": "search", + "index": "osmgeoshapes", + "body": { + "query": { + "geo_grid": { + "location": { + "geohex" : "811fbffffffffff" + } + } + } + } + } + ] + } + ] + }, { "name": "compareme-geoGrid_aggs_geohash", "operation-type": "search", @@ -119,6 +282,50 @@ } } }, + { + "name": "cold-cache-geoGrid_aggs_geohash", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-geoGrid_aggs_geohash", + "operation-type": "search", + "index": "osmgeoshapes", + "body": { + "query": { + "geo_bounding_box": { + "location": { + "top_left": "POINT (2.20 48.95)", + "bottom_right": "POINT (2.40 48.75)" + } + } + }, + "size": 0, + "aggs": { + "zoomed-in": { + "geohash_grid": { + "field": "location", + "precision": 5, + "bounds": { + "top_left": "POINT (2.20 48.95)", + "bottom_right": "POINT (2.40 48.75)" + } + } + } + } + } + } + ] + } + ] + }, { "name": "compareme-geoGrid_aggs_geotile", "operation-type": "search", @@ -146,6 +353,50 @@ } } }, + { + "name": "cold-cache-geoGrid_aggs_geotile", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-geoGrid_aggs_geotile", + "operation-type": "search", + "index": "osmgeoshapes", + "body": { + "query": { + "geo_bounding_box": { + "location": { + "top_left": "POINT (2.20 48.95)", + "bottom_right": "POINT (2.40 48.75)" + } + } + }, + "size": 0, + "aggs": { + "zoomed-in": { + "geotile_grid": { + "field": "location", + "precision": 13, + "bounds": { + "top_left": "POINT (2.20 48.95)", + "bottom_right": "POINT (2.40 48.75)" + } + } + } + } + } + } + ] + } + ] + }, { "name": "compareme-geoGrid_aggs_geohex", "operation-type": "search", @@ -172,4 +423,48 @@ } } } + }, + { + "name": "cold-cache-geoGrid_aggs_geohex", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-geoGrid_aggs_geohex", + "operation-type": "search", + "index": "osmgeoshapes", + "body": { + "query": { + "geo_bounding_box": { + "location": { + "top_left": "POINT (2.20 48.95)", + "bottom_right": "POINT (2.40 48.75)" + } + } + }, + "size": 0, + "aggs": { + "zoomed-in": { + "geohex_grid": { + "field": "location", + "precision": 6, + "bounds": { + "top_left": "POINT (2.20 48.95)", + "bottom_right": "POINT (2.40 48.75)" + } + } + } + } + } + } + ] + } + ] } From 0d7308d992c288840d432165e207b7534827b096 Mon Sep 17 00:00:00 2001 From: John Verwolf Date: Wed, 2 Aug 2023 10:12:18 -0700 Subject: [PATCH 19/24] Percolator: update names --- percolator/challenges/default.json | 16 ++++++++-------- percolator/operations/default.json | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/percolator/challenges/default.json b/percolator/challenges/default.json index 14bf0789..f4d4d892 100644 --- a/percolator/challenges/default.json +++ b/percolator/challenges/default.json @@ -170,50 +170,50 @@ } }, { - "operation": "percolator_with_content_president_bush-cold_cache", + "operation": "cold-cache-percolator_with_content_president_bush", "warmup-iterations": 100, "iterations": 100, "target-throughput": 50 }, { - "operation": "percolator_with_content_saddam_hussein-cold_cache", + "operation": "cold-cache-percolator_with_content_saddam_hussein", "warmup-iterations": 100, "iterations": 100, "target-throughput": 50 }, { - "operation": "percolator_with_content_hurricane_katrina-cold_cache", + "operation": "cold-cache-percolator_with_content_hurricane_katrina", "warmup-iterations": 100, "iterations": 100, "target-throughput": 50 }, { - "operation": "percolator_with_content_google-cold_cache", + "operation": "cold-cache-percolator_with_content_google", "warmup-iterations": 100, "iterations": 100, "target-throughput": 27 }, { - "operation": "percolator_no_score_with_content_google-cold_cache", + "operation": "cold-cache-percolator_no_score_with_content_google", "warmup-iterations": 100, "iterations": 100, "target-throughput": 100 }, { - "operation": "percolator_with_highlighting-cold_cache", + "operation": "cold-cache-percolator_with_highlighting", "warmup-iterations": 100, "iterations": 100, "target-throughput": 50 }, { - "operation": "percolator_with_content_ignore_me-cold_cache", + "operation": "cold-cache-percolator_with_content_ignore_me", "warmup-iterations": 10, "iterations": 100, "#COMMENT": "Be aware that we specify *target-interval* here! This means we issue one query every 12 seconds", "target-interval": 12 }, { - "operation": "percolator_no_score_with_content_ignore_me-cold_cache", + "operation": "cold-cache-percolator_no_score_with_content_ignore_me", "warmup-iterations": 100, "iterations": 100, "target-throughput": 15 diff --git a/percolator/operations/default.json b/percolator/operations/default.json index 4d837f36..bf524d0a 100644 --- a/percolator/operations/default.json +++ b/percolator/operations/default.json @@ -20,7 +20,7 @@ } }, { - "name": "percolator_with_content_president_bush-cold_cache", + "name": "cold-cache-percolator_with_content_president_bush", "operation-type": "composite", "requests": [ { @@ -66,7 +66,7 @@ } }, { - "name": "percolator_with_content_saddam_hussein-cold_cache", + "name": "cold-cache-percolator_with_content_saddam_hussein", "operation-type": "composite", "requests": [ { @@ -112,7 +112,7 @@ } }, { - "name": "percolator_with_content_hurricane_katrina-cold_cache", + "name": "cold-cache-percolator_with_content_hurricane_katrina", "operation-type": "composite", "requests": [ { @@ -158,7 +158,7 @@ } }, { - "name": "percolator_with_content_google-cold_cache", + "name": "cold-cache-percolator_with_content_google", "operation-type": "composite", "requests": [ { @@ -208,7 +208,7 @@ } }, { - "name": "percolator_no_score_with_content_google-cold_cache", + "name": "cold-cache-percolator_no_score_with_content_google", "operation-type": "composite", "requests": [ { @@ -263,7 +263,7 @@ } }, { - "name": "percolator_with_highlighting-cold_cache", + "name": "cold-cache-percolator_with_highlighting", "operation-type": "composite", "requests": [ { @@ -314,7 +314,7 @@ } }, { - "name": "percolator_with_content_ignore_me-cold_cache", + "name": "cold-cache-percolator_with_content_ignore_me", "operation-type": "composite", "requests": [ { @@ -364,7 +364,7 @@ } }, { - "name": "percolator_no_score_with_content_ignore_me-cold_cache", + "name": "cold-cache-percolator_no_score_with_content_ignore_me", "operation-type": "composite", "requests": [ { From bd214f32eb84b4e5098f91327444030d3b5da8ef Mon Sep 17 00:00:00 2001 From: John Verwolf Date: Wed, 2 Aug 2023 10:16:43 -0700 Subject: [PATCH 20/24] Percolator: update names to new convention --- percolator/challenges/default.json | 16 +++++++-------- percolator/operations/default.json | 32 +++++++++++++++--------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/percolator/challenges/default.json b/percolator/challenges/default.json index f4d4d892..c56148e9 100644 --- a/percolator/challenges/default.json +++ b/percolator/challenges/default.json @@ -59,50 +59,50 @@ } }, { - "operation": "percolator_with_content_president_bush", + "operation": "compareme-percolator_with_content_president_bush", "warmup-iterations": 100, "iterations": 100, "target-throughput": 50 }, { - "operation": "percolator_with_content_saddam_hussein", + "operation": "compareme-percolator_with_content_saddam_hussein", "warmup-iterations": 100, "iterations": 100, "target-throughput": 50 }, { - "operation": "percolator_with_content_hurricane_katrina", + "operation": "compareme-percolator_with_content_hurricane_katrina", "warmup-iterations": 100, "iterations": 100, "target-throughput": 50 }, { - "operation": "percolator_with_content_google", + "operation": "compareme-percolator_with_content_google", "warmup-iterations": 100, "iterations": 100, "target-throughput": 27 }, { - "operation": "percolator_no_score_with_content_google", + "operation": "compareme-percolator_no_score_with_content_google", "warmup-iterations": 100, "iterations": 100, "target-throughput": 100 }, { - "operation": "percolator_with_highlighting", + "operation": "compareme-percolator_with_highlighting", "warmup-iterations": 100, "iterations": 100, "target-throughput": 50 }, { - "operation": "percolator_with_content_ignore_me", + "operation": "compareme-percolator_with_content_ignore_me", "warmup-iterations": 10, "iterations": 100, "#COMMENT": "Be aware that we specify *target-interval* here! This means we issue one query every 12 seconds", "target-interval": 12 }, { - "operation": "percolator_no_score_with_content_ignore_me", + "operation": "compareme-percolator_no_score_with_content_ignore_me", "warmup-iterations": 100, "iterations": 100, "target-throughput": 15 diff --git a/percolator/operations/default.json b/percolator/operations/default.json index bf524d0a..15baedd4 100644 --- a/percolator/operations/default.json +++ b/percolator/operations/default.json @@ -5,7 +5,7 @@ "ingest-percentage": {{ingest_percentage | default(100)}} }, { - "name": "percolator_with_content_president_bush", + "name": "compareme-percolator_with_content_president_bush", "operation-type": "search", "index": "queries", "body": { @@ -32,7 +32,7 @@ "method": "POST" }, { - "name": "percolator_with_content_president_bush", + "name": "compareme-percolator_with_content_president_bush", "operation-type": "search", "index": "queries", "body": { @@ -51,7 +51,7 @@ ] }, { - "name": "percolator_with_content_saddam_hussein", + "name": "compareme-percolator_with_content_saddam_hussein", "operation-type": "search", "index": "queries", "body": { @@ -78,7 +78,7 @@ "method": "POST" }, { - "name": "percolator_with_content_saddam_hussein", + "name": "compareme-percolator_with_content_saddam_hussein", "operation-type": "search", "index": "queries", "body": { @@ -97,7 +97,7 @@ ] }, { - "name": "percolator_with_content_hurricane_katrina", + "name": "compareme-percolator_with_content_hurricane_katrina", "operation-type": "search", "index": "queries", "body": { @@ -124,7 +124,7 @@ "method": "POST" }, { - "name": "percolator_with_content_hurricane_katrina", + "name": "compareme-percolator_with_content_hurricane_katrina", "operation-type": "search", "index": "queries", "body": { @@ -143,7 +143,7 @@ ] }, { - "name": "percolator_with_content_google", + "name": "compareme-percolator_with_content_google", "operation-type": "search", "index": "queries", "body": { @@ -170,7 +170,7 @@ "method": "POST" }, { - "name": "percolator_with_content_google", + "name": "compareme-percolator_with_content_google", "operation-type": "search", "index": "queries", "body": { @@ -189,7 +189,7 @@ ] }, { - "name": "percolator_no_score_with_content_google", + "name": "compareme-percolator_no_score_with_content_google", "operation-type": "search", "index": "queries", "body": { @@ -220,7 +220,7 @@ "method": "POST" }, { - "name": "percolator_no_score_with_content_google", + "name": "compareme-percolator_no_score_with_content_google", "operation-type": "search", "index": "queries", "body": { @@ -243,7 +243,7 @@ ] }, { - "name": "percolator_with_highlighting", + "name": "compareme-percolator_with_highlighting", "operation-type": "search", "index": "queries", "body": { @@ -275,7 +275,7 @@ "method": "POST" }, { - "name": "percolator_with_highlighting", + "name": "compareme-percolator_with_highlighting", "operation-type": "search", "index": "queries", "body": { @@ -299,7 +299,7 @@ ] }, { - "name": "percolator_with_content_ignore_me", + "name": "compareme-percolator_with_content_ignore_me", "operation-type": "search", "index": "queries", "body": { @@ -326,7 +326,7 @@ "method": "POST" }, { - "name": "percolator_with_content_ignore_me", + "name": "compareme-percolator_with_content_ignore_me", "operation-type": "search", "index": "queries", "body": { @@ -345,7 +345,7 @@ ] }, { - "name": "percolator_no_score_with_content_ignore_me", + "name": "compareme-percolator_no_score_with_content_ignore_me", "operation-type": "search", "index": "queries", "body": { @@ -376,7 +376,7 @@ "method": "POST" }, { - "name": "percolator_no_score_with_content_ignore_me", + "name": "compareme-percolator_no_score_with_content_ignore_me", "operation-type": "search", "index": "queries", "body": { From 703f9883adf1266d1a51b59e5db08834e46b6e41 Mon Sep 17 00:00:00 2001 From: John Verwolf Date: Wed, 2 Aug 2023 10:42:20 -0700 Subject: [PATCH 21/24] Geonames: update operation names --- geonames/challenges/default.json | 54 +++++++++++++-------------- geonames/operations/default.json | 64 ++++++++++++++++---------------- 2 files changed, 59 insertions(+), 59 deletions(-) diff --git a/geonames/challenges/default.json b/geonames/challenges/default.json index 875c790a..f7caf630 100644 --- a/geonames/challenges/default.json +++ b/geonames/challenges/default.json @@ -72,165 +72,165 @@ "target-throughput": 90 }, { - "operation": "default", + "operation": "compareme-default", "warmup-iterations": 500, "iterations": 1000, "target-throughput": 50 }, { - "operation": "term", + "operation": "compareme-term", "warmup-iterations": 500, "iterations": 1000, "target-throughput": 100 }, { - "operation": "phrase", + "operation": "compareme-phrase", "warmup-iterations": 500, "iterations": 1000, "target-throughput": 110 }, { - "operation": "country_agg_uncached", + "operation": "compareme-country_agg_uncached", "warmup-iterations": 200, "iterations": 100, "target-throughput": 3 }, { - "operation": "country_agg_cached", + "operation": "compareme-country_agg_cached", "warmup-iterations": 1000, "iterations": 1000, "target-throughput": 100 }, { - "operation": "scroll", + "operation": "compareme-scroll", "warmup-iterations": 200, "iterations": 100, "#COMMENT": "Throughput is considered per request. So we issue one scroll request per second which will retrieve 25 pages", "target-throughput": 0.8 }, { - "operation": "expression", + "operation": "compareme-expression", "warmup-iterations": 200, "iterations": 100, "target-throughput": 1.5 }, { - "operation": "painless_static", + "operation": "compareme-painless_static", "warmup-iterations": 200, "iterations": 100, "target-throughput": 1.1 }, { - "operation": "painless_dynamic", + "operation": "compareme-painless_dynamic", "warmup-iterations": 200, "iterations": 100, "target-throughput": 1.4 }, { - "operation": "decay_geo_gauss_function_score", + "operation": "compareme-decay_geo_gauss_function_score", "warmup-iterations": 200, "iterations": 100, "target-throughput": 1 }, { - "operation": "decay_geo_gauss_script_score", + "operation": "compareme-decay_geo_gauss_script_score", "warmup-iterations": 200, "iterations": 100, "target-throughput": 1 }, { - "operation": "field_value_function_score", + "operation": "compareme-field_value_function_score", "warmup-iterations": 200, "iterations": 100, "target-throughput": 1.5 }, { - "operation": "field_value_script_score", + "operation": "compareme-field_value_script_score", "warmup-iterations": 200, "iterations": 100, "target-throughput": 1.5 }, { - "operation": "large_terms", + "operation": "compareme-large_terms", "warmup-iterations": 200, "iterations": 100, "target-throughput": 1.1 }, { - "operation": "large_filtered_terms", + "operation": "compareme-large_filtered_terms", "warmup-iterations": 200, "iterations": 100, "target-throughput": 1.1 }, { - "operation": "large_prohibited_terms", + "operation": "compareme-large_prohibited_terms", "warmup-iterations": 200, "iterations": 100, "target-throughput": 1.1 }, { - "operation": "desc_sort_population", + "operation": "compareme-desc_sort_population", "warmup-iterations": 200, "iterations": 100, "target-throughput": 1.5 }, { - "operation": "desc_sort_population_can_match_shortcut", + "operation": "compareme-desc_sort_population_can_match_shortcut", "warmup-iterations": 200, "iterations": 100, "target-throughput": 1.5 }, { - "operation": "desc_sort_population_no_can_match_shortcut", + "operation": "compareme-desc_sort_population_no_can_match_shortcut", "warmup-iterations": 200, "iterations": 100, "target-throughput": 1.5 }, { - "operation": "asc_sort_population", + "operation": "compareme-asc_sort_population", "warmup-iterations": 200, "iterations": 100, "target-throughput": 1.5 }, { - "operation": "asc_sort_with_after_population", + "operation": "compareme-asc_sort_with_after_population", "warmup-iterations": 200, "iterations": 100, "target-throughput": 1.5 }, { - "operation": "desc_sort_geonameid", + "operation": "compareme-desc_sort_geonameid", "warmup-iterations": 200, "iterations": 100, "target-throughput": 6 }, { - "operation": "desc_sort_with_after_geonameid", + "operation": "compareme-desc_sort_with_after_geonameid", "warmup-iterations": 200, "iterations": 100, "target-throughput": 6 }, { - "operation": "asc_sort_geonameid", + "operation": "compareme-asc_sort_geonameid", "warmup-iterations": 200, "iterations": 100, "target-throughput": 6 }, { - "operation": "asc_sort_with_after_geonameid", + "operation": "compareme-asc_sort_with_after_geonameid", "warmup-iterations": 200, "iterations": 100, "target-throughput": 6 }, { - "operation": "sort_country_code_can_match_shortcut", + "operation": "compareme-sort_country_code_can_match_shortcut", "warmup-iterations": 200, "iterations": 100, "target-throughput": 1.5 }, { - "operation": "sort_country_code_no_can_match_shortcut", + "operation": "compareme-sort_country_code_no_can_match_shortcut", "warmup-iterations": 200, "iterations": 100, "target-throughput": 1.5 diff --git a/geonames/operations/default.json b/geonames/operations/default.json index 7ef5a747..599a904e 100644 --- a/geonames/operations/default.json +++ b/geonames/operations/default.json @@ -15,7 +15,7 @@ "recency": {{recency | default(0)}} }, { - "name": "default", + "name": "compareme-default", "operation-type": "search", "body": { "query": { @@ -24,7 +24,7 @@ } }, { - "name": "term", + "name": "compareme-term", "operation-type": "search", "body": { "query": { @@ -35,7 +35,7 @@ } }, { - "name": "phrase", + "name": "compareme-phrase", "operation-type": "search", "body": { "query": { @@ -46,7 +46,7 @@ } }, { - "name": "country_agg_uncached", + "name": "compareme-country_agg_uncached", "operation-type": "search", "body": { "size": 0, @@ -67,7 +67,7 @@ } }, { - "name": "country_agg_cached", + "name": "compareme-country_agg_cached", "operation-type": "search", "cache": true, "body": { @@ -89,7 +89,7 @@ } }, { - "name": "scroll", + "name": "compareme-scroll", "operation-type": "search", "pages": 25, "results-per-page": 1000, @@ -100,7 +100,7 @@ } }, { - "name": "expression", + "name": "compareme-expression", "operation-type": "search", "body": { "query": { @@ -123,7 +123,7 @@ } }, { - "name": "painless_static", + "name": "compareme-painless_static", "operation-type": "search", "body": { "query": { @@ -146,7 +146,7 @@ } }, { - "name": "painless_dynamic", + "name": "compareme-painless_dynamic", "operation-type": "search", "body": { "query": { @@ -169,7 +169,7 @@ } }, { - "name": "decay_geo_gauss_function_score", + "name": "compareme-decay_geo_gauss_function_score", "operation-type": "search", "body": { "query": { @@ -190,7 +190,7 @@ } }, { - "name": "decay_geo_gauss_script_score", + "name": "compareme-decay_geo_gauss_script_score", "operation-type": "search", "body": { "query": { @@ -210,9 +210,9 @@ } } } - }, + }, { - "name": "field_value_function_score", + "name": "compareme-field_value_function_score", "operation-type": "search", "body": { "query": { @@ -230,7 +230,7 @@ } }, { - "name": "field_value_script_score", + "name": "compareme-field_value_script_score", "operation-type": "search", "body": { "query": { @@ -246,22 +246,22 @@ } }, { - "name": "large_terms", + "name": "compareme-large_terms", "operation-type": "search", "param-source": "pure-terms-query-source" }, { - "name": "large_filtered_terms", + "name": "compareme-large_filtered_terms", "operation-type": "search", "param-source": "filtered-terms-query-source" }, { - "name": "large_prohibited_terms", + "name": "compareme-large_prohibited_terms", "operation-type": "search", "param-source": "prohibited-terms-query-source" }, { - "name": "desc_sort_population", + "name": "compareme-desc_sort_population", "operation-type": "search", "body": { "query": { @@ -273,7 +273,7 @@ } }, { - "name": "desc_sort_population_can_match_shortcut", + "name": "compareme-desc_sort_population_can_match_shortcut", "operation-type": "search", "body": { "track_total_hits": false, @@ -288,7 +288,7 @@ } }, { - "name": "desc_sort_population_no_can_match_shortcut", + "name": "compareme-desc_sort_population_no_can_match_shortcut", "operation-type": "search", "request-params" : { "pre_filter_shard_size" : 10000 @@ -306,7 +306,7 @@ } }, { - "name": "asc_sort_population", + "name": "compareme-asc_sort_population", "operation-type": "search", "body": { "query": { @@ -318,7 +318,7 @@ } }, { - "name": "asc_sort_with_after_population", + "name": "compareme-asc_sort_with_after_population", "operation-type": "search", "body": { "query": { @@ -331,7 +331,7 @@ } }, { - "name": "desc_sort_geonameid", + "name": "compareme-desc_sort_geonameid", "operation-type": "search", "body": { "query": { @@ -343,7 +343,7 @@ } }, { - "name": "desc_sort_with_after_geonameid", + "name": "compareme-desc_sort_with_after_geonameid", "operation-type": "search", "body": { "track_total_hits": false, @@ -357,7 +357,7 @@ } }, { - "name": "asc_sort_geonameid", + "name": "compareme-asc_sort_geonameid", "operation-type": "search", "body": { "query": { @@ -369,7 +369,7 @@ } }, { - "name": "asc_sort_with_after_geonameid", + "name": "compareme-asc_sort_with_after_geonameid", "operation-type": "search", "body": { "track_total_hits": false, @@ -383,7 +383,7 @@ } }, { - "name": "sort_country_code_can_match_shortcut", + "name": "compareme-sort_country_code_can_match_shortcut", "operation-type": "search", "body": { "track_total_hits": false, @@ -398,7 +398,7 @@ } }, { - "name": "sort_country_code_no_can_match_shortcut", + "name": "compareme-sort_country_code_no_can_match_shortcut", "operation-type": "search", "request-params" : { "pre_filter_shard_size" : 10000 @@ -416,7 +416,7 @@ } }, { - "name": "significant_text_selective", + "name": "compareme-significant_text_selective", "operation-type": "search", "body": { "size": 0, @@ -435,7 +435,7 @@ } }, { - "name": "significant_text_sampled_selective", + "name": "compareme-significant_text_sampled_selective", "operation-type": "search", "body": { "size": 0, @@ -461,7 +461,7 @@ } }, { - "name": "significant_text_unselective", + "name": "compareme-significant_text_unselective", "operation-type": "search", "body": { "size": 0, @@ -480,7 +480,7 @@ } }, { - "name": "significant_text_sampled_unselective", + "name": "compareme-significant_text_sampled_unselective", "operation-type": "search", "body": { "size": 0, From c6f13bcd74d1627c15d5f6207162d27f91491102 Mon Sep 17 00:00:00 2001 From: John Verwolf Date: Wed, 2 Aug 2023 11:01:14 -0700 Subject: [PATCH 22/24] Geonames: add cold-cache operations --- geonames/challenges/default.json | 18 - geonames/operations/default.json | 928 ++++++++++++++++++++++++++++++- 2 files changed, 926 insertions(+), 20 deletions(-) diff --git a/geonames/challenges/default.json b/geonames/challenges/default.json index f7caf630..01a373c8 100644 --- a/geonames/challenges/default.json +++ b/geonames/challenges/default.json @@ -150,24 +150,6 @@ "iterations": 100, "target-throughput": 1.5 }, - { - "operation": "compareme-large_terms", - "warmup-iterations": 200, - "iterations": 100, - "target-throughput": 1.1 - }, - { - "operation": "compareme-large_filtered_terms", - "warmup-iterations": 200, - "iterations": 100, - "target-throughput": 1.1 - }, - { - "operation": "compareme-large_prohibited_terms", - "warmup-iterations": 200, - "iterations": 100, - "target-throughput": 1.1 - }, { "operation": "compareme-desc_sort_population", "warmup-iterations": 200, diff --git a/geonames/operations/default.json b/geonames/operations/default.json index 599a904e..04926f00 100644 --- a/geonames/operations/default.json +++ b/geonames/operations/default.json @@ -23,6 +23,31 @@ } } }, + { + "name": "cold-cache-default", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-default", + "operation-type": "search", + "body": { + "query": { + "match_all": {} + } + } + } + ] + } + ] + }, { "name": "compareme-term", "operation-type": "search", @@ -34,6 +59,33 @@ } } }, + { + "name": "cold-cache-term", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-term", + "operation-type": "search", + "body": { + "query": { + "term": { + "country_code.raw": "AT" + } + } + } + } + ] + } + ] + }, { "name": "compareme-phrase", "operation-type": "search", @@ -45,6 +97,33 @@ } } }, + { + "name": "cold-cache-phrase", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-phrase", + "operation-type": "search", + "body": { + "query": { + "match_phrase": { + "name": "Sankt Georgen" + } + } + } + } + ] + } + ] + }, { "name": "compareme-country_agg_uncached", "operation-type": "search", @@ -66,6 +145,43 @@ } } }, + { + "name": "cold-cache-country_agg_uncached", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-country_agg_uncached", + "operation-type": "search", + "body": { + "size": 0, + "aggs": { + "country_population": { + "terms": { + "field": "country_code.raw" + }, + "aggs": { + "sum_population": { + "sum": { + "field": "population" + } + } + } + } + } + } + } + ] + } + ] + }, { "name": "compareme-country_agg_cached", "operation-type": "search", @@ -88,6 +204,44 @@ } } }, + { + "name": "cold-cache-country_agg_cached", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-country_agg_cached", + "operation-type": "search", + "cache": true, + "body": { + "size": 0, + "aggs": { + "country_population": { + "terms": { + "field": "country_code.raw" + }, + "aggs": { + "sum_population": { + "sum": { + "field": "population" + } + } + } + } + } + } + } + ] + } + ] + }, { "name": "compareme-scroll", "operation-type": "search", @@ -99,6 +253,33 @@ } } }, + { + "name": "cold-cache-scroll", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-scroll", + "operation-type": "search", + "pages": 25, + "results-per-page": 1000, + "body": { + "query": { + "match_all": {} + } + } + } + ] + } + ] + }, { "name": "compareme-expression", "operation-type": "search", @@ -122,6 +303,45 @@ } } }, + { + "name": "cold-cache-expression", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-expression", + "operation-type": "search", + "body": { + "query": { + "function_score": { + "query": { + "match_all": {} + }, + "functions": [ + { + "script_score": { + "script": { + "source": "abs(ln(abs(doc['population']) + 1) + doc['location'].lon + doc['location'].lat) * _score", + "lang": "expression" + } + } + } + ] + } + } + } + } + ] + } + ] + }, { "name": "compareme-painless_static", "operation-type": "search", @@ -145,6 +365,45 @@ } } }, + { + "name": "cold-cache-painless_static", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-painless_static", + "operation-type": "search", + "body": { + "query": { + "function_score": { + "query": { + "match_all": {} + }, + "functions": [ + { + "script_score": { + "script": { + "source": "Math.abs(Math.log(Math.abs((int)((List)doc.population).get(0)) + 1) + (double)(doc.location.lon) * (double)(doc.location.lat))/_score", + "lang": "painless" + } + } + } + ] + } + } + } + } + ] + } + ] + }, { "name": "compareme-painless_dynamic", "operation-type": "search", @@ -168,6 +427,45 @@ } } }, + { + "name": "cold-cache-painless_dynamic", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-painless_dynamic", + "operation-type": "search", + "body": { + "query": { + "function_score": { + "query": { + "match_all": {} + }, + "functions": [ + { + "script_score": { + "script": { + "source": "Math.abs(Math.log(Math.abs(doc['population'].value) + 1) + doc['location'].lon * doc['location'].lat)/_score", + "lang": "painless" + } + } + } + ] + } + } + } + } + ] + } + ] + }, { "name": "compareme-decay_geo_gauss_function_score", "operation-type": "search", @@ -189,6 +487,43 @@ } } }, + { + "name": "cold-cache-decay_geo_gauss_function_score", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-decay_geo_gauss_function_score", + "operation-type": "search", + "body": { + "query": { + "function_score": { + "query": { + "match_all": {} + }, + "gauss": { + "location": { + "origin": "52.37, 4.8951", + "scale": "500km", + "offset": "0km", + "decay" : 0.1 + } + } + } + } + } + } + ] + } + ] + }, { "name": "compareme-decay_geo_gauss_script_score", "operation-type": "search", @@ -211,6 +546,44 @@ } } }, + { + "name": "cold-cache-decay_geo_gauss_script_score", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-decay_geo_gauss_script_score", + "operation-type": "search", + "body": { + "query": { + "script_score": { + "query": { + "match_all": {} + }, + "script": { + "source": "decayGeoGauss(params.origin, params.scale, params.offset, params.decay, doc['location'].value)", + "params": { + "origin": "52.37, 4.8951", + "scale": "500km", + "offset": "0km", + "decay" : 0.1 + } + } + } + } + } + } + ] + } + ] + }, { "name": "compareme-field_value_function_score", "operation-type": "search", @@ -228,7 +601,41 @@ } } } - }, + }, + { + "name": "cold-cache-field_value_function_score", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-field_value_function_score", + "operation-type": "search", + "body": { + "query": { + "function_score": { + "query": { + "match_all": {} + }, + "field_value_factor": { + "field": "population", + "factor": 1.2, + "modifier": "log2p" + } + } + } + } + } + ] + } + ] + }, { "name": "compareme-field_value_script_score", "operation-type": "search", @@ -245,6 +652,38 @@ } } }, + { + "name": "cold-cache-field_value_script_score", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-field_value_script_score", + "operation-type": "search", + "body": { + "query": { + "script_score": { + "query": { + "match_all": {} + }, + "script": { + "source": "Math.log10(doc['population'].value * 1.2 + 2)" + } + } + } + } + } + ] + } + ] + }, { "name": "compareme-large_terms", "operation-type": "search", @@ -272,6 +711,34 @@ ] } }, + { + "name": "cold-cache-desc_sort_population", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-desc_sort_population", + "operation-type": "search", + "body": { + "query": { + "match_all": {} + }, + "sort" : [ + {"population" : "desc"} + ] + } + } + ] + } + ] + }, { "name": "compareme-desc_sort_population_can_match_shortcut", "operation-type": "search", @@ -287,6 +754,37 @@ ] } }, + { + "name": "cold-cache-desc_sort_population_can_match_shortcut", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-desc_sort_population_can_match_shortcut", + "operation-type": "search", + "body": { + "track_total_hits": false, + "query": { + "match": { + "timezone": "America" + } + }, + "sort" : [ + {"population" : "desc"} + ] + } + } + ] + } + ] + }, { "name": "compareme-desc_sort_population_no_can_match_shortcut", "operation-type": "search", @@ -305,6 +803,40 @@ ] } }, + { + "name": "cold-cache-desc_sort_population_no_can_match_shortcut", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-desc_sort_population_no_can_match_shortcut", + "operation-type": "search", + "request-params" : { + "pre_filter_shard_size" : 10000 + }, + "body": { + "track_total_hits": false, + "query": { + "match": { + "timezone": "America" + } + }, + "sort" : [ + {"population" : "desc"} + ] + } + } + ] + } + ] + }, { "name": "compareme-asc_sort_population", "operation-type": "search", @@ -317,6 +849,34 @@ ] } }, + { + "name": "cold-cache-asc_sort_population", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-asc_sort_population", + "operation-type": "search", + "body": { + "query": { + "match_all": {} + }, + "sort" : [ + {"population" : "asc"} + ] + } + } + ] + } + ] + }, { "name": "compareme-asc_sort_with_after_population", "operation-type": "search", @@ -330,6 +890,35 @@ "search_after" : [1000000] } }, + { + "name": "cold-cache-asc_sort_with_after_population", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-asc_sort_with_after_population", + "operation-type": "search", + "body": { + "query": { + "match_all": {} + }, + "sort" : [ + {"population" : "asc"} + ], + "search_after" : [1000000] + } + } + ] + } + ] + }, { "name": "compareme-desc_sort_geonameid", "operation-type": "search", @@ -342,6 +931,34 @@ ] } }, + { + "name": "cold-cache-desc_sort_geonameid", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-desc_sort_geonameid", + "operation-type": "search", + "body": { + "query": { + "match_all": {} + }, + "sort" : [ + {"geonameid" : "desc"} + ] + } + } + ] + } + ] + }, { "name": "compareme-desc_sort_with_after_geonameid", "operation-type": "search", @@ -356,6 +973,36 @@ "search_after": [5000000] } }, + { + "name": "cold-cache-desc_sort_with_after_geonameid", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-desc_sort_with_after_geonameid", + "operation-type": "search", + "body": { + "track_total_hits": false, + "query": { + "match_all": {} + }, + "sort" : [ + {"geonameid" : "desc"} + ], + "search_after": [5000000] + } + } + ] + } + ] + }, { "name": "compareme-asc_sort_geonameid", "operation-type": "search", @@ -368,6 +1015,34 @@ ] } }, + { + "name": "cold-cache-asc_sort_geonameid", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-asc_sort_geonameid", + "operation-type": "search", + "body": { + "query": { + "match_all": {} + }, + "sort" : [ + {"geonameid" : "asc"} + ] + } + } + ] + } + ] + }, { "name": "compareme-asc_sort_with_after_geonameid", "operation-type": "search", @@ -382,6 +1057,36 @@ "search_after": [5000000] } }, + { + "name": "cold-cache-asc_sort_with_after_geonameid", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-asc_sort_with_after_geonameid", + "operation-type": "search", + "body": { + "track_total_hits": false, + "query": { + "match_all": {} + }, + "sort" : [ + {"geonameid" : "asc"} + ], + "search_after": [5000000] + } + } + ] + } + ] + }, { "name": "compareme-sort_country_code_can_match_shortcut", "operation-type": "search", @@ -397,6 +1102,37 @@ ] } }, + { + "name": "cold-cache-sort_country_code_can_match_shortcut", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-sort_country_code_can_match_shortcut", + "operation-type": "search", + "body": { + "track_total_hits": false, + "query": { + "match": { + "timezone": "America" + } + }, + "sort" : [ + {"country_code.raw" : "asc"} + ] + } + } + ] + } + ] + }, { "name": "compareme-sort_country_code_no_can_match_shortcut", "operation-type": "search", @@ -415,6 +1151,40 @@ ] } }, + { + "name": "cold-cache-sort_country_code_no_can_match_shortcut", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-sort_country_code_no_can_match_shortcut", + "operation-type": "search", + "request-params" : { + "pre_filter_shard_size" : 10000 + }, + "body": { + "track_total_hits": false, + "query": { + "match": { + "timezone": "America" + } + }, + "sort" : [ + {"country_code.raw" : "asc"} + ] + } + } + ] + } + ] + }, { "name": "compareme-significant_text_selective", "operation-type": "search", @@ -434,6 +1204,41 @@ } } }, + { + "name": "cold-cache-significant_text_selective", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-significant_text_selective", + "operation-type": "search", + "body": { + "size": 0, + "query": { + "match": { + "alternatenames": "street" + } + }, + "aggs": { + "sig": { + "significant_text": { + "field": "alternatenames" + } + } + } + } + } + ] + } + ] + }, { "name": "compareme-significant_text_sampled_selective", "operation-type": "search", @@ -460,6 +1265,48 @@ } } }, + { + "name": "cold-cache-significant_text_sampled_selective", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-significant_text_sampled_selective", + "operation-type": "search", + "body": { + "size": 0, + "query": { + "match": { + "alternatenames": "street" + } + }, + "aggs": { + "s": { + "sampler": { + "shard_size": 100 + }, + "aggs": { + "sig": { + "significant_text": { + "field": "alternatenames" + } + } + } + } + } + } + } + ] + } + ] + }, { "name": "compareme-significant_text_unselective", "operation-type": "search", @@ -479,6 +1326,41 @@ } } }, + { + "name": "cold-cache-significant_text_unselective", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-significant_text_unselective", + "operation-type": "search", + "body": { + "size": 0, + "query": { + "match": { + "timezone": "America" + } + }, + "aggs": { + "sig": { + "significant_text": { + "field": "alternatenames" + } + } + } + } + } + ] + } + ] + }, { "name": "compareme-significant_text_sampled_unselective", "operation-type": "search", @@ -504,4 +1386,46 @@ } } } - } + }, + { + "name": "cold-cache-significant_text_sampled_unselective", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-significant_text_sampled_unselective", + "operation-type": "search", + "body": { + "size": 0, + "query": { + "match": { + "timezone": "America" + } + }, + "aggs": { + "s": { + "sampler": { + "shard_size": 100 + }, + "aggs": { + "sig": { + "significant_text": { + "field": "alternatenames" + } + } + } + } + } + } + } + ] + } + ] + } From b510d584f97b4e2f1401c446c3c577262732b2c7 Mon Sep 17 00:00:00 2001 From: John Verwolf Date: Wed, 2 Aug 2023 11:03:14 -0700 Subject: [PATCH 23/24] Geonames: fix indentation --- geonames/operations/default.json | 1804 +++++++++++++++--------------- 1 file changed, 930 insertions(+), 874 deletions(-) diff --git a/geonames/operations/default.json b/geonames/operations/default.json index 04926f00..e08d3b1a 100644 --- a/geonames/operations/default.json +++ b/geonames/operations/default.json @@ -1,4 +1,4 @@ - { + { "name": "index-append", "operation-type": "bulk", "bulk-size": {{bulk_size | default(5000)}}, @@ -23,31 +23,31 @@ } } }, - { - "name": "cold-cache-default", - "operation-type": "composite", - "requests": [ - { - "stream": [ - { - "name": "cache-clear", - "operation-type": "raw-request", - "path": "/_internal/blob_caches/clear", - "method": "POST" - }, - { - "name": "compareme-default", - "operation-type": "search", - "body": { - "query": { - "match_all": {} - } + { + "name": "cold-cache-default", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-default", + "operation-type": "search", + "body": { + "query": { + "match_all": {} } } - ] - } - ] - }, + } + ] + } + ] + }, { "name": "compareme-term", "operation-type": "search", @@ -59,33 +59,33 @@ } } }, - { - "name": "cold-cache-term", - "operation-type": "composite", - "requests": [ - { - "stream": [ - { - "name": "cache-clear", - "operation-type": "raw-request", - "path": "/_internal/blob_caches/clear", - "method": "POST" - }, - { - "name": "compareme-term", - "operation-type": "search", - "body": { - "query": { - "term": { - "country_code.raw": "AT" - } + { + "name": "cold-cache-term", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-term", + "operation-type": "search", + "body": { + "query": { + "term": { + "country_code.raw": "AT" } } } - ] - } - ] - }, + } + ] + } + ] + }, { "name": "compareme-phrase", "operation-type": "search", @@ -97,33 +97,33 @@ } } }, - { - "name": "cold-cache-phrase", - "operation-type": "composite", - "requests": [ - { - "stream": [ - { - "name": "cache-clear", - "operation-type": "raw-request", - "path": "/_internal/blob_caches/clear", - "method": "POST" - }, - { - "name": "compareme-phrase", - "operation-type": "search", - "body": { - "query": { - "match_phrase": { - "name": "Sankt Georgen" - } + { + "name": "cold-cache-phrase", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-phrase", + "operation-type": "search", + "body": { + "query": { + "match_phrase": { + "name": "Sankt Georgen" } } } - ] - } - ] - }, + } + ] + } + ] + }, { "name": "compareme-country_agg_uncached", "operation-type": "search", @@ -145,43 +145,43 @@ } } }, - { - "name": "cold-cache-country_agg_uncached", - "operation-type": "composite", - "requests": [ - { - "stream": [ - { - "name": "cache-clear", - "operation-type": "raw-request", - "path": "/_internal/blob_caches/clear", - "method": "POST" - }, - { - "name": "compareme-country_agg_uncached", - "operation-type": "search", - "body": { - "size": 0, - "aggs": { - "country_population": { - "terms": { - "field": "country_code.raw" - }, - "aggs": { - "sum_population": { - "sum": { - "field": "population" - } + { + "name": "cold-cache-country_agg_uncached", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-country_agg_uncached", + "operation-type": "search", + "body": { + "size": 0, + "aggs": { + "country_population": { + "terms": { + "field": "country_code.raw" + }, + "aggs": { + "sum_population": { + "sum": { + "field": "population" } } } } } } - ] - } - ] - }, + } + ] + } + ] + }, { "name": "compareme-country_agg_cached", "operation-type": "search", @@ -204,44 +204,44 @@ } } }, - { - "name": "cold-cache-country_agg_cached", - "operation-type": "composite", - "requests": [ - { - "stream": [ - { - "name": "cache-clear", - "operation-type": "raw-request", - "path": "/_internal/blob_caches/clear", - "method": "POST" - }, - { - "name": "compareme-country_agg_cached", - "operation-type": "search", - "cache": true, - "body": { - "size": 0, - "aggs": { - "country_population": { - "terms": { - "field": "country_code.raw" - }, - "aggs": { - "sum_population": { - "sum": { - "field": "population" - } + { + "name": "cold-cache-country_agg_cached", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-country_agg_cached", + "operation-type": "search", + "cache": true, + "body": { + "size": 0, + "aggs": { + "country_population": { + "terms": { + "field": "country_code.raw" + }, + "aggs": { + "sum_population": { + "sum": { + "field": "population" } } } } } } - ] - } - ] - }, + } + ] + } + ] + }, { "name": "compareme-scroll", "operation-type": "search", @@ -253,33 +253,33 @@ } } }, - { - "name": "cold-cache-scroll", - "operation-type": "composite", - "requests": [ - { - "stream": [ - { - "name": "cache-clear", - "operation-type": "raw-request", - "path": "/_internal/blob_caches/clear", - "method": "POST" - }, - { - "name": "compareme-scroll", - "operation-type": "search", - "pages": 25, - "results-per-page": 1000, - "body": { - "query": { - "match_all": {} - } + { + "name": "cold-cache-scroll", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-scroll", + "operation-type": "search", + "pages": 25, + "results-per-page": 1000, + "body": { + "query": { + "match_all": {} } } - ] - } - ] - }, + } + ] + } + ] + }, { "name": "compareme-expression", "operation-type": "search", @@ -303,45 +303,45 @@ } } }, - { - "name": "cold-cache-expression", - "operation-type": "composite", - "requests": [ - { - "stream": [ - { - "name": "cache-clear", - "operation-type": "raw-request", - "path": "/_internal/blob_caches/clear", - "method": "POST" - }, - { - "name": "compareme-expression", - "operation-type": "search", - "body": { - "query": { - "function_score": { - "query": { - "match_all": {} - }, - "functions": [ - { - "script_score": { - "script": { - "source": "abs(ln(abs(doc['population']) + 1) + doc['location'].lon + doc['location'].lat) * _score", - "lang": "expression" - } + { + "name": "cold-cache-expression", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-expression", + "operation-type": "search", + "body": { + "query": { + "function_score": { + "query": { + "match_all": {} + }, + "functions": [ + { + "script_score": { + "script": { + "source": "abs(ln(abs(doc['population']) + 1) + doc['location'].lon + doc['location'].lat) * _score", + "lang": "expression" } } - ] - } + } + ] } } } - ] - } - ] - }, + } + ] + } + ] + }, { "name": "compareme-painless_static", "operation-type": "search", @@ -365,45 +365,45 @@ } } }, - { - "name": "cold-cache-painless_static", - "operation-type": "composite", - "requests": [ - { - "stream": [ - { - "name": "cache-clear", - "operation-type": "raw-request", - "path": "/_internal/blob_caches/clear", - "method": "POST" - }, - { - "name": "compareme-painless_static", - "operation-type": "search", - "body": { - "query": { - "function_score": { - "query": { - "match_all": {} - }, - "functions": [ - { - "script_score": { - "script": { - "source": "Math.abs(Math.log(Math.abs((int)((List)doc.population).get(0)) + 1) + (double)(doc.location.lon) * (double)(doc.location.lat))/_score", - "lang": "painless" - } + { + "name": "cold-cache-painless_static", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-painless_static", + "operation-type": "search", + "body": { + "query": { + "function_score": { + "query": { + "match_all": {} + }, + "functions": [ + { + "script_score": { + "script": { + "source": "Math.abs(Math.log(Math.abs((int)((List)doc.population).get(0)) + 1) + (double)(doc.location.lon) * (double)(doc.location.lat))/_score", + "lang": "painless" } } - ] - } + } + ] } } } - ] - } - ] - }, + } + ] + } + ] + }, { "name": "compareme-painless_dynamic", "operation-type": "search", @@ -427,45 +427,45 @@ } } }, - { - "name": "cold-cache-painless_dynamic", - "operation-type": "composite", - "requests": [ - { - "stream": [ - { - "name": "cache-clear", - "operation-type": "raw-request", - "path": "/_internal/blob_caches/clear", - "method": "POST" - }, - { - "name": "compareme-painless_dynamic", - "operation-type": "search", - "body": { - "query": { - "function_score": { - "query": { - "match_all": {} - }, - "functions": [ - { - "script_score": { - "script": { - "source": "Math.abs(Math.log(Math.abs(doc['population'].value) + 1) + doc['location'].lon * doc['location'].lat)/_score", - "lang": "painless" - } + { + "name": "cold-cache-painless_dynamic", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-painless_dynamic", + "operation-type": "search", + "body": { + "query": { + "function_score": { + "query": { + "match_all": {} + }, + "functions": [ + { + "script_score": { + "script": { + "source": "Math.abs(Math.log(Math.abs(doc['population'].value) + 1) + doc['location'].lon * doc['location'].lat)/_score", + "lang": "painless" } } - ] - } + } + ] } } } - ] - } - ] - }, + } + ] + } + ] + }, { "name": "compareme-decay_geo_gauss_function_score", "operation-type": "search", @@ -474,57 +474,57 @@ "function_score": { "query": { "match_all": {} - }, + }, "gauss": { "location": { "origin": "52.37, 4.8951", "scale": "500km", "offset": "0km", - "decay" : 0.1 + "decay": 0.1 } - } + } } } } }, - { - "name": "cold-cache-decay_geo_gauss_function_score", - "operation-type": "composite", - "requests": [ - { - "stream": [ - { - "name": "cache-clear", - "operation-type": "raw-request", - "path": "/_internal/blob_caches/clear", - "method": "POST" - }, - { - "name": "compareme-decay_geo_gauss_function_score", - "operation-type": "search", - "body": { - "query": { - "function_score": { - "query": { - "match_all": {} - }, - "gauss": { - "location": { - "origin": "52.37, 4.8951", - "scale": "500km", - "offset": "0km", - "decay" : 0.1 - } + { + "name": "cold-cache-decay_geo_gauss_function_score", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-decay_geo_gauss_function_score", + "operation-type": "search", + "body": { + "query": { + "function_score": { + "query": { + "match_all": {} + }, + "gauss": { + "location": { + "origin": "52.37, 4.8951", + "scale": "500km", + "offset": "0km", + "decay": 0.1 } } } } } - ] - } - ] - }, - { + } + ] + } + ] + }, + { "name": "compareme-decay_geo_gauss_script_score", "operation-type": "search", "body": { @@ -536,54 +536,54 @@ "script": { "source": "decayGeoGauss(params.origin, params.scale, params.offset, params.decay, doc['location'].value)", "params": { - "origin": "52.37, 4.8951", - "scale": "500km", - "offset": "0km", - "decay" : 0.1 + "origin": "52.37, 4.8951", + "scale": "500km", + "offset": "0km", + "decay": 0.1 } } } } } - }, - { - "name": "cold-cache-decay_geo_gauss_script_score", - "operation-type": "composite", - "requests": [ - { - "stream": [ - { - "name": "cache-clear", - "operation-type": "raw-request", - "path": "/_internal/blob_caches/clear", - "method": "POST" - }, - { - "name": "compareme-decay_geo_gauss_script_score", - "operation-type": "search", - "body": { - "query": { - "script_score": { - "query": { - "match_all": {} - }, - "script": { - "source": "decayGeoGauss(params.origin, params.scale, params.offset, params.decay, doc['location'].value)", - "params": { - "origin": "52.37, 4.8951", - "scale": "500km", - "offset": "0km", - "decay" : 0.1 - } + }, + { + "name": "cold-cache-decay_geo_gauss_script_score", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-decay_geo_gauss_script_score", + "operation-type": "search", + "body": { + "query": { + "script_score": { + "query": { + "match_all": {} + }, + "script": { + "source": "decayGeoGauss(params.origin, params.scale, params.offset, params.decay, doc['location'].value)", + "params": { + "origin": "52.37, 4.8951", + "scale": "500km", + "offset": "0km", + "decay": 0.1 } } } } } - ] - } - ] - }, + } + ] + } + ] + }, { "name": "compareme-field_value_function_score", "operation-type": "search", @@ -597,45 +597,45 @@ "field": "population", "factor": 1.2, "modifier": "log2p" - } + } } } } }, - { - "name": "cold-cache-field_value_function_score", - "operation-type": "composite", - "requests": [ - { - "stream": [ - { - "name": "cache-clear", - "operation-type": "raw-request", - "path": "/_internal/blob_caches/clear", - "method": "POST" - }, - { - "name": "compareme-field_value_function_score", - "operation-type": "search", - "body": { - "query": { - "function_score": { - "query": { - "match_all": {} - }, - "field_value_factor": { - "field": "population", - "factor": 1.2, - "modifier": "log2p" - } + { + "name": "cold-cache-field_value_function_score", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-field_value_function_score", + "operation-type": "search", + "body": { + "query": { + "function_score": { + "query": { + "match_all": {} + }, + "field_value_factor": { + "field": "population", + "factor": 1.2, + "modifier": "log2p" } } } } - ] - } - ] - }, + } + ] + } + ] + }, { "name": "compareme-field_value_script_score", "operation-type": "search", @@ -652,38 +652,38 @@ } } }, - { - "name": "cold-cache-field_value_script_score", - "operation-type": "composite", - "requests": [ - { - "stream": [ - { - "name": "cache-clear", - "operation-type": "raw-request", - "path": "/_internal/blob_caches/clear", - "method": "POST" - }, - { - "name": "compareme-field_value_script_score", - "operation-type": "search", - "body": { - "query": { - "script_score": { - "query": { - "match_all": {} - }, - "script": { - "source": "Math.log10(doc['population'].value * 1.2 + 2)" - } + { + "name": "cold-cache-field_value_script_score", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-field_value_script_score", + "operation-type": "search", + "body": { + "query": { + "script_score": { + "query": { + "match_all": {} + }, + "script": { + "source": "Math.log10(doc['population'].value * 1.2 + 2)" } } } } - ] - } - ] - }, + } + ] + } + ] + }, { "name": "compareme-large_terms", "operation-type": "search", @@ -706,39 +706,43 @@ "query": { "match_all": {} }, - "sort" : [ - {"population" : "desc"} + "sort": [ + { + "population": "desc" + } ] } }, - { - "name": "cold-cache-desc_sort_population", - "operation-type": "composite", - "requests": [ - { - "stream": [ - { - "name": "cache-clear", - "operation-type": "raw-request", - "path": "/_internal/blob_caches/clear", - "method": "POST" - }, - { - "name": "compareme-desc_sort_population", - "operation-type": "search", - "body": { - "query": { - "match_all": {} - }, - "sort" : [ - {"population" : "desc"} - ] - } + { + "name": "cold-cache-desc_sort_population", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-desc_sort_population", + "operation-type": "search", + "body": { + "query": { + "match_all": {} + }, + "sort": [ + { + "population": "desc" + } + ] } - ] - } - ] - }, + } + ] + } + ] + }, { "name": "compareme-desc_sort_population_can_match_shortcut", "operation-type": "search", @@ -749,47 +753,51 @@ "timezone": "America" } }, - "sort" : [ - {"population" : "desc"} + "sort": [ + { + "population": "desc" + } ] } }, - { - "name": "cold-cache-desc_sort_population_can_match_shortcut", - "operation-type": "composite", - "requests": [ - { - "stream": [ - { - "name": "cache-clear", - "operation-type": "raw-request", - "path": "/_internal/blob_caches/clear", - "method": "POST" - }, - { - "name": "compareme-desc_sort_population_can_match_shortcut", - "operation-type": "search", - "body": { - "track_total_hits": false, - "query": { - "match": { - "timezone": "America" - } - }, - "sort" : [ - {"population" : "desc"} - ] - } + { + "name": "cold-cache-desc_sort_population_can_match_shortcut", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-desc_sort_population_can_match_shortcut", + "operation-type": "search", + "body": { + "track_total_hits": false, + "query": { + "match": { + "timezone": "America" + } + }, + "sort": [ + { + "population": "desc" + } + ] } - ] - } - ] - }, + } + ] + } + ] + }, { "name": "compareme-desc_sort_population_no_can_match_shortcut", "operation-type": "search", - "request-params" : { - "pre_filter_shard_size" : 10000 + "request-params": { + "pre_filter_shard_size": 10000 }, "body": { "track_total_hits": false, @@ -798,45 +806,49 @@ "timezone": "America" } }, - "sort" : [ - {"population" : "desc"} + "sort": [ + { + "population": "desc" + } ] } }, - { - "name": "cold-cache-desc_sort_population_no_can_match_shortcut", - "operation-type": "composite", - "requests": [ - { - "stream": [ - { - "name": "cache-clear", - "operation-type": "raw-request", - "path": "/_internal/blob_caches/clear", - "method": "POST" + { + "name": "cold-cache-desc_sort_population_no_can_match_shortcut", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-desc_sort_population_no_can_match_shortcut", + "operation-type": "search", + "request-params": { + "pre_filter_shard_size": 10000 }, - { - "name": "compareme-desc_sort_population_no_can_match_shortcut", - "operation-type": "search", - "request-params" : { - "pre_filter_shard_size" : 10000 + "body": { + "track_total_hits": false, + "query": { + "match": { + "timezone": "America" + } }, - "body": { - "track_total_hits": false, - "query": { - "match": { - "timezone": "America" - } - }, - "sort" : [ - {"population" : "desc"} - ] - } + "sort": [ + { + "population": "desc" + } + ] } - ] - } - ] - }, + } + ] + } + ] + }, { "name": "compareme-asc_sort_population", "operation-type": "search", @@ -844,39 +856,43 @@ "query": { "match_all": {} }, - "sort" : [ - {"population" : "asc"} + "sort": [ + { + "population": "asc" + } ] } }, - { - "name": "cold-cache-asc_sort_population", - "operation-type": "composite", - "requests": [ - { - "stream": [ - { - "name": "cache-clear", - "operation-type": "raw-request", - "path": "/_internal/blob_caches/clear", - "method": "POST" - }, - { - "name": "compareme-asc_sort_population", - "operation-type": "search", - "body": { - "query": { - "match_all": {} - }, - "sort" : [ - {"population" : "asc"} - ] - } + { + "name": "cold-cache-asc_sort_population", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-asc_sort_population", + "operation-type": "search", + "body": { + "query": { + "match_all": {} + }, + "sort": [ + { + "population": "asc" + } + ] } - ] - } - ] - }, + } + ] + } + ] + }, { "name": "compareme-asc_sort_with_after_population", "operation-type": "search", @@ -884,41 +900,49 @@ "query": { "match_all": {} }, - "sort" : [ - {"population" : "asc"} + "sort": [ + { + "population": "asc" + } ], - "search_after" : [1000000] + "search_after": [ + 1000000 + ] } }, - { - "name": "cold-cache-asc_sort_with_after_population", - "operation-type": "composite", - "requests": [ - { - "stream": [ - { - "name": "cache-clear", - "operation-type": "raw-request", - "path": "/_internal/blob_caches/clear", - "method": "POST" - }, - { - "name": "compareme-asc_sort_with_after_population", - "operation-type": "search", - "body": { - "query": { - "match_all": {} - }, - "sort" : [ - {"population" : "asc"} - ], - "search_after" : [1000000] - } + { + "name": "cold-cache-asc_sort_with_after_population", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-asc_sort_with_after_population", + "operation-type": "search", + "body": { + "query": { + "match_all": {} + }, + "sort": [ + { + "population": "asc" + } + ], + "search_after": [ + 1000000 + ] } - ] - } - ] - }, + } + ] + } + ] + }, { "name": "compareme-desc_sort_geonameid", "operation-type": "search", @@ -926,39 +950,43 @@ "query": { "match_all": {} }, - "sort" : [ - {"geonameid" : "desc"} + "sort": [ + { + "geonameid": "desc" + } ] } }, - { - "name": "cold-cache-desc_sort_geonameid", - "operation-type": "composite", - "requests": [ - { - "stream": [ - { - "name": "cache-clear", - "operation-type": "raw-request", - "path": "/_internal/blob_caches/clear", - "method": "POST" - }, - { - "name": "compareme-desc_sort_geonameid", - "operation-type": "search", - "body": { - "query": { - "match_all": {} - }, - "sort" : [ - {"geonameid" : "desc"} - ] - } + { + "name": "cold-cache-desc_sort_geonameid", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-desc_sort_geonameid", + "operation-type": "search", + "body": { + "query": { + "match_all": {} + }, + "sort": [ + { + "geonameid": "desc" + } + ] } - ] - } - ] - }, + } + ] + } + ] + }, { "name": "compareme-desc_sort_with_after_geonameid", "operation-type": "search", @@ -967,42 +995,50 @@ "query": { "match_all": {} }, - "sort" : [ - {"geonameid" : "desc"} + "sort": [ + { + "geonameid": "desc" + } ], - "search_after": [5000000] + "search_after": [ + 5000000 + ] } }, - { - "name": "cold-cache-desc_sort_with_after_geonameid", - "operation-type": "composite", - "requests": [ - { - "stream": [ - { - "name": "cache-clear", - "operation-type": "raw-request", - "path": "/_internal/blob_caches/clear", - "method": "POST" - }, - { - "name": "compareme-desc_sort_with_after_geonameid", - "operation-type": "search", - "body": { - "track_total_hits": false, - "query": { - "match_all": {} - }, - "sort" : [ - {"geonameid" : "desc"} - ], - "search_after": [5000000] - } + { + "name": "cold-cache-desc_sort_with_after_geonameid", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-desc_sort_with_after_geonameid", + "operation-type": "search", + "body": { + "track_total_hits": false, + "query": { + "match_all": {} + }, + "sort": [ + { + "geonameid": "desc" + } + ], + "search_after": [ + 5000000 + ] } - ] - } - ] - }, + } + ] + } + ] + }, { "name": "compareme-asc_sort_geonameid", "operation-type": "search", @@ -1010,39 +1046,43 @@ "query": { "match_all": {} }, - "sort" : [ - {"geonameid" : "asc"} + "sort": [ + { + "geonameid": "asc" + } ] } }, - { - "name": "cold-cache-asc_sort_geonameid", - "operation-type": "composite", - "requests": [ - { - "stream": [ - { - "name": "cache-clear", - "operation-type": "raw-request", - "path": "/_internal/blob_caches/clear", - "method": "POST" - }, - { - "name": "compareme-asc_sort_geonameid", - "operation-type": "search", - "body": { - "query": { - "match_all": {} - }, - "sort" : [ - {"geonameid" : "asc"} - ] - } + { + "name": "cold-cache-asc_sort_geonameid", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-asc_sort_geonameid", + "operation-type": "search", + "body": { + "query": { + "match_all": {} + }, + "sort": [ + { + "geonameid": "asc" + } + ] } - ] - } - ] - }, + } + ] + } + ] + }, { "name": "compareme-asc_sort_with_after_geonameid", "operation-type": "search", @@ -1051,42 +1091,50 @@ "query": { "match_all": {} }, - "sort" : [ - {"geonameid" : "asc"} + "sort": [ + { + "geonameid": "asc" + } ], - "search_after": [5000000] + "search_after": [ + 5000000 + ] } }, - { - "name": "cold-cache-asc_sort_with_after_geonameid", - "operation-type": "composite", - "requests": [ - { - "stream": [ - { - "name": "cache-clear", - "operation-type": "raw-request", - "path": "/_internal/blob_caches/clear", - "method": "POST" - }, - { - "name": "compareme-asc_sort_with_after_geonameid", - "operation-type": "search", - "body": { - "track_total_hits": false, - "query": { - "match_all": {} - }, - "sort" : [ - {"geonameid" : "asc"} - ], - "search_after": [5000000] - } + { + "name": "cold-cache-asc_sort_with_after_geonameid", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-asc_sort_with_after_geonameid", + "operation-type": "search", + "body": { + "track_total_hits": false, + "query": { + "match_all": {} + }, + "sort": [ + { + "geonameid": "asc" + } + ], + "search_after": [ + 5000000 + ] } - ] - } - ] - }, + } + ] + } + ] + }, { "name": "compareme-sort_country_code_can_match_shortcut", "operation-type": "search", @@ -1097,47 +1145,51 @@ "timezone": "America" } }, - "sort" : [ - {"country_code.raw" : "asc"} + "sort": [ + { + "country_code.raw": "asc" + } ] } }, - { - "name": "cold-cache-sort_country_code_can_match_shortcut", - "operation-type": "composite", - "requests": [ - { - "stream": [ - { - "name": "cache-clear", - "operation-type": "raw-request", - "path": "/_internal/blob_caches/clear", - "method": "POST" - }, - { - "name": "compareme-sort_country_code_can_match_shortcut", - "operation-type": "search", - "body": { - "track_total_hits": false, - "query": { - "match": { - "timezone": "America" - } - }, - "sort" : [ - {"country_code.raw" : "asc"} - ] - } + { + "name": "cold-cache-sort_country_code_can_match_shortcut", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-sort_country_code_can_match_shortcut", + "operation-type": "search", + "body": { + "track_total_hits": false, + "query": { + "match": { + "timezone": "America" + } + }, + "sort": [ + { + "country_code.raw": "asc" + } + ] } - ] - } - ] - }, + } + ] + } + ] + }, { "name": "compareme-sort_country_code_no_can_match_shortcut", "operation-type": "search", - "request-params" : { - "pre_filter_shard_size" : 10000 + "request-params": { + "pre_filter_shard_size": 10000 }, "body": { "track_total_hits": false, @@ -1146,45 +1198,49 @@ "timezone": "America" } }, - "sort" : [ - {"country_code.raw" : "asc"} + "sort": [ + { + "country_code.raw": "asc" + } ] } }, - { - "name": "cold-cache-sort_country_code_no_can_match_shortcut", - "operation-type": "composite", - "requests": [ - { - "stream": [ - { - "name": "cache-clear", - "operation-type": "raw-request", - "path": "/_internal/blob_caches/clear", - "method": "POST" + { + "name": "cold-cache-sort_country_code_no_can_match_shortcut", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-sort_country_code_no_can_match_shortcut", + "operation-type": "search", + "request-params": { + "pre_filter_shard_size": 10000 }, - { - "name": "compareme-sort_country_code_no_can_match_shortcut", - "operation-type": "search", - "request-params" : { - "pre_filter_shard_size" : 10000 + "body": { + "track_total_hits": false, + "query": { + "match": { + "timezone": "America" + } }, - "body": { - "track_total_hits": false, - "query": { - "match": { - "timezone": "America" - } - }, - "sort" : [ - {"country_code.raw" : "asc"} - ] - } + "sort": [ + { + "country_code.raw": "asc" + } + ] } - ] - } - ] - }, + } + ] + } + ] + }, { "name": "compareme-significant_text_selective", "operation-type": "search", @@ -1204,41 +1260,41 @@ } } }, - { - "name": "cold-cache-significant_text_selective", - "operation-type": "composite", - "requests": [ - { - "stream": [ - { - "name": "cache-clear", - "operation-type": "raw-request", - "path": "/_internal/blob_caches/clear", - "method": "POST" - }, - { - "name": "compareme-significant_text_selective", - "operation-type": "search", - "body": { - "size": 0, - "query": { - "match": { - "alternatenames": "street" - } - }, - "aggs": { - "sig": { - "significant_text": { - "field": "alternatenames" - } + { + "name": "cold-cache-significant_text_selective", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-significant_text_selective", + "operation-type": "search", + "body": { + "size": 0, + "query": { + "match": { + "alternatenames": "street" + } + }, + "aggs": { + "sig": { + "significant_text": { + "field": "alternatenames" } } } } - ] - } - ] - }, + } + ] + } + ] + }, { "name": "compareme-significant_text_sampled_selective", "operation-type": "search", @@ -1265,48 +1321,48 @@ } } }, - { - "name": "cold-cache-significant_text_sampled_selective", - "operation-type": "composite", - "requests": [ - { - "stream": [ - { - "name": "cache-clear", - "operation-type": "raw-request", - "path": "/_internal/blob_caches/clear", - "method": "POST" - }, - { - "name": "compareme-significant_text_sampled_selective", - "operation-type": "search", - "body": { - "size": 0, - "query": { - "match": { - "alternatenames": "street" - } - }, - "aggs": { - "s": { - "sampler": { - "shard_size": 100 - }, - "aggs": { - "sig": { - "significant_text": { - "field": "alternatenames" - } + { + "name": "cold-cache-significant_text_sampled_selective", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-significant_text_sampled_selective", + "operation-type": "search", + "body": { + "size": 0, + "query": { + "match": { + "alternatenames": "street" + } + }, + "aggs": { + "s": { + "sampler": { + "shard_size": 100 + }, + "aggs": { + "sig": { + "significant_text": { + "field": "alternatenames" } } } } } } - ] - } - ] - }, + } + ] + } + ] + }, { "name": "compareme-significant_text_unselective", "operation-type": "search", @@ -1326,41 +1382,41 @@ } } }, - { - "name": "cold-cache-significant_text_unselective", - "operation-type": "composite", - "requests": [ - { - "stream": [ - { - "name": "cache-clear", - "operation-type": "raw-request", - "path": "/_internal/blob_caches/clear", - "method": "POST" - }, - { - "name": "compareme-significant_text_unselective", - "operation-type": "search", - "body": { - "size": 0, - "query": { - "match": { - "timezone": "America" - } - }, - "aggs": { - "sig": { - "significant_text": { - "field": "alternatenames" - } + { + "name": "cold-cache-significant_text_unselective", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-significant_text_unselective", + "operation-type": "search", + "body": { + "size": 0, + "query": { + "match": { + "timezone": "America" + } + }, + "aggs": { + "sig": { + "significant_text": { + "field": "alternatenames" } } } } - ] - } - ] - }, + } + ] + } + ] + }, { "name": "compareme-significant_text_sampled_unselective", "operation-type": "search", @@ -1387,45 +1443,45 @@ } } }, - { - "name": "cold-cache-significant_text_sampled_unselective", - "operation-type": "composite", - "requests": [ - { - "stream": [ - { - "name": "cache-clear", - "operation-type": "raw-request", - "path": "/_internal/blob_caches/clear", - "method": "POST" - }, - { - "name": "compareme-significant_text_sampled_unselective", - "operation-type": "search", - "body": { - "size": 0, - "query": { - "match": { - "timezone": "America" - } - }, - "aggs": { - "s": { - "sampler": { - "shard_size": 100 - }, - "aggs": { - "sig": { - "significant_text": { - "field": "alternatenames" - } + { + "name": "cold-cache-significant_text_sampled_unselective", + "operation-type": "composite", + "requests": [ + { + "stream": [ + { + "name": "cache-clear", + "operation-type": "raw-request", + "path": "/_internal/blob_caches/clear", + "method": "POST" + }, + { + "name": "compareme-significant_text_sampled_unselective", + "operation-type": "search", + "body": { + "size": 0, + "query": { + "match": { + "timezone": "America" + } + }, + "aggs": { + "s": { + "sampler": { + "shard_size": 100 + }, + "aggs": { + "sig": { + "significant_text": { + "field": "alternatenames" } } } } } } - ] - } - ] - } + } + ] + } + ] + } From f8b4827bf06bdcbb9b601472523557f645dcb557 Mon Sep 17 00:00:00 2001 From: John Verwolf Date: Wed, 2 Aug 2023 11:12:15 -0700 Subject: [PATCH 24/24] Geonames: cold cache challenge --- geonames/challenges/default.json | 221 +++++++++++++++++++++++++++++++ geonames/operations/default.json | 43 +++--- 2 files changed, 249 insertions(+), 15 deletions(-) diff --git a/geonames/challenges/default.json b/geonames/challenges/default.json index 01a373c8..0a11cfb0 100644 --- a/geonames/challenges/default.json +++ b/geonames/challenges/default.json @@ -219,6 +219,227 @@ } ] }, + { + "name": "append-no-conflicts-cold-cache", + "description": "Indexes the whole document corpus using Elasticsearch default settings. We only adjust the number of replicas as we benchmark a single node cluster and Rally will only start the benchmark if the cluster turns green. Document ids are unique so all index operations are append only. After that a couple of queries are run.", + "default": false, + "schedule": [ + { + "operation": "delete-index" + }, + { + "operation": { + "operation-type": "create-index", + "settings": {{index_settings | default({}) | tojson}} + } + }, + { + "name": "check-cluster-health", + "operation": { + "operation-type": "cluster-health", + "index": "geonames", + "request-params": { + "wait_for_status": "{{cluster_health | default('green')}}", + "wait_for_no_relocating_shards": "true" + }, + "retry-until-success": true + } + }, + { + "operation": "index-append", + "warmup-time-period": 120, + "clients": {{bulk_indexing_clients | default(8)}}, + "ignore-response-error-level": "{{error_level | default('non-fatal')}}" + }, + { + "name": "refresh-after-index", + "operation": "refresh" + }, + { + "operation": { + "operation-type": "force-merge", + "request-timeout": 7200{%- if max_num_segments is defined %}, + "max-num-segments": {{max_num_segments}} + {%- endif %} + } + }, + { + "name": "refresh-after-force-merge", + "operation": "refresh" + }, + { + "name": "wait-until-merges-finish", + "operation": { + "operation-type": "index-stats", + "index": "_all", + "condition": { + "path": "_all.total.merges.current", + "expected-value": 0 + }, + "retry-until-success": true, + "include-in-reporting": false + } + }, + { + "operation": "index-stats", + "warmup-iterations": 500, + "iterations": 1000, + "target-throughput": 90 + }, + { + "operation": "node-stats", + "warmup-iterations": 100, + "iterations": 1000, + "target-throughput": 90 + }, + { + "operation": "cold-cache-default", + "warmup-iterations": 500, + "iterations": 1000, + "target-throughput": 50 + }, + { + "operation": "cold-cache-term", + "warmup-iterations": 500, + "iterations": 1000, + "target-throughput": 100 + }, + { + "operation": "cold-cache-phrase", + "warmup-iterations": 500, + "iterations": 1000, + "target-throughput": 110 + }, + { + "operation": "cold-cache-country_agg_uncached", + "warmup-iterations": 200, + "iterations": 100, + "target-throughput": 3 + }, + { + "operation": "cold-cache-country_agg_cached", + "warmup-iterations": 1000, + "iterations": 1000, + "target-throughput": 100 + }, + { + "operation": "cold-cache-scroll", + "warmup-iterations": 200, + "iterations": 100, + "#COMMENT": "Throughput is considered per request. So we issue one scroll request per second which will retrieve 25 pages", + "target-throughput": 0.8 + }, + { + "operation": "cold-cache-expression", + "warmup-iterations": 200, + "iterations": 100, + "target-throughput": 1.5 + }, + { + "operation": "cold-cache-painless_static", + "warmup-iterations": 200, + "iterations": 100, + "target-throughput": 1.1 + }, + { + "operation": "cold-cache-painless_dynamic", + "warmup-iterations": 200, + "iterations": 100, + "target-throughput": 1.4 + }, + { + "operation": "cold-cache-decay_geo_gauss_function_score", + "warmup-iterations": 200, + "iterations": 100, + "target-throughput": 1 + }, + { + "operation": "cold-cache-decay_geo_gauss_script_score", + "warmup-iterations": 200, + "iterations": 100, + "target-throughput": 1 + }, + { + "operation": "cold-cache-field_value_function_score", + "warmup-iterations": 200, + "iterations": 100, + "target-throughput": 1.5 + }, + { + "operation": "cold-cache-field_value_script_score", + "warmup-iterations": 200, + "iterations": 100, + "target-throughput": 1.5 + }, + { + "operation": "cold-cache-desc_sort_population", + "warmup-iterations": 200, + "iterations": 100, + "target-throughput": 1.5 + }, + { + "operation": "cold-cache-desc_sort_population_can_match_shortcut", + "warmup-iterations": 200, + "iterations": 100, + "target-throughput": 1.5 + }, + { + "operation": "cold-cache-desc_sort_population_no_can_match_shortcut", + "warmup-iterations": 200, + "iterations": 100, + "target-throughput": 1.5 + }, + + { + "operation": "cold-cache-asc_sort_population", + "warmup-iterations": 200, + "iterations": 100, + "target-throughput": 1.5 + }, + { + "operation": "cold-cache-asc_sort_with_after_population", + "warmup-iterations": 200, + "iterations": 100, + "target-throughput": 1.5 + }, + { + "operation": "cold-cache-desc_sort_geonameid", + "warmup-iterations": 200, + "iterations": 100, + "target-throughput": 6 + }, + { + "operation": "cold-cache-desc_sort_with_after_geonameid", + "warmup-iterations": 200, + "iterations": 100, + "target-throughput": 6 + }, + { + "operation": "cold-cache-asc_sort_geonameid", + "warmup-iterations": 200, + "iterations": 100, + "target-throughput": 6 + }, + { + "operation": "cold-cache-asc_sort_with_after_geonameid", + "warmup-iterations": 200, + "iterations": 100, + "target-throughput": 6 + }, + { + "operation": "cold-cache-sort_country_code_can_match_shortcut", + "warmup-iterations": 200, + "iterations": 100, + "target-throughput": 1.5 + }, + { + "operation": "cold-cache-sort_country_code_no_can_match_shortcut", + "warmup-iterations": 200, + "iterations": 100, + "target-throughput": 1.5 + } + ] + }, { "name": "append-no-conflicts-index-only", "description": "Indexes the whole document corpus using Elasticsearch default settings. We only adjust the number of replicas as we benchmark a single node cluster and Rally will only start the benchmark if the cluster turns green. Document ids are unique so all index operations are append only.", diff --git a/geonames/operations/default.json b/geonames/operations/default.json index e08d3b1a..41ae7a35 100644 --- a/geonames/operations/default.json +++ b/geonames/operations/default.json @@ -38,6 +38,7 @@ { "name": "compareme-default", "operation-type": "search", + "index": "geonames", "body": { "query": { "match_all": {} @@ -74,6 +75,7 @@ { "name": "compareme-term", "operation-type": "search", + "index": "geonames", "body": { "query": { "term": { @@ -111,6 +113,7 @@ }, { "name": "compareme-phrase", + "index": "geonames", "operation-type": "search", "body": { "query": { @@ -160,6 +163,7 @@ { "name": "compareme-country_agg_uncached", "operation-type": "search", + "index": "geonames", "body": { "size": 0, "aggs": { @@ -219,6 +223,7 @@ { "name": "compareme-country_agg_cached", "operation-type": "search", + "index": "geonames", "cache": true, "body": { "size": 0, @@ -268,6 +273,7 @@ { "name": "compareme-scroll", "operation-type": "search", + "index": "geonames", "pages": 25, "results-per-page": 1000, "body": { @@ -318,6 +324,7 @@ { "name": "compareme-expression", "operation-type": "search", + "index": "geonames", "body": { "query": { "function_score": { @@ -380,6 +387,7 @@ { "name": "compareme-painless_static", "operation-type": "search", + "index": "geonames", "body": { "query": { "function_score": { @@ -442,6 +450,7 @@ { "name": "compareme-painless_dynamic", "operation-type": "search", + "index": "geonames", "body": { "query": { "function_score": { @@ -502,6 +511,7 @@ { "name": "compareme-decay_geo_gauss_function_score", "operation-type": "search", + "index": "geonames", "body": { "query": { "function_score": { @@ -561,6 +571,7 @@ { "name": "compareme-decay_geo_gauss_script_score", "operation-type": "search", + "index": "geonames", "body": { "query": { "script_score": { @@ -617,6 +628,7 @@ { "name": "compareme-field_value_function_score", "operation-type": "search", + "index": "geonames", "body": { "query": { "function_score": { @@ -667,6 +679,7 @@ { "name": "compareme-field_value_script_score", "operation-type": "search", + "index": "geonames", "body": { "query": { "script_score": { @@ -684,21 +697,6 @@ } ] }, - { - "name": "compareme-large_terms", - "operation-type": "search", - "param-source": "pure-terms-query-source" - }, - { - "name": "compareme-large_filtered_terms", - "operation-type": "search", - "param-source": "filtered-terms-query-source" - }, - { - "name": "compareme-large_prohibited_terms", - "operation-type": "search", - "param-source": "prohibited-terms-query-source" - }, { "name": "compareme-desc_sort_population", "operation-type": "search", @@ -728,6 +726,7 @@ { "name": "compareme-desc_sort_population", "operation-type": "search", + "index": "geonames", "body": { "query": { "match_all": {} @@ -775,6 +774,7 @@ { "name": "compareme-desc_sort_population_can_match_shortcut", "operation-type": "search", + "index": "geonames", "body": { "track_total_hits": false, "query": { @@ -828,6 +828,7 @@ { "name": "compareme-desc_sort_population_no_can_match_shortcut", "operation-type": "search", + "index": "geonames", "request-params": { "pre_filter_shard_size": 10000 }, @@ -878,6 +879,7 @@ { "name": "compareme-asc_sort_population", "operation-type": "search", + "index": "geonames", "body": { "query": { "match_all": {} @@ -925,6 +927,7 @@ { "name": "compareme-asc_sort_with_after_population", "operation-type": "search", + "index": "geonames", "body": { "query": { "match_all": {} @@ -972,6 +975,7 @@ { "name": "compareme-desc_sort_geonameid", "operation-type": "search", + "index": "geonames", "body": { "query": { "match_all": {} @@ -1020,6 +1024,7 @@ { "name": "compareme-desc_sort_with_after_geonameid", "operation-type": "search", + "index": "geonames", "body": { "track_total_hits": false, "query": { @@ -1068,6 +1073,7 @@ { "name": "compareme-asc_sort_geonameid", "operation-type": "search", + "index": "geonames", "body": { "query": { "match_all": {} @@ -1116,6 +1122,7 @@ { "name": "compareme-asc_sort_with_after_geonameid", "operation-type": "search", + "index": "geonames", "body": { "track_total_hits": false, "query": { @@ -1167,6 +1174,7 @@ { "name": "compareme-sort_country_code_can_match_shortcut", "operation-type": "search", + "index": "geonames", "body": { "track_total_hits": false, "query": { @@ -1220,6 +1228,7 @@ { "name": "compareme-sort_country_code_no_can_match_shortcut", "operation-type": "search", + "index": "geonames", "request-params": { "pre_filter_shard_size": 10000 }, @@ -1275,6 +1284,7 @@ { "name": "compareme-significant_text_selective", "operation-type": "search", + "index": "geonames", "body": { "size": 0, "query": { @@ -1336,6 +1346,7 @@ { "name": "compareme-significant_text_sampled_selective", "operation-type": "search", + "index": "geonames", "body": { "size": 0, "query": { @@ -1397,6 +1408,7 @@ { "name": "compareme-significant_text_unselective", "operation-type": "search", + "index": "geonames", "body": { "size": 0, "query": { @@ -1458,6 +1470,7 @@ { "name": "compareme-significant_text_sampled_unselective", "operation-type": "search", + "index": "geonames", "body": { "size": 0, "query": {