Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport 1] Revert "Add configurable throughput and client parameters" #414

Merged
merged 1 commit into from
Sep 20, 2024
Merged

[Backport 1] Revert "Add configurable throughput and client parameters" #414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
325 changes: 250 additions & 75 deletions geonames/test_procedures/default.json
View file
Open in desktop

Large diffs are not rendered by default.

52 changes: 40 additions & 12 deletions geopoint/test_procedures/default.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
}
]
},
Expand Down
26 changes: 20 additions & 6 deletions geopointshape/test_procedures/default.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
}
]
},
Expand Down
26 changes: 20 additions & 6 deletions geoshape/test_procedures/default.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
}
]
}
Loading