From e99201de10d584ad982d6b68e1de60f0ba2e9e74 Mon Sep 17 00:00:00 2001 From: Michael Oviedo Date: Tue, 15 Oct 2024 17:27:53 +0000 Subject: [PATCH] add configurable options to nested workload Signed-off-by: Michael Oviedo --- nested/test_procedures/default.json | 119 +++++++--------------------- 1 file changed, 28 insertions(+), 91 deletions(-) diff --git a/nested/test_procedures/default.json b/nested/test_procedures/default.json index 0f148b26..bc4c275c 100644 --- a/nested/test_procedures/default.json +++ b/nested/test_procedures/default.json @@ -60,115 +60,52 @@ }, { "operation": "randomized-nested-queries", - "warmup-iterations": 500, - "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 %} + "warmup-iterations": {{ randomized_nested_queries_warmup_iterations or warmup_iterations | default(500) | tojson }}, + "iterations": {{ randomized_nested_queries_iterations or iterations | default(1000) | tojson }}, + "target-throughput": {{ randomized_nested_queries_target_throughput or target_throughput | default(20) | tojson }}, + "clients": {{ randomized_nested_queries_search_clients or search_clients | default(2) }} }, { "operation": "randomized-term-queries", - "warmup-iterations": 500, - "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 %} + "warmup-iterations": {{ randomized_term_queries_warmup_iterations or warmup_iterations | default(500) | tojson }}, + "iterations": {{ randomized_term_queries_iterations or iterations | default(200) | tojson }}, + "target-throughput": {{ randomized_term_queries_target_throughput or target_throughput | default(25) | tojson }}, + "clients": {{ randomized_term_queries_search_clients or search_clients | default(2) }} }, { "operation": "randomized-sorted-term-queries", - "warmup-iterations": 500, - "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 %} + "warmup-iterations": {{ randomized_sorted_term_queries_warmup_iterations or warmup_iterations | default(500) | tojson }}, + "iterations": {{ randomized_sorted_term_queries_iterations or iterations | default(200) | tojson }}, + "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) }} }, { "operation": "match-all", - "warmup-iterations": 500, - "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 %} + "warmup-iterations": {{ match_all_warmup_iterations or warmup_iterations | default(500) | tojson }}, + "iterations": {{ match_all_iterations or iterations | default(200) | tojson }}, + "target-throughput": {{ match_all_target_throughput or target_throughput | default(5) | tojson }}, + "clients": {{ match_all_search_clients or search_clients | default(2) }} }, { "operation": "nested-date-histo", - "warmup-iterations": 100, - "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 %} + "warmup-iterations": {{ nested_date_histo_warmup_iterations or warmup_iterations | default(100) | tojson }}, + "iterations": {{ nested_date_histo_iterations or iterations | default(200) | tojson }}, + "target-throughput": {{ nested_date_histo_target_throughput or target_throughput | default(1) | tojson }}, + "clients": {{ nested_date_histo_search_clients or search_clients | default(2) }} }, { "operation": "randomized-nested-queries-with-inner-hits_default", - "warmup-iterations": 500, - "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 %} + "warmup-iterations": {{ randomized_nested_queries_with_inner_hits_default_warmup_iterations or warmup_iterations | default(500) | tojson }}, + "iterations": {{ randomized_nested_queries_with_inner_hits_default_iterations or iterations | default(1000) | tojson }}, + "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) }} }, { "operation": "randomized-nested-queries-with-inner-hits_default_big_size", - "warmup-iterations": 500, - "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 %} + "warmup-iterations": {{ randomized_nested_queries_with_inner_hits_default_big_size_warmup_iterations or warmup_iterations | default(500) | tojson }}, + "iterations": {{ randomized_nested_queries_with_inner_hits_default_big_size_iterations or iterations | default(1000) | tojson }}, + "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) }} } ] },