Skip to content

Commit

Permalink
Add target throughput and search clients parameters to all applicable…
Browse files Browse the repository at this point in the history 
… queries
  • Loading branch information
@engechas
engechas committed Dec 3, 2021
1 parent e262b89 commit 74f9c33
Show file tree
Hide file tree
Showing 11 changed files with 1,073 additions and 224 deletions.
324 changes: 270 additions & 54 deletions geonames/challenges/default.json
View file

Large diffs are not rendered by default.

48 changes: 40 additions & 8 deletions geopoint/challenges/default.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,26 +60,58 @@
{
"operation": "polygon",
"warmup-iterations": 200,
"iterations": 100,
"target-throughput": 2
"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": 2
"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": 5
"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": 0.5
"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 %}
}
]
},
Expand Down
24 changes: 20 additions & 4 deletions geopointshape/challenges/default.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,30 @@
{
"operation": "polygon",
"warmup-iterations": 200,
"iterations": 100,
"target-throughput": 2
"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": 2
"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 %}
}
]
},
Expand Down
24 changes: 20 additions & 4 deletions geoshape/challenges/default.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,14 +123,30 @@
{
"operation": "polygon",
"warmup-iterations": 200,
"iterations": 100,
"target-throughput": 0.3
"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": 0.25
"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 %}
}
]
}
156 changes: 130 additions & 26 deletions http_logs/challenges/default.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,57 +58,129 @@
{
"operation": "default",
"warmup-iterations": 500,
"iterations": 100,
"target-throughput": 8
"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 %}
},
{
"operation": "term",
"warmup-iterations": 500,
"iterations": 100,
"target-throughput": 50
"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": 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": "hourly_agg",
"warmup-iterations": 100,
"iterations": 100,
"target-throughput": 0.2
"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",
"warmup-iterations": 100,
"iterations": 200,
"#COMMENT": "Throughput is considered per request. So we issue one scroll request per second which will retrieve 25 pages",
"target-throughput": 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": 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_timestamp",
"warmup-iterations": 200,
"iterations": 100,
"target-throughput": 0.5
"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": 0.5
"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": 0.5
"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": 0.5
"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",
Expand Down Expand Up @@ -139,29 +211,61 @@
"name": "desc-sort-timestamp-after-force-merge-1-seg",
"operation": "desc_sort_timestamp",
"warmup-iterations": 200,
"iterations": 100,
"target-throughput": 2
"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": 2
"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": 0.5
"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": 0.5
"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 %}
}
]
},
Expand Down
Loading

0 comments on commit 74f9c33

Please sign in to comment.