diff --git a/geonames/test_procedures/default.json b/geonames/test_procedures/default.json index 8257aa01..77a93996 100644 --- a/geonames/test_procedures/default.json +++ b/geonames/test_procedures/default.json @@ -60,178 +60,353 @@ { "operation": "index-stats", "warmup-iterations": 500, - "iterations": 1000, - "target-throughput": {{ index_stats_target_throughput or target_throughput | default(90) | tojson }}, - "clients": {{ index_stats_search_clients or search_clients | default(1) }} + "iterations": 1000 + {%- if not target_throughput %} + ,"target-throughput": 90 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "node-stats", "warmup-iterations": 100, - "iterations": 1000, - "target-throughput": {{ node_stats_target_throughput or target_throughput | default(90) | tojson }}, - "clients": {{ node_stats_search_clients or search_clients | default(1) }} + "iterations": 1000 + {%- if not target_throughput %} + ,"target-throughput": 90 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "default", "warmup-iterations": 500, - "iterations": 1000, - "target-throughput": {{ default_target_throughput or target_throughput | default(50) | tojson }}, - "clients": {{ default_search_clients or search_clients | default(1) }} + "iterations": 1000 + {%- if not target_throughput %} + ,"target-throughput": 50 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "term", "warmup-iterations": 500, - "iterations": 1000, - "target-throughput": {{ term_target_throughput or target_throughput | default(100) | tojson }}, - "clients": {{ term_search_clients or search_clients | default(1) }} + "iterations": 1000 + {%- if not target_throughput %} + ,"target-throughput": 100 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "phrase", "warmup-iterations": 500, - "iterations": 1000, - "target-throughput": {{ phrase_target_throughput or target_throughput | default(110) | tojson }}, - "clients": {{ phrase_search_clients or search_clients | default(1) }} + "iterations": 1000 + {%- if not target_throughput %} + ,"target-throughput": 110 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "country_agg_uncached", "warmup-iterations": 200, - "iterations": 100, - "target-throughput": {{ country_agg_uncached_target_throughput or target_throughput | default(3) | tojson }}, - "clients": {{ country_agg_uncached_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 3 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "country_agg_cached", "warmup-iterations": 1000, - "iterations": 1000, - "target-throughput": {{ country_agg_cached_target_throughput or target_throughput | default(100) | tojson }}, - "clients": {{ country_agg_cached_search_clients or search_clients | default(1) }} + "iterations": 1000 + {%- if not target_throughput %} + ,"target-throughput": 100 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "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": {{ scroll_target_throughput or target_throughput | default(0.8) | tojson }}, - "clients": {{ scroll_search_clients or search_clients | default(1) }} + "#COMMENT": "Throughput is considered per request. So we issue one scroll request per second which will retrieve 25 pages" + {%- if not target_throughput %} + ,"target-throughput": 0.8 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "expression", "warmup-iterations": 200, - "iterations": 100, - "target-throughput": {{ expression_target_throughput or target_throughput | default(1.5) | tojson }}, - "clients": {{ expression_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 1.5 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "painless_static", "warmup-iterations": 200, - "iterations": 100, - "target-throughput": {{ painless_static_target_throughput or target_throughput | default(1.5) | tojson }}, - "clients": {{ painless_static_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 1.5 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "painless_dynamic", "warmup-iterations": 200, - "iterations": 100, - "target-throughput": {{ painless_dynamic_target_throughput or target_throughput | default(1.5) | tojson }}, - "clients": {{ painless_dynamic_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 1.5 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "decay_geo_gauss_function_score", "warmup-iterations": 200, - "iterations": 100, - "target-throughput": {{ decay_geo_gauss_function_score_target_throughput or target_throughput | default(1) | tojson }}, - "clients": {{ decay_geo_gauss_function_score_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 1 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "decay_geo_gauss_script_score", "warmup-iterations": 200, - "iterations": 100, - "target-throughput": {{ decay_geo_gauss_script_score_target_throughput or target_throughput | default(1) | tojson }}, - "clients": {{ decay_geo_gauss_script_score_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 1 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "field_value_function_score", "warmup-iterations": 200, - "iterations": 100, - "target-throughput": {{ field_value_function_score_target_throughput or target_throughput | default(1.5) | tojson }}, - "clients": {{ field_value_function_score_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 1.5 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "field_value_script_score", "warmup-iterations": 200, - "iterations": 100, - "target-throughput": {{ field_value_script_score_target_throughput or target_throughput | default(1.5) | tojson }}, - "clients": {{ field_value_script_score_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 1.5 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "large_terms", "warmup-iterations": 200, - "iterations": 100, - "target-throughput": {{ large_terms_target_throughput or target_throughput | default(1.1) | tojson }}, - "clients": {{ large_terms_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 1.1 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "large_filtered_terms", "warmup-iterations": 200, - "iterations": 100, - "target-throughput": {{ large_filtered_terms_target_throughput or target_throughput | default(1.1) | tojson }}, - "clients": {{ large_filtered_terms_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 1.1 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "large_prohibited_terms", "warmup-iterations": 200, - "iterations": 100, - "target-throughput": {{ large_prohibited_terms_target_throughput or target_throughput | default(1.1) | tojson }}, - "clients": {{ large_prohibited_terms_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 1.1 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "desc_sort_population", "warmup-iterations": 200, - "iterations": 100, - "target-throughput": {{ desc_sort_population_target_throughput or target_throughput | default(1.5) | tojson }}, - "clients": {{ desc_sort_population_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 1.5 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "asc_sort_population", "warmup-iterations": 200, - "iterations": 100, - "target-throughput": {{ asc_sort_population_target_throughput or target_throughput | default(1.5) | tojson }}, - "clients": {{ asc_sort_population_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 1.5 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "asc_sort_with_after_population", "warmup-iterations": 200, - "iterations": 100, - "target-throughput": {{ asc_sort_with_after_population_target_throughput or target_throughput | default(1.5) | tojson }}, - "clients": {{ asc_sort_with_after_population_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 1.5 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "desc_sort_geonameid", "warmup-iterations": 200, - "iterations": 100, - "target-throughput": {{ desc_sort_geonameid_target_throughput or target_throughput | default(6) | tojson }}, - "clients": {{ desc_sort_geonameid_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 6 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "desc_sort_with_after_geonameid", "warmup-iterations": 200, - "iterations": 100, - "target-throughput": {{ desc_sort_with_after_geonameid_target_throughput or target_throughput | default(6) | tojson }}, - "clients": {{ desc_sort_with_after_geonameid_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 6 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "asc_sort_geonameid", "warmup-iterations": 200, - "iterations": 100, - "target-throughput": {{ asc_sort_geonameid_target_throughput or target_throughput | default(6) | tojson }}, - "clients": {{ asc_sort_geonameid_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 6 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "asc_sort_with_after_geonameid", "warmup-iterations": 200, - "iterations": 100, - "target-throughput": {{ asc_sort_with_after_geonameid_target_throughput or target_throughput | default(6) | tojson }}, - "clients": {{ asc_sort_with_after_geonameid_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 6 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} } ] }, diff --git a/geopoint/test_procedures/default.json b/geopoint/test_procedures/default.json index 62c16d1a..37dff374 100644 --- a/geopoint/test_procedures/default.json +++ b/geopoint/test_procedures/default.json @@ -62,30 +62,58 @@ { "operation": "polygon", "warmup-iterations": 200, - "iterations": 100, - "target-throughput": {{ polygon_target_throughput or target_throughput | default(2) | tojson }}, - "clients": {{ polygon_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 2 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "bbox", "warmup-iterations": 200, - "iterations": 100, - "target-throughput": {{ bbox_target_throughput or target_throughput | default(2) | tojson }}, - "clients": {{ bbox_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 2 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "distance", "warmup-iterations": 200, - "iterations": 100, - "target-throughput": {{ distance_target_throughput or target_throughput | default(5) | tojson }}, - "clients": {{ distance_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 5 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "distanceRange", "warmup-iterations": 200, - "iterations": 100, - "target-throughput": {{ distanceRange_target_throughput or target_throughput | default(0.5) | tojson }}, - "clients": {{ distanceRange_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 0.5 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} } ] }, diff --git a/geopointshape/test_procedures/default.json b/geopointshape/test_procedures/default.json index dcf81b33..e5181397 100644 --- a/geopointshape/test_procedures/default.json +++ b/geopointshape/test_procedures/default.json @@ -60,16 +60,30 @@ { "operation": "polygon", "warmup-iterations": 200, - "iterations": 100, - "target-throughput": {{ polygon_target_throughput or target_throughput | default(2) | tojson }}, - "clients": {{ polygon_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 2 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "bbox", "warmup-iterations": 200, - "iterations": 100, - "target-throughput": {{ bbox_target_throughput or target_throughput | default(2) | tojson }}, - "clients": {{ bbox_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 2 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} } ] }, diff --git a/geoshape/test_procedures/default.json b/geoshape/test_procedures/default.json index 798eea25..06e4e5bd 100644 --- a/geoshape/test_procedures/default.json +++ b/geoshape/test_procedures/default.json @@ -127,16 +127,30 @@ { "operation": "polygon", "warmup-iterations": 200, - "iterations": 100, - "target-throughput": {{ polygon_target_throughput or target_throughput | default(0.3) | tojson }}, - "clients": {{ polygon_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 0.3 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "bbox", "warmup-iterations": 200, - "iterations": 100, - "target-throughput": {{ bbox_target_throughput or target_throughput | default(0.25) | tojson }}, - "clients": {{ bbox_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 0.25 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} } ] } diff --git a/http_logs/test_procedures/default.json b/http_logs/test_procedures/default.json index aba45ab3..cb89bb2c 100644 --- a/http_logs/test_procedures/default.json +++ b/http_logs/test_procedures/default.json @@ -59,54 +59,101 @@ { "operation": "default", "warmup-iterations": 500, - "iterations": 100, - "target-throughput": {{ default_target_throughput or target_throughput | default(8) | tojson }}, - "clients": {{ default_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 8 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%-if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "name": "term", "operation": "term", "warmup-iterations": 500, - "iterations": 100, - "target-throughput": {{ term_target_throughput or target_throughput | default(50) | tojson }}, - "clients": {{ term_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 50 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%-if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "range", "warmup-iterations": 100, - "iterations": 100, - "target-throughput": {{ range_target_throughput or target_throughput | default(1) | tojson }}, - "clients": {{ range_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 1 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%-if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "200s-in-range", - "name": "status-200s-in-range", "warmup-iterations": 500, - "iterations": 100, - "target-throughput": {{ status_200s_in_range_target_throughput or target_throughput | default(33) | tojson }}, - "clients": {{ status_200s_in_range_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 33 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%-if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "400s-in-range", - "name": "status-400s-in-range", "warmup-iterations": 500, - "iterations": 100, - "target-throughput": {{ status_400s_in_range_target_throughput or target_throughput | default(50) | tojson }}, - "clients": {{ status_400s_in_range_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 50 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%-if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "hourly_agg", "warmup-iterations": 50, - "iterations": 100, - "target-throughput": {{ hourly_agg_target_throughput or target_throughput | default(0.2) | tojson }}, - "clients": {{ hourly_agg_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 0.2 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%-if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "multi_term_agg", "warmup-iterations": 50, - "iterations": 100, - "target-throughput": {{ multi_term_agg_target_throughput or target_throughput | default(0.2) | tojson }}, - "clients": {{ multi_term_agg_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 0.2 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%-if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "scroll", @@ -118,44 +165,86 @@ { "operation": "desc_sort_size", "warmup-iterations": 200, - "iterations": 100, - "target-throughput": {{ desc_sort_size_target_throughput or target_throughput | default(0.5) | tojson }}, - "clients": {{ desc_sort_size_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 0.5 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%-if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "asc_sort_size", "warmup-iterations": 200, - "iterations": 100, - "target-throughput": {{ asc_sort_size_target_throughput or target_throughput | default(0.5) | tojson }}, - "clients": {{ asc_sort_size_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 0.5 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%-if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "desc_sort_timestamp", "warmup-iterations": 200, - "iterations": 100, - "target-throughput": {{ desc_sort_timestamp_target_throughput or target_throughput | default(0.5) | tojson }}, - "clients": {{ desc_sort_timestamp_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 0.5 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%-if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "asc_sort_timestamp", "warmup-iterations": 200, - "iterations": 100, - "target-throughput": {{ asc_sort_timestamp_target_throughput or target_throughput | default(0.5) | tojson }}, - "clients": {{ asc_sort_timestamp_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 0.5 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%-if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "desc_sort_with_after_timestamp", "warmup-iterations": 10, - "iterations": 100, - "target-throughput": {{ desc_sort_with_after_timestamp_target_throughput or target_throughput | default(0.5) | tojson }}, - "clients": {{ desc_sort_with_after_timestamp_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 0.5 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%-if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "asc_sort_with_after_timestamp", "warmup-iterations": 10, - "iterations": 100, - "target-throughput": {{ asc_sort_with_after_timestamp_target_throughput or target_throughput | default(0.5) | tojson }}, - "clients": {{ asc_sort_with_after_timestamp_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 0.5 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%-if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "name": "force-merge-1-seg", @@ -186,33 +275,61 @@ "name": "desc-sort-timestamp-after-force-merge-1-seg", "operation": "desc_sort_timestamp", "warmup-iterations": 200, - "iterations": 100, - "target-throughput": {{ desc_sort_timestamp_target_throughput or target_throughput | default(2) | tojson }}, - "clients": {{ desc_sort_timestamp_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 2 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%-if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "name": "asc-sort-timestamp-after-force-merge-1-seg", "operation": "asc_sort_timestamp", "warmup-iterations": 200, - "iterations": 100, - "target-throughput": {{ asc_sort_timestamp_target_throughput or target_throughput | default(2) | tojson }}, - "clients": {{ asc_sort_timestamp_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 2 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%-if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "name": "desc-sort-with-after-timestamp-after-force-merge-1-seg", "operation": "desc_sort_with_after_timestamp", "warmup-iterations": 10, - "iterations": 100, - "target-throughput": {{ desc_sort_with_after_timestamp_target_throughput or target_throughput | default(0.5) | tojson }}, - "clients": {{ desc_sort_with_after_timestamp_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 0.5 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%-if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "name": "asc-sort-with-after-timestamp-after-force-merge-1-seg", "operation": "asc_sort_with_after_timestamp", "warmup-iterations": 10, - "iterations": 100, - "target-throughput": {{ asc_sort_with_after_timestamp_target_throughput or target_throughput | default(0.5) | tojson }}, - "clients": {{ asc_sort_with_after_timestamp_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 0.5 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%-if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} } ] }, @@ -276,47 +393,87 @@ { "operation": "default", "warmup-iterations": 500, - "iterations": 100, - "target-throughput": {{ default_target_throughput or target_throughput | default(8) | tojson }}, - "clients": {{ default_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 8 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%-if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "name": "term", "operation": "term", "warmup-iterations": 500, - "iterations": 100, - "target-throughput": {{ term_target_throughput or target_throughput | default(50) | tojson }}, - "clients": {{ term_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 50 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%-if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "range", "warmup-iterations": 100, - "iterations": 100, - "target-throughput": {{ range_target_throughput or target_throughput | default(1) | tojson }}, - "clients": {{ range_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 1 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%-if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "200s-in-range", - "name": "status-200s-in-range", "warmup-iterations": 500, - "iterations": 100, - "target-throughput": {{ status_200s_in_range_target_throughput or target_throughput | default(33) | tojson }}, - "clients": {{ status_200s_in_range_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 33 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%-if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "400s-in-range", - "name": "status-400s-in-range", "warmup-iterations": 500, - "iterations": 100, - "target-throughput": {{ status_400s_in_range_target_throughput or target_throughput | default(50) | tojson }}, - "clients": {{ status_400s_in_range_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 50 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%-if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "hourly_agg", "warmup-iterations": 50, - "iterations": 100, - "target-throughput": {{ hourly_agg_target_throughput or target_throughput | default(0.2) | tojson }}, - "clients": {{ hourly_agg_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 0.2 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%-if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "scroll", @@ -328,44 +485,86 @@ { "operation": "desc_sort_size", "warmup-iterations": 200, - "iterations": 100, - "target-throughput": {{ desc_sort_size_target_throughput or target_throughput | default(0.5) | tojson }}, - "clients": {{ desc_sort_size_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 0.5 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%-if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "asc_sort_size", "warmup-iterations": 200, - "iterations": 100, - "target-throughput": {{ asc_sort_size_target_throughput or target_throughput | default(0.5) | tojson }}, - "clients": {{ asc_sort_size_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 0.5 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%-if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "desc_sort_timestamp", "warmup-iterations": 200, - "iterations": 100, - "target-throughput": {{ desc_sort_timestamp_target_throughput or target_throughput | default(0.5) | tojson }}, - "clients": {{ desc_sort_timestamp_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 0.5 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%-if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "asc_sort_timestamp", "warmup-iterations": 200, - "iterations": 100, - "target-throughput": {{ asc_sort_timestamp_target_throughput or target_throughput | default(0.5) | tojson }}, - "clients": {{ asc_sort_timestamp_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 0.5 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%-if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "desc_sort_with_after_timestamp", "warmup-iterations": 10, - "iterations": 100, - "target-throughput": {{ desc_sort_with_after_timestamp_target_throughput or target_throughput | default(0.5) | tojson }}, - "clients": {{ desc_sort_with_after_timestamp_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 0.5 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%-if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "asc_sort_with_after_timestamp", "warmup-iterations": 10, - "iterations": 100, - "target-throughput": {{ asc_sort_with_after_timestamp_target_throughput or target_throughput | default(0.5) | tojson }}, - "clients": {{ asc_sort_with_after_timestamp_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 0.5 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%-if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "name": "force-merge-1-seg", @@ -396,33 +595,61 @@ "name": "desc-sort-timestamp-after-force-merge-1-seg", "operation": "desc_sort_timestamp", "warmup-iterations": 200, - "iterations": 100, - "target-throughput": {{ desc_sort_timestamp_target_throughput or target_throughput | default(2) | tojson }}, - "clients": {{ desc_sort_timestamp_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 2 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%-if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "name": "asc-sort-timestamp-after-force-merge-1-seg", "operation": "asc_sort_timestamp", "warmup-iterations": 200, - "iterations": 100, - "target-throughput": {{ asc_sort_timestamp_target_throughput or target_throughput | default(2) | tojson }}, - "clients": {{ asc_sort_timestamp_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 2 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%-if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "name": "desc-sort-with-after-timestamp-after-force-merge-1-seg", "operation": "desc_sort_with_after_timestamp", "warmup-iterations": 10, - "iterations": 100, - "target-throughput": {{ desc_sort_with_after_timestamp_target_throughput or target_throughput | default(0.5) | tojson }}, - "clients": {{ desc_sort_with_after_timestamp_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 0.5 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%-if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "name": "asc-sort-with-after-timestamp-after-force-merge-1-seg", "operation": "asc_sort_with_after_timestamp", "warmup-iterations": 10, - "iterations": 100, - "target-throughput": {{ asc_sort_with_after_timestamp_target_throughput or target_throughput | default(0.5) | tojson }}, - "clients": {{ asc_sort_with_after_timestamp_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 0.5 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%-if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} } ] }, @@ -832,9 +1059,16 @@ "name": "match-all", "operation": "default", "warmup-iterations": 500, - "iterations": 100, - "target-throughput": {{ default_target_throughput or target_throughput | default(8) | tojson }}, - "clients": {{ default_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 8 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%-if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "name": "match-all-baseline-search-pipeline", @@ -843,9 +1077,16 @@ "search-pipeline": "http-log-baseline-search-pipeline" }, "warmup-iterations": 500, - "iterations": 100, - "target-throughput": {{ default_target_throughput or target_throughput | default(8) | tojson }}, - "clients": {{ default_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 8 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%-if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "name": "match-all-status-filter-search-pipeline", @@ -854,9 +1095,16 @@ "search-pipeline": "http-log-status-filter-search-pipeline" }, "warmup-iterations": 500, - "iterations": 100, - "target-throughput": {{ default_target_throughput or target_throughput | default(8) | tojson }}, - "clients": {{ default_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 8 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%-if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "name": "match-all-rename-field-search-pipeline", @@ -865,9 +1113,16 @@ "search-pipeline": "http-log-rename-field-search-pipeline" }, "warmup-iterations": 500, - "iterations": 100, - "target-throughput": {{ default_target_throughput or target_throughput | default(8) | tojson }}, - "clients": {{ default_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 8 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%-if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "name": "match-all-rename-100-field-search-pipeline", @@ -876,9 +1131,16 @@ "search-pipeline": "http-log-rename-100-field-search-pipeline" }, "warmup-iterations": 500, - "iterations": 100, - "target-throughput": {{ default_target_throughput or target_throughput | default(8) | tojson }}, - "clients": {{ default_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 8 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%-if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "name": "match-all-dummy-scripting-search-pipeline", @@ -887,9 +1149,16 @@ "search-pipeline": "http-log-dummy-scripting-search-pipeline" }, "warmup-iterations": 500, - "iterations": 100, - "target-throughput": {{ default_target_throughput or target_throughput | default(8) | tojson }}, - "clients": {{ default_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 8 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%-if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "name": "match-all-100-dummy-scripting-search-pipeline", @@ -898,9 +1167,16 @@ "search-pipeline": "http-log-100-dummy-scripting-search-pipeline" }, "warmup-iterations": 500, - "iterations": 100, - "target-throughput": {{ default_target_throughput or target_throughput | default(8) | tojson }}, - "clients": {{ default_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 8 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%-if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "name": "match-all-all-processors-search-pipeline", @@ -909,17 +1185,31 @@ "search-pipeline": "http-log-all-processors-search-pipeline" }, "warmup-iterations": 500, - "iterations": 100, - "target-throughput": {{ default_target_throughput or target_throughput | default(8) | tojson }}, - "clients": {{ default_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 8 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%-if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "name": "multi-term-filter", "operation": "multi-term-filter", "warmup-iterations": 500, - "iterations": 100, - "target-throughput": {{ multi_term_filter_target_throughput or target_throughput | default(50) | tojson }}, - "clients": {{ multi_term_filter_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 50 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%-if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "name": "term-status-filter-search-pipeline", @@ -928,17 +1218,31 @@ "request-params": { "search-pipeline": "http-log-status-filter-search-pipeline" }, - "iterations": 100, - "target-throughput": {{ term_target_throughput or target_throughput | default(50) | tojson }}, - "clients": {{ term_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 50 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%-if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "name": "range", "operation": "range", "warmup-iterations": 100, - "iterations": 100, - "target-throughput": {{ range_target_throughput or target_throughput | default(1) | tojson }}, - "clients": {{ range_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 1 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%-if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "name": "range-all-processors-search-pipeline", @@ -947,9 +1251,16 @@ "search-pipeline": "http-log-all-processors-search-pipeline" }, "warmup-iterations": 100, - "iterations": 100, - "target-throughput": {{ range_target_throughput or target_throughput | default(1) | tojson }}, - "clients": {{ range_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 1 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%-if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} } ] } diff --git a/nested/test_procedures/default.json b/nested/test_procedures/default.json index 0295004f..0f148b26 100644 --- a/nested/test_procedures/default.json +++ b/nested/test_procedures/default.json @@ -61,51 +61,114 @@ { "operation": "randomized-nested-queries", "warmup-iterations": 500, - "iterations": 1000, - "target-throughput": {{ randomized_nested_queries_target_throughput or target_throughput | default(20) | tojson }}, - "clients": {{ randomized_nested_queries_search_clients or search_clients | default(2) }} + "iterations": 1000 + {%- if not target_throughput %} + ,"target-throughput": 20 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if not search_clients %} + ,"clients": 2 + {%- elif search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "randomized-term-queries", "warmup-iterations": 500, - "iterations": 200, - "target-throughput": {{ randomized_term_queries_target_throughput or target_throughput | default(25) | tojson }}, - "clients": {{ randomized_term_queries_search_clients or search_clients | default(2) }} + "iterations": 200 + {%- if not target_throughput %} + ,"target-throughput": 25 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if not search_clients %} + ,"clients": 2 + {%- elif search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "randomized-sorted-term-queries", "warmup-iterations": 500, - "iterations": 200, - "target-throughput": {{ randomized_sorted_term_queries_target_throughput or target_throughput | default(16) | tojson }}, - "clients": {{ randomized_sorted_term_queries_search_clients or search_clients | default(2) }} + "iterations": 200 + {%- if not target_throughput %} + ,"target-throughput": 16 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if not search_clients %} + ,"clients": 2 + {%- elif search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "match-all", "warmup-iterations": 500, - "iterations": 200, - "target-throughput": {{ match_all_target_throughput or target_throughput | default(5) | tojson }}, - "clients": {{ match_all_search_clients or search_clients | default(2) }} + "iterations": 200 + {%- if not target_throughput %} + ,"target-throughput": 5 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if not search_clients %} + ,"clients": 2 + {%- elif search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "nested-date-histo", "warmup-iterations": 100, - "iterations": 200, - "target-throughput": {{ nested_date_histo_target_throughput or target_throughput | default(1) | tojson }}, - "clients": {{ nested_date_histo_search_clients or search_clients | default(2) }} + "iterations": 200 + {%- if not target_throughput %} + ,"target-throughput": 1 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if not search_clients %} + ,"clients": 2 + {%- elif search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "randomized-nested-queries-with-inner-hits_default", "warmup-iterations": 500, - "iterations": 1000, - "target-throughput": {{ randomized_nested_queries_with_inner_hits_default_target_throughput or target_throughput | default(18) | tojson }}, - "clients": {{ randomized_nested_queries_with_inner_hits_default_search_clients or search_clients | default(2) }} + "iterations": 1000 + {%- if not target_throughput %} + ,"target-throughput": 18 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if not search_clients %} + ,"clients": 2 + {%- elif search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "randomized-nested-queries-with-inner-hits_default_big_size", "warmup-iterations": 500, - "iterations": 1000, - "target-throughput": {{ randomized_nested_queries_with_inner_hits_default_big_size_target_throughput or target_throughput | default(16) | tojson }}, - "clients": {{ randomized_nested_queries_with_inner_hits_default_big_size_search_clients or search_clients | default(2) }} + "iterations": 1000 + {%- if not target_throughput %} + ,"target-throughput": 16 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if not search_clients %} + ,"clients": 2 + {%- elif search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} } ] }, diff --git a/noaa/test_procedures/default.json b/noaa/test_procedures/default.json index 2a827f0d..f08ae580 100644 --- a/noaa/test_procedures/default.json +++ b/noaa/test_procedures/default.json @@ -61,58 +61,114 @@ { "operation": "range_field_big_range", "warmup-iterations": 100, - "iterations": 500, - "target-throughput": {{ range_field_big_range_target_throughput or target_throughput | default(6) | tojson }}, - "clients": {{ range_field_big_range_search_clients or search_clients | default(1) }} + "iterations": 500 + {%- if not target_throughput %} + ,"target-throughput": 6 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "range_field_small_range", "warmup-iterations": 100, - "iterations": 500, - "target-throughput": {{ range_field_small_range_target_throughput or target_throughput | default(10) | tojson }}, - "clients": {{ range_field_small_range_search_clients or search_clients | default(1) }} + "iterations": 500 + {%- if not target_throughput %} + ,"target-throughput": 10 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "range_field_conjunction_big_range_small_term_query", "warmup-iterations": 100, - "iterations": 500, - "target-throughput": {{ range_field_conjunction_big_range_small_term_query_target_throughput or target_throughput | default(10) | tojson }}, - "clients": {{ range_field_conjunction_big_range_small_term_query_search_clients or search_clients | default(1) }} + "iterations": 500 + {%- if not target_throughput %} + ,"target-throughput": 10 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "range_field_conjunction_small_range_small_term_query", "warmup-iterations": 100, - "iterations": 500, - "target-throughput": {{ range_field_conjunction_small_range_small_term_query_target_throughput or target_throughput | default(10) | tojson }}, - "clients": {{ range_field_conjunction_small_range_small_term_query_search_clients or search_clients | default(1) }} + "iterations": 500 + {%- if not target_throughput %} + ,"target-throughput": 10 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "range_field_conjunction_small_range_big_term_query", "warmup-iterations": 100, - "iterations": 500, - "target-throughput": {{ range_field_conjunction_small_range_big_term_query_target_throughput or target_throughput | default(4) | tojson }}, - "clients": {{ range_field_conjunction_small_range_big_term_query_search_clients or search_clients | default(1) }} + "iterations": 500 + {%- if not target_throughput %} + ,"target-throughput": 4 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "range_field_conjunction_big_range_big_term_query", "warmup-iterations": 100, - "iterations": 500, - "target-throughput": {{ range_field_conjunction_big_range_big_term_query_target_throughput or target_throughput | default(1) | tojson }}, - "clients": {{ range_field_conjunction_big_range_big_term_query_search_clients or search_clients | default(1) }} + "iterations": 500 + {%- if not target_throughput %} + ,"target-throughput": 1 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "range_field_disjunction_small_range_small_term_query", "warmup-iterations": 100, - "iterations": 500, - "target-throughput": {{ range_field_disjunction_small_range_small_term_query_target_throughput or target_throughput | default(10) | tojson }}, - "clients": {{ range_field_disjunction_small_range_small_term_query_search_clients or search_clients | default(1) }} + "iterations": 500 + {%- if not target_throughput %} + ,"target-throughput": 10 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "range_field_disjunction_big_range_small_term_query", "warmup-iterations": 100, - "iterations": 500, - "target-throughput": {{ range_field_disjunction_big_range_small_term_query_target_throughput or target_throughput | default(6) | tojson }}, - "clients": {{ range_field_disjunction_big_range_small_term_query_search_clients or search_clients | default(1) }} + "iterations": 500 + {%- if not target_throughput %} + ,"target-throughput": 6 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} } ] }, @@ -227,135 +283,306 @@ { "operation": "max_temp", "warmup-iterations": 10, - "iterations": 100, - "target-throughput": {{ max_temp_target_throughput or target_throughput | default(4) | tojson }}, - "clients": {{ max_temp_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 4 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if not search_clients %} + ,"clients": 1 + {%- elif search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "last_max_temp_top_hits", "warmup-iterations": 10, - "iterations": 100, - "target-throughput": {{ last_max_temp_top_hits_target_throughput or target_throughput | default(4) | tojson }}, - "clients": {{ last_max_temp_top_hits_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 4 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if not search_clients %} + ,"clients": 1 + {%- elif search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "last_max_temp_top_metrics", "warmup-iterations": 10, - "iterations": 100, - "target-throughput": {{ last_max_temp_top_metrics_target_throughput or target_throughput | default(4) | tojson }}, - "clients": {{ last_max_temp_top_metrics_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 4 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if not search_clients %} + ,"clients": 1 + {%- elif search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "max_temp_per_station_10", "warmup-iterations": 10, - "iterations": 100, - "target-throughput": {{ max_temp_per_station_10_target_throughput or target_throughput | default(2) | tojson }}, - "clients": {{ max_temp_per_station_10_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 2 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if not search_clients %} + ,"clients": 1 + {%- elif search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "last_max_temp_per_station_top_hits_10", "warmup-iterations": 10, - "iterations": 100, - "target-throughput": {{ last_max_temp_per_station_top_hits_10_target_throughput or target_throughput | default(2) | tojson }}, - "clients": {{ last_max_temp_per_station_top_hits_10_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 2 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if not search_clients %} + ,"clients": 1 + {%- elif search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "last_max_temp_per_station_top_metrics_10", "warmup-iterations": 10, - "iterations": 100, - "target-throughput": {{ last_max_temp_per_station_top_metrics_10_target_throughput or target_throughput | default(2) | tojson }}, - "clients": {{ last_max_temp_per_station_top_metrics_10_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 2 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if not search_clients %} + ,"clients": 1 + {%- elif search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "last_min_and_max_temp_per_station_top_metrics_10", "warmup-iterations": 10, - "iterations": 100, - "target-throughput": {{ last_min_and_max_temp_per_station_top_metrics_10_target_throughput or target_throughput | default(2) | tojson }}, - "clients": {{ last_min_and_max_temp_per_station_top_metrics_10_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 2 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if not search_clients %} + ,"clients": 1 + {%- elif search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "last_five_max_temp_per_station_top_metrics_10", "warmup-iterations": 10, - "iterations": 100, - "target-throughput": {{ last_five_max_temp_per_station_top_metrics_10_target_throughput or target_throughput | default(2) | tojson }}, - "clients": {{ last_five_max_temp_per_station_top_metrics_10_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 2 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if not search_clients %} + ,"clients": 1 + {%- elif search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "max_temp_per_station_10_depth_first", "warmup-iterations": 10, - "iterations": 100, - "target-throughput": {{ max_temp_per_station_10_depth_first_target_throughput or target_throughput | default(2) | tojson }}, - "clients": {{ max_temp_per_station_10_depth_first_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 2 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if not search_clients %} + ,"clients": 1 + {%- elif search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "last_max_temp_per_station_top_hits_10_depth_first", "warmup-iterations": 10, - "iterations": 100, - "target-throughput": {{ last_max_temp_per_station_top_hits_10_depth_first_target_throughput or target_throughput | default(1) | tojson }}, - "clients": {{ last_max_temp_per_station_top_hits_10_depth_first_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 1 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if not search_clients %} + ,"clients": 1 + {%- elif search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "last_max_temp_per_station_top_metrics_10_depth_first", "warmup-iterations": 10, - "iterations": 100, - "target-throughput": {{ last_max_temp_per_station_top_metrics_10_depth_first_target_throughput or target_throughput | default(1) | tojson }}, - "clients": {{ last_max_temp_per_station_top_metrics_10_depth_first_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 1 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if not search_clients %} + ,"clients": 1 + {%- elif search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "last_max_temp_per_station_top_metrics_10_sort_by", "warmup-iterations": 10, - "iterations": 100, - "target-throughput": {{ last_max_temp_per_station_top_metrics_10_sort_by_target_throughput or target_throughput | default(1) | tojson }}, - "clients": {{ last_max_temp_per_station_top_metrics_10_sort_by_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 1 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if not search_clients %} + ,"clients": 1 + {%- elif search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "max_temp_per_station_5000", "warmup-iterations": 10, - "iterations": 100, - "target-throughput": {{ max_temp_per_station_5000_target_throughput or target_throughput | default(1) | tojson }}, - "clients": {{ max_temp_per_station_5000_search_clients or search_clients | default(1) }} + "iterations": 100 + {%- if not target_throughput %} + ,"target-throughput": 1 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if not search_clients %} + ,"clients": 1 + {%- elif search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "last_max_temp_per_station_top_hits_5000", "warmup-iterations": 10, - "iterations": 50, - "target-throughput": {{ last_max_temp_per_station_top_hits_5000_target_throughput or target_throughput | default(1) | tojson }}, - "clients": {{ last_max_temp_per_station_top_hits_5000_search_clients or search_clients | default(1) }} + "iterations": 50 + {%- if not target_throughput %} + ,"target-throughput": 1 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if not search_clients %} + ,"clients": 1 + {%- elif search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "last_max_temp_per_station_top_hits_5000_via_source", "warmup-iterations": 10, - "iterations": 50, - "target-throughput": {{ last_max_temp_per_station_top_hits_5000_via_source_target_throughput or target_throughput | default(1) | tojson }}, - "clients": {{ last_max_temp_per_station_top_hits_5000_via_source_search_clients or search_clients | default(1) }} + "iterations": 50 + {%- if not target_throughput %} + ,"target-throughput": 1 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if not search_clients %} + ,"clients": 1 + {%- elif search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "last_max_temp_per_station_top_metrics_5000", "warmup-iterations": 10, - "iterations": 50, - "target-throughput": {{ last_max_temp_per_station_top_metrics_5000_target_throughput or target_throughput | default(1) | tojson }}, - "clients": {{ last_max_temp_per_station_top_metrics_5000_search_clients or search_clients | default(1) }} + "iterations": 50 + {%- if not target_throughput %} + ,"target-throughput": 1 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if not search_clients %} + ,"clients": 1 + {%- elif search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "last_min_and_max_temp_per_station_top_metrics_5000", "warmup-iterations": 10, - "iterations": 50, - "target-throughput": {{ last_min_and_max_temp_per_station_top_metrics_5000_target_throughput or target_throughput | default(1) | tojson }}, - "clients": {{ last_min_and_max_temp_per_station_top_metrics_5000_search_clients or search_clients | default(1) }} + "iterations": 50 + {%- if not target_throughput %} + ,"target-throughput": 1 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if not search_clients %} + ,"clients": 1 + {%- elif search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "last_five_max_temp_per_station_top_metrics_5000", "warmup-iterations": 10, - "iterations": 50, - "target-throughput": {{ last_five_max_temp_per_station_top_metrics_5000_target_throughput or target_throughput | default(1) | tojson }}, - "clients": {{ last_five_max_temp_per_station_top_metrics_5000_search_clients or search_clients | default(1) }} + "iterations": 50 + {%- if not target_throughput %} + ,"target-throughput": 1 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if not search_clients %} + ,"clients": 1 + {%- elif search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} }, { "operation": "last_country_code_per_station_top_metrics_5000", "warmup-iterations": 10, - "iterations": 50, - "target-throughput": {{ last_country_code_per_station_top_metrics_5000_target_throughput or target_throughput | default(1) | tojson }}, - "clients": {{ last_country_code_per_station_top_metrics_5000_search_clients or search_clients | default(1) }} + "iterations": 50 + {%- if not target_throughput %} + ,"target-throughput": 1 + {%- elif target_throughput is string and target_throughput.lower() == 'none' %} + {%- else %} + ,"target-throughput": {{ target_throughput | tojson }} + {%- endif %} + {%- if not search_clients %} + ,"clients": 1 + {%- elif search_clients is defined and search_clients %} + ,"clients": {{ search_clients | tojson}} + {%- endif %} } ] }, diff --git a/pmc/test_procedures/default.json b/pmc/test_procedures/default.json index e5f0723b..9221c150 100644 --- a/pmc/test_procedures/default.json +++ b/pmc/test_procedures/default.json @@ -72,43 +72,43 @@ "operation": "default", "warmup-iterations": 500, "iterations": 200, - "target-throughput": {{ default_target_throughput or target_throughput | default(20) | tojson }}, - "clients": {{ default_search_clients or search_clients | default(1) }} + "target-throughput": {{ target_throughput | default(20) | tojson }}, + "clients": {{ search_clients | default(1) }} }, { "operation": "term", "warmup-iterations": 500, "iterations": 200, - "target-throughput": {{ term_target_throughput or target_throughput | default(20) | tojson }}, - "clients": {{ term_search_clients or search_clients | default(1) }} + "target-throughput": {{ target_throughput | default(20) | tojson }}, + "clients": {{ search_clients | default(1) }} }, { "operation": "phrase", "warmup-iterations": 500, "iterations": 200, - "target-throughput": {{ phrase_target_throughput or target_throughput | default(20) | tojson }}, - "clients": {{ phrase_search_clients or search_clients | default(1) }} + "target-throughput": {{ target_throughput | default(20) | tojson }}, + "clients": {{ search_clients | default(1) }} }, { "operation": "articles_monthly_agg_uncached", "warmup-iterations": 500, "iterations": 200, - "target-throughput": {{ articles_monthly_agg_uncached_target_throughput or target_throughput | default(20) | tojson }}, - "clients": {{ articles_monthly_agg_uncached_search_clients or search_clients | default(1) }} + "target-throughput": {{ target_throughput | default(20) | tojson }}, + "clients": {{ search_clients | default(1) }} }, { "operation": "articles_monthly_agg_cached", "warmup-iterations": 500, "iterations": 200, - "target-throughput": {{ articles_monthly_agg_cached_target_throughput or target_throughput | default(20) | tojson }}, - "clients": {{ articles_monthly_agg_cached_search_clients or search_clients | default(1) }} + "target-throughput": {{ target_throughput | default(20) | tojson }}, + "clients": {{ search_clients | default(1) }} }, { "operation": "scroll", "warmup-iterations": 50, "iterations": 100, - "target-throughput": {{ scroll_target_throughput or target_throughput | default(0.5) | tojson }}, - "clients": {{ scroll_search_clients or search_clients | default(1) }} + "target-throughput": {{ target_throughput | default(0.5) | tojson }}, + "clients": {{ search_clients | default(1) }} } ] },