thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-29 02:52:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5672 from yandex/remove-name-from-perftests

Browse Source 
Remove <name> and <metrics> from performance tests fixed-#5634
This commit is contained in:
alexey-milovidov 2019-06-19 01:52:24 +03:00 committed by GitHub
commit 97474a95df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
64 changed files with 4 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dbms/programs/performance-test/PerformanceTestInfo.cpp
View File

@ -48,8 +48,8 @@ PerformanceTestInfo::PerformanceTestInfo(
: profiles_file(profiles_file_) : profiles_file(profiles_file_)
, settings(global_settings_) , settings(global_settings_)
{ {
test_name = config->getString("name");
path = config->getString("path"); path = config->getString("path");
test_name = fs::path(path).stem().string();
if (config->has("main_metric")) if (config->has("main_metric"))
{ {
Strings main_metrics; Strings main_metrics;

2
dbms/tests/performance/IPv4.xml
View File

@ -1,6 +1,4 @@
<test> <test>
<name>IPv4 Functions</name>
<type>loop</type> <type>loop</type>
<stop_conditions> <stop_conditions>

2
dbms/tests/performance/IPv6.xml
View File

@ -1,6 +1,4 @@
<test> <test>
<name>IPv6 Functions</name>
<type>loop</type> <type>loop</type>
<stop_conditions> <stop_conditions>

1
dbms/tests/performance/agg_functions_min_max_any.xml
View File

@ -1,5 +1,4 @@
<test> <test>
<name>test_hits_agg_functions_max_min_any</name>
<type>loop</type> <type>loop</type>
<stop_conditions> <stop_conditions>

5
dbms/tests/performance/array_element.xml
View File

@ -1,5 +1,4 @@
<test> <test>
<name>array_element</name>
<type>once</type> <type>once</type>
<stop_conditions> <stop_conditions>
@ -9,10 +8,6 @@
</any_of> </any_of>
</stop_conditions> </stop_conditions>
<metrics>
<max_rows_per_second />
</metrics>
<main_metric> <main_metric>
<max_rows_per_second /> <max_rows_per_second />
</main_metric> </main_metric>

5
dbms/tests/performance/array_join.xml
View File

@ -1,5 +1,4 @@
<test> <test>
<name>array_join</name>
<type>once</type> <type>once</type>
<stop_conditions> <stop_conditions>
@ -9,10 +8,6 @@
</any_of> </any_of>
</stop_conditions> </stop_conditions>
<metrics>
<max_rows_per_second />
</metrics>
<main_metric> <main_metric>
<max_rows_per_second /> <max_rows_per_second />
</main_metric> </main_metric>

1
dbms/tests/performance/base64.xml
View File

@ -1,5 +1,4 @@
<test> <test>
<name>base64</name>
<type>once</type> <type>once</type>
<stop_conditions> <stop_conditions>

1
dbms/tests/performance/base64_hits.xml
View File

@ -1,5 +1,4 @@
<test> <test>
<name>base64</name>
<type>loop</type> <type>loop</type>
<preconditions> <preconditions>

1
dbms/tests/performance/basename.xml
View File

@ -1,5 +1,4 @@
<test> <test>
<name>basename</name>
<type>loop</type> <type>loop</type>
<stop_conditions> <stop_conditions>

5
dbms/tests/performance/bounding_ratio.xml
View File

@ -1,5 +1,4 @@
<test> <test>
<name>bounding_ratio</name>
<type>once</type> <type>once</type>
<stop_conditions> <stop_conditions>
@ -10,10 +9,6 @@
</any_of> </any_of>
</stop_conditions> </stop_conditions>
<metrics>
<max_rows_per_second />
</metrics>
<query>SELECT boundingRatio(number, number) FROM system.numbers</query> <query>SELECT boundingRatio(number, number) FROM system.numbers</query>
<query>SELECT (argMax(number, number) - argMin(number, number)) / (max(number) - min(number)) FROM system.numbers</query> <query>SELECT (argMax(number, number) - argMin(number, number)) / (max(number) - min(number)) FROM system.numbers</query>
</test> </test>

1
dbms/tests/performance/cidr.xml
View File

@ -1,5 +1,4 @@
<test> <test>
<name>cidr</name>
<type>loop</type> <type>loop</type>
<stop_conditions> <stop_conditions>

2
dbms/tests/performance/column_column_comparison.xml
View File

@ -1,6 +1,4 @@
<test> <test>
<name>Column-column string comparison</name>
<tags> <tags>
<tag>comparison</tag> <tag>comparison</tag>
</tags> </tags>

4
dbms/tests/performance/columns_hashing.xml
View File

@ -1,5 +1,7 @@
<test> <test>
<name>columns_hashing</name> <tags>
<tag>columns_hashing</tag>
</tags>
<preconditions> <preconditions>
<table_exists>hits_100m_single</table_exists> <table_exists>hits_100m_single</table_exists>

5
dbms/tests/performance/complex_array_creation.xml
View File

@ -1,5 +1,4 @@
<test> <test>
<name>complex_array_creation</name>
<type>once</type> <type>once</type>
<stop_conditions> <stop_conditions>
@ -9,10 +8,6 @@
</any_of> </any_of>
</stop_conditions> </stop_conditions>
<metrics>
<max_rows_per_second />
</metrics>
<main_metric> <main_metric>
<max_rows_per_second /> <max_rows_per_second />
</main_metric> </main_metric>

1
dbms/tests/performance/concat_hits.xml
View File

@ -1,5 +1,4 @@
<test> <test>
<name>concat_hits</name>
<type>loop</type> <type>loop</type>
<stop_conditions> <stop_conditions>

9
dbms/tests/performance/conditional.xml
View File

@ -1,6 +1,4 @@
<test> <test>
<name>If with date and time branches</name>
<type>once</type> <type>once</type>
<stop_conditions> <stop_conditions>
@ -10,13 +8,6 @@
</any_of> </any_of>
</stop_conditions> </stop_conditions>
<metrics>
<max_rows_per_second />
<max_bytes_per_second />
<avg_rows_per_second />
<avg_bytes_per_second />
</metrics>
<query>SELECT count() FROM system.numbers WHERE NOT ignore(if(rand() % 2, toDateTime('2019-02-04 01:24:31'), toDate('2019-02-04')))</query> <query>SELECT count() FROM system.numbers WHERE NOT ignore(if(rand() % 2, toDateTime('2019-02-04 01:24:31'), toDate('2019-02-04')))</query>
<query>SELECT count() FROM system.numbers WHERE NOT ignore(multiIf(rand() % 2, toDateTime('2019-02-04 01:24:31'), toDate('2019-02-04')))</query> <query>SELECT count() FROM system.numbers WHERE NOT ignore(multiIf(rand() % 2, toDateTime('2019-02-04 01:24:31'), toDate('2019-02-04')))</query>
<query>SELECT count() FROM system.numbers WHERE NOT ignore(if(rand() % 2, [toDateTime('2019-02-04 01:24:31')], [toDate('2019-02-04')]))</query> <query>SELECT count() FROM system.numbers WHERE NOT ignore(if(rand() % 2, [toDateTime('2019-02-04 01:24:31')], [toDate('2019-02-04')]))</query>

1
dbms/tests/performance/consistent_hashes.xml
View File

@ -1,5 +1,4 @@
<test> <test>
<name>consistent_hashes</name>
<type>once</type> <type>once</type>
<stop_conditions> <stop_conditions>

2
dbms/tests/performance/constant_column_comparison.xml
View File

@ -1,6 +1,4 @@
<test> <test>
<name>Constant-column string comparison</name>
<tags> <tags>
<tag>comparison</tag> <tag>comparison</tag>
</tags> </tags>

2
dbms/tests/performance/constant_column_search.xml
View File

@ -1,6 +1,4 @@
<test> <test>
<name>Constant column string search</name>
<tags> <tags>
<tag>search</tag> <tag>search</tag>
</tags> </tags>

1
dbms/tests/performance/cpu_synthetic.xml
View File

@ -1,5 +1,4 @@
<test> <test>
<name>test_hits</name>
<type>loop</type> <type>loop</type>
<stop_conditions> <stop_conditions>

1
dbms/tests/performance/cryptographic_hashes.xml
View File

@ -1,5 +1,4 @@
<test> <test>
<name>cryptographic_hashes</name>
<type>once</type> <type>once</type>
<stop_conditions> <stop_conditions>

1
dbms/tests/performance/date_parsing.xml
View File

@ -1,5 +1,4 @@
<test> <test>
<name>date_parsing</name>
<type>loop</type> <type>loop</type>
<stop_conditions> <stop_conditions>

8
dbms/tests/performance/date_time.xml
View File

@ -1,5 +1,4 @@
<test> <test>
<name>Functions for working with date and time</name>
<type>once</type> <type>once</type>
@ -14,13 +13,6 @@
</any_of> </any_of>
</stop_conditions> </stop_conditions>
<metrics>
<max_rows_per_second />
<max_bytes_per_second />
<avg_rows_per_second />
<avg_bytes_per_second />
</metrics>
<substitutions> <substitutions>
<substitution> <substitution>
<name>datetime_transform</name> <name>datetime_transform</name>

1
dbms/tests/performance/entropy.xml
View File

@ -1,5 +1,4 @@
<test> <test>
<name>entropy</name>
<type>loop</type> <type>loop</type>
<preconditions> <preconditions>

1
dbms/tests/performance/first_significant_subdomain.xml
View File

@ -1,5 +1,4 @@
<test> <test>
<name>first_significant_subdomain</name>
<type>loop</type> <type>loop</type>
<stop_conditions> <stop_conditions>

2
dbms/tests/performance/fixed_string16.xml
View File

@ -1,6 +1,4 @@
<test> <test>
<name>Comparison of FixedString(16)</name>
<tags> <tags>
<tag>comparison</tag> <tag>comparison</tag>
</tags> </tags>

1
dbms/tests/performance/float_parsing.xml
View File

@ -1,5 +1,4 @@
<test> <test>
<name>float_parsing</name>
<type>once</type> <type>once</type>
<tags> <tags>
<tag>long</tag> <tag>long</tag>

9
dbms/tests/performance/format_date_time.xml
View File

@ -1,6 +1,4 @@
<test> <test>
<name>Function formatDateTime</name>
<type>once</type> <type>once</type>
<tags> <tags>
@ -13,13 +11,6 @@
</any_of> </any_of>
</stop_conditions> </stop_conditions>
<metrics>
<max_rows_per_second />
<max_bytes_per_second />
<avg_rows_per_second />
<avg_bytes_per_second />
</metrics>
<substitutions> <substitutions>
<substitution> <substitution>
<name>format</name> <name>format</name>

8
dbms/tests/performance/functions_coding.xml
View File

@ -1,5 +1,4 @@
<test> <test>
<name>functions_coding</name>
<type>once</type> <type>once</type>
<stop_conditions> <stop_conditions>
@ -9,13 +8,6 @@
</any_of> </any_of>
</stop_conditions> </stop_conditions>
<metrics>
<max_rows_per_second />
<max_bytes_per_second />
<avg_rows_per_second />
<avg_bytes_per_second />
</metrics>
<query>SELECT count() FROM system.numbers WHERE NOT ignore(MACNumToString(number))</query> <query>SELECT count() FROM system.numbers WHERE NOT ignore(MACNumToString(number))</query>
<query>SELECT count() FROM system.numbers WHERE NOT ignore(MACStringToNum(MACNumToString(number)))</query> <query>SELECT count() FROM system.numbers WHERE NOT ignore(MACStringToNum(MACNumToString(number)))</query>
<query>SELECT count() FROM system.numbers_mt WHERE NOT ignore(MACNumToString(rand64()))</query> <query>SELECT count() FROM system.numbers_mt WHERE NOT ignore(MACNumToString(rand64()))</query>

8
dbms/tests/performance/functions_geo.xml
View File

@ -1,5 +1,4 @@
<test> <test>
<name>functions_coding</name>
<type>once</type> <type>once</type>
<stop_conditions> <stop_conditions>
@ -9,13 +8,6 @@
</any_of> </any_of>
</stop_conditions> </stop_conditions>
<metrics>
<max_rows_per_second />
<max_bytes_per_second />
<avg_rows_per_second />
<avg_bytes_per_second />
</metrics>
<!-- lat swings roughly from -90 to 90, lon swings from -180 to 180, and their tempo does not match. --> <!-- lat swings roughly from -90 to 90, lon swings from -180 to 180, and their tempo does not match. -->
<query>SELECT count() FROM system.numbers WHERE NOT ignore(geohashEncode((number % 150)*1.1 - 75, (number * 3.14 % 300)*1.1 - 150))</query> <query>SELECT count() FROM system.numbers WHERE NOT ignore(geohashEncode((number % 150)*1.1 - 75, (number * 3.14 % 300)*1.1 - 150))</query>
<query>SELECT count() FROM system.numbers WHERE NOT ignore(geohashDecode(toString(number % 1000000)))</query> <query>SELECT count() FROM system.numbers WHERE NOT ignore(geohashDecode(toString(number % 1000000)))</query>

1
dbms/tests/performance/general_purpose_hashes.xml
View File

@ -1,5 +1,4 @@
<test> <test>
<name>general_purpose_hashes</name>
<type>once</type> <type>once</type>
<stop_conditions> <stop_conditions>

5
dbms/tests/performance/if_array_num.xml
View File

@ -1,5 +1,4 @@
<test> <test>
<name>if_array_num</name>
<type>once</type> <type>once</type>
<stop_conditions> <stop_conditions>
@ -9,10 +8,6 @@
</any_of> </any_of>
</stop_conditions> </stop_conditions>
<metrics>
<max_rows_per_second />
</metrics>
<main_metric> <main_metric>
<max_rows_per_second /> <max_rows_per_second />
</main_metric> </main_metric>

5
dbms/tests/performance/if_array_string.xml
View File

@ -1,5 +1,4 @@
<test> <test>
<name>if_array_string</name>
<type>once</type> <type>once</type>
<stop_conditions> <stop_conditions>
@ -9,10 +8,6 @@
</any_of> </any_of>
</stop_conditions> </stop_conditions>
<metrics>
<max_rows_per_second />
</metrics>
<main_metric> <main_metric>
<max_rows_per_second /> <max_rows_per_second />
</main_metric> </main_metric>

5
dbms/tests/performance/if_string_const.xml
View File

@ -1,5 +1,4 @@
<test> <test>
<name>if_string_const</name>
<type>once</type> <type>once</type>
<stop_conditions> <stop_conditions>
@ -9,10 +8,6 @@
</any_of> </any_of>
</stop_conditions> </stop_conditions>
<metrics>
<max_bytes_per_second />
</metrics>
<main_metric> <main_metric>
<max_bytes_per_second /> <max_bytes_per_second />
</main_metric> </main_metric>

1
dbms/tests/performance/if_string_hits.xml
View File

@ -1,5 +1,4 @@
<test> <test>
<name>if_string_hits</name>
<type>loop</type> <type>loop</type>
<stop_conditions> <stop_conditions>

1
dbms/tests/performance/int_parsing.xml
View File

@ -1,5 +1,4 @@
<test> <test>
<name>int_parsing</name>
<type>loop</type> <type>loop</type>
<stop_conditions> <stop_conditions>

1
dbms/tests/performance/joins_in_memory.xml
View File

@ -1,5 +1,4 @@
<test> <test>
<name>Joins In Memory</name>
<type>loop</type> <type>loop</type>
<stop_conditions> <stop_conditions>

1
dbms/tests/performance/json_extract_rapidjson.xml
View File

@ -1,5 +1,4 @@
<test> <test>
<name>json_extract_rapidjson</name>
<type>once</type> <type>once</type>
<stop_conditions> <stop_conditions>

1
dbms/tests/performance/json_extract_simdjson.xml
View File

@ -1,5 +1,4 @@
<test> <test>
<name>json_extract_simdjson</name>
<type>once</type> <type>once</type>
<preconditions> <preconditions>

1
dbms/tests/performance/leftpad.xml
View File

@ -1,5 +1,4 @@
<test> <test>
<name>left pad test</name>
<tags> <tags>
<tag>string</tag> <tag>string</tag>

1
dbms/tests/performance/linear_regression.xml
View File

@ -1,5 +1,4 @@
<test> <test>
<name>linear_regression</name>
<type>loop</type> <type>loop</type>
<stop_conditions> <stop_conditions>

1
dbms/tests/performance/ngram_distance.xml
View File

@ -1,5 +1,4 @@
<test> <test>
<name>Distance search performance test</name>
<tags> <tags>
<tag>search</tag> <tag>search</tag>

1
dbms/tests/performance/nyc_taxi.xml
View File

@ -1,5 +1,4 @@
<test> <test>
<name>nyc_taxi</name>
<type>loop</type> <type>loop</type>
<stop_conditions> <stop_conditions>

2
dbms/tests/performance/order_by_single_column.xml
View File

@ -1,6 +1,4 @@
<test> <test>
<name>ORDER BY single string column</name>
<tags> <tags>
<tag>sorting</tag> <tag>sorting</tag>
<tag>comparison</tag> <tag>comparison</tag>

1
dbms/tests/performance/parse_engine_file.xml
View File

@ -1,5 +1,4 @@
<test> <test>
<name>test_read_formats</name>
<type>loop</type> <type>loop</type>
<create_query>CREATE TABLE IF NOT EXISTS table_{format} ENGINE = File({format}) AS test.hits</create_query> <create_query>CREATE TABLE IF NOT EXISTS table_{format} ENGINE = File({format}) AS test.hits</create_query>

8
dbms/tests/performance/read_hits_with_aio.xml
View File

@ -1,5 +1,4 @@
<test> <test>
<name>read_from_hits_with_aio</name>
<stop_conditions> <stop_conditions>
<any_of> <any_of>
<average_speed_not_changing_for_ms>5000</average_speed_not_changing_for_ms> <average_speed_not_changing_for_ms>5000</average_speed_not_changing_for_ms>
@ -7,13 +6,6 @@
</any_of> </any_of>
</stop_conditions> </stop_conditions>
<type>once</type> <type>once</type>
<metrics>
<!-- For running one inifinite query -->
<max_rows_per_second />
<max_bytes_per_second />
<avg_rows_per_second />
<avg_bytes_per_second />
</metrics>
<preconditions> <preconditions>
<table_exists>hits_1000m_single</table_exists> <table_exists>hits_1000m_single</table_exists>

1
dbms/tests/performance/right.xml
View File

@ -1,5 +1,4 @@
<test> <test>
<name>right</name>
<type>loop</type> <type>loop</type>
<preconditions> <preconditions>

1
dbms/tests/performance/roundDown.xml
View File

@ -1,5 +1,4 @@
<test> <test>
<name>roundDown</name>
<type>once</type> <type>once</type>
<stop_conditions> <stop_conditions>

1
dbms/tests/performance/select_format.xml
View File

@ -1,5 +1,4 @@
<test> <test>
<name>test_select_format</name>
<type>loop</type> <type>loop</type>
<create_query>CREATE TABLE IF NOT EXISTS table_{format} ENGINE = File({format}) AS test.hits</create_query> <create_query>CREATE TABLE IF NOT EXISTS table_{format} ENGINE = File({format}) AS test.hits</create_query>

1
dbms/tests/performance/set.xml
View File

@ -1,5 +1,4 @@
<test> <test>
<name>set_lookup_random</name>
<type>once</type> <type>once</type>
<tags> <tags>
<tag>long</tag> <tag>long</tag>

1
dbms/tests/performance/set_hits.xml
View File

@ -1,5 +1,4 @@
<test> <test>
<name>set_lookup_hits</name>
<type>loop</type> <type>loop</type>
<preconditions> <preconditions>

2
dbms/tests/performance/simple_join_query.xml
View File

@ -1,6 +1,4 @@
<test> <test>
<name>Simple Join Query</name>
<type>loop</type> <type>loop</type>
<stop_conditions> <stop_conditions>

1
dbms/tests/performance/slices_hits.xml
View File

@ -1,5 +1,4 @@
<test> <test>
<name>slices_hits</name>
<type>loop</type> <type>loop</type>
<stop_conditions> <stop_conditions>

4
dbms/tests/performance/small_requests.xml
View File

@ -1,5 +1,4 @@
<test> <test>
<name>small_requests</name>
<type>loop</type> <type>loop</type>
<stop_conditions> <stop_conditions>
@ -17,9 +16,6 @@
<bytes_per_second/> <bytes_per_second/>
</main_metric> </main_metric>
<metrics>
<rows_per_second/>
</metrics>
<query> <query>
WITH WITH

2
dbms/tests/performance/sort.xml
View File

@ -1,6 +1,4 @@
<test> <test>
<name>sort</name>
<type>loop</type> <type>loop</type>
<stop_conditions> <stop_conditions>

2
dbms/tests/performance/string_sort.xml
View File

@ -1,6 +1,4 @@
<test> <test>
<name>String sorting</name>
<preconditions> <preconditions>
<table_exists>hits_10m_single</table_exists> <table_exists>hits_10m_single</table_exists>
</preconditions> </preconditions>

8
dbms/tests/performance/system_numbers.xml
View File

@ -1,5 +1,4 @@
<test> <test>
<name>system_numbers</name>
<type>once</type> <type>once</type>
<stop_conditions> <stop_conditions>
@ -10,13 +9,6 @@
</any_of> </any_of>
</stop_conditions> </stop_conditions>
<metrics>
<!-- For running one infinite query -->
<max_rows_per_second />
<max_bytes_per_second />
<avg_rows_per_second />
<avg_bytes_per_second />
</metrics>
<!-- 9. Генератор случайных чисел. <!-- 9. Генератор случайных чисел.
Функция rand представляет собой linear congruential generator (то есть, целочисленное умножение на константу и сложение с константой), возвращающий 32-битные целые случайные числа. Функция rand представляет собой linear congruential generator (то есть, целочисленное умножение на константу и сложение с константой), возвращающий 32-битные целые случайные числа.

1
dbms/tests/performance/trim_numbers.xml
View File

@ -1,5 +1,4 @@
<test> <test>
<name>trim_numbers</name>
<type>loop</type> <type>loop</type>
<stop_conditions> <stop_conditions>

1
dbms/tests/performance/trim_urls.xml
View File

@ -1,5 +1,4 @@
<test> <test>
<name>trim_urls</name>
<type>loop</type> <type>loop</type>
<preconditions> <preconditions>

1
dbms/tests/performance/trim_whitespace.xml
View File

@ -1,5 +1,4 @@
<test> <test>
<name>trim_whitespaces</name>
<type>loop</type> <type>loop</type>
<create_query>CREATE TABLE IF NOT EXISTS whitespaces(value String) ENGINE = MergeTree() PARTITION BY tuple() ORDER BY tuple()</create_query> <create_query>CREATE TABLE IF NOT EXISTS whitespaces(value String) ENGINE = MergeTree() PARTITION BY tuple() ORDER BY tuple()</create_query>

1
dbms/tests/performance/uniq.xml
View File

@ -1,5 +1,4 @@
<test> <test>
<name>uniq</name>
<type>loop</type> <type>loop</type>
<preconditions> <preconditions>

1
dbms/tests/performance/url_hits.xml
View File

@ -1,5 +1,4 @@
<test> <test>
<name>url_hits</name>
<type>loop</type> <type>loop</type>
<preconditions> <preconditions>

1
dbms/tests/performance/visit_param_extract_raw.xml
View File

@ -1,5 +1,4 @@
<test> <test>
<name>visit_param_extract_raw</name>
<type>once</type> <type>once</type>
<stop_conditions> <stop_conditions>

1
dbms/tests/performance/website.xml
View File

@ -1,5 +1,4 @@
<test> <test>
<name>website</name>
<type>loop</type> <type>loop</type>
<preconditions> <preconditions>