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 9a374da commit 07d90a5
Show file tree
Hide file tree
Showing 9 changed files with 587 additions and 116 deletions.
168 changes: 140 additions & 28 deletions geonames/challenges/default.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,87 +58,199 @@
{
"operation": "index-stats",
"warmup-iterations": 500,
"iterations": 1000,
"target-throughput": 90
"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": 90
"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": 50
"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": 140
"iterations": 1000
{%- if not target_throughput %}
,"target-throughput": 140
{%- 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": 140
"iterations": 1000
{%- if not target_throughput %}
,"target-throughput": 140
{%- 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": 3.6
"iterations": 100
{%- if not target_throughput %}
,"target-throughput": 3.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": "country_agg_cached",
"warmup-iterations": 1000,
"iterations": 1000,
"target-throughput": 100
"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": 0.8
"#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": 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": "painless_static",
"warmup-iterations": 200,
"iterations": 100,
"target-throughput": 1.5
"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": 1.5
"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": 1.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": 1.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": 1.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 %}
}
]
},
Expand Down
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
Loading

0 comments on commit 07d90a5

Please sign in to comment.