Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
5aec6dd0
C
ClickHouse
项目概览
2dot5
/
ClickHouse
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
ClickHouse
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
5aec6dd0
编写于
5月 13, 2019
作者:
A
alesapin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix banch of flapping perf tests. Improve average speed calculation
上级
a8e8a37c
变更
17
隐藏空白更改
内联
并排
Showing
17 changed file
with
32 addition
and
32 deletion
+32
-32
dbms/programs/performance-test/TestStats.cpp
dbms/programs/performance-test/TestStats.cpp
+3
-3
dbms/programs/performance-test/TestStats.h
dbms/programs/performance-test/TestStats.h
+2
-2
dbms/tests/performance/array_element.xml
dbms/tests/performance/array_element.xml
+2
-2
dbms/tests/performance/array_join.xml
dbms/tests/performance/array_join.xml
+2
-2
dbms/tests/performance/complex_array_creation.xml
dbms/tests/performance/complex_array_creation.xml
+2
-2
dbms/tests/performance/conditional.xml
dbms/tests/performance/conditional.xml
+2
-2
dbms/tests/performance/consistent_hashes.xml
dbms/tests/performance/consistent_hashes.xml
+1
-1
dbms/tests/performance/date_time.xml
dbms/tests/performance/date_time.xml
+2
-2
dbms/tests/performance/format_date_time.xml
dbms/tests/performance/format_date_time.xml
+2
-2
dbms/tests/performance/functions_coding.xml
dbms/tests/performance/functions_coding.xml
+2
-2
dbms/tests/performance/if_array_num.xml
dbms/tests/performance/if_array_num.xml
+2
-2
dbms/tests/performance/if_array_string.xml
dbms/tests/performance/if_array_string.xml
+2
-2
dbms/tests/performance/if_string_const.xml
dbms/tests/performance/if_string_const.xml
+2
-2
dbms/tests/performance/simple_join_query.xml
dbms/tests/performance/simple_join_query.xml
+1
-1
dbms/tests/performance/system_numbers.xml
dbms/tests/performance/system_numbers.xml
+2
-2
dbms/tests/performance/uniq.xml
dbms/tests/performance/uniq.xml
+1
-1
dbms/tests/performance/visit_param_extract_raw.xml
dbms/tests/performance/visit_param_extract_raw.xml
+2
-2
未找到文件。
dbms/programs/performance-test/TestStats.cpp
浏览文件 @
5aec6dd0
#include "TestStats.h"
#include <algorithm>
namespace
DB
{
...
...
@@ -92,11 +93,10 @@ void TestStats::update_average_speed(
avg_speed_value
/=
number_of_info_batches
;
if
(
avg_speed_first
==
0
)
{
avg_speed_first
=
avg_speed_value
;
}
if
(
std
::
abs
(
avg_speed_value
-
avg_speed_first
)
>=
precision
)
auto
[
min
,
max
]
=
std
::
minmax
(
avg_speed_value
,
avg_speed_first
);
if
(
1
-
min
/
max
>=
precision
)
{
avg_speed_first
=
avg_speed_value
;
avg_speed_watch
.
restart
();
...
...
dbms/programs/performance-test/TestStats.h
浏览文件 @
5aec6dd0
...
...
@@ -40,11 +40,11 @@ struct TestStats
double
avg_rows_speed_value
=
0
;
double
avg_rows_speed_first
=
0
;
static
inline
double
avg_rows_speed_precision
=
0.00
1
;
static
inline
double
avg_rows_speed_precision
=
0.00
5
;
double
avg_bytes_speed_value
=
0
;
double
avg_bytes_speed_first
=
0
;
static
inline
double
avg_bytes_speed_precision
=
0.00
1
;
static
inline
double
avg_bytes_speed_precision
=
0.00
5
;
size_t
number_of_rows_speed_info_batches
=
0
;
size_t
number_of_bytes_speed_info_batches
=
0
;
...
...
dbms/tests/performance/array_element.xml
浏览文件 @
5aec6dd0
...
...
@@ -4,8 +4,8 @@
<stop_conditions>
<any_of>
<average_speed_not_changing_for_ms>
1000
0
</average_speed_not_changing_for_ms>
<total_time_ms>
1000
</total_time_ms>
<average_speed_not_changing_for_ms>
1000
</average_speed_not_changing_for_ms>
<total_time_ms>
1000
0
</total_time_ms>
</any_of>
</stop_conditions>
...
...
dbms/tests/performance/array_join.xml
浏览文件 @
5aec6dd0
...
...
@@ -4,8 +4,8 @@
<stop_conditions>
<any_of>
<average_speed_not_changing_for_ms>
1000
0
</average_speed_not_changing_for_ms>
<total_time_ms>
1000
</total_time_ms>
<average_speed_not_changing_for_ms>
1000
</average_speed_not_changing_for_ms>
<total_time_ms>
1000
0
</total_time_ms>
</any_of>
</stop_conditions>
...
...
dbms/tests/performance/complex_array_creation.xml
浏览文件 @
5aec6dd0
...
...
@@ -4,8 +4,8 @@
<stop_conditions>
<any_of>
<average_speed_not_changing_for_ms>
1000
0
</average_speed_not_changing_for_ms>
<total_time_ms>
1000
</total_time_ms>
<average_speed_not_changing_for_ms>
1000
</average_speed_not_changing_for_ms>
<total_time_ms>
1000
0
</total_time_ms>
</any_of>
</stop_conditions>
...
...
dbms/tests/performance/conditional.xml
浏览文件 @
5aec6dd0
...
...
@@ -5,8 +5,8 @@
<stop_conditions>
<any_of>
<average_speed_not_changing_for_ms>
1000
0
</average_speed_not_changing_for_ms>
<total_time_ms>
1000
</total_time_ms>
<average_speed_not_changing_for_ms>
1000
</average_speed_not_changing_for_ms>
<total_time_ms>
1000
0
</total_time_ms>
</any_of>
</stop_conditions>
...
...
dbms/tests/performance/consistent_hashes.xml
浏览文件 @
5aec6dd0
...
...
@@ -4,7 +4,7 @@
<stop_conditions>
<any_of>
<m
in_time_not_changing_for_ms>
1000
</min_time
_not_changing_for_ms>
<m
ax_speed_not_changing_for_ms>
1000
</max_speed
_not_changing_for_ms>
<total_time_ms>
5000
</total_time_ms>
</any_of>
</stop_conditions>
...
...
dbms/tests/performance/date_time.xml
浏览文件 @
5aec6dd0
...
...
@@ -9,8 +9,8 @@
<stop_conditions>
<any_of>
<average_speed_not_changing_for_ms>
1000
0
</average_speed_not_changing_for_ms>
<total_time_ms>
1000
</total_time_ms>
<average_speed_not_changing_for_ms>
1000
</average_speed_not_changing_for_ms>
<total_time_ms>
1000
0
</total_time_ms>
</any_of>
</stop_conditions>
...
...
dbms/tests/performance/format_date_time.xml
浏览文件 @
5aec6dd0
...
...
@@ -8,8 +8,8 @@
<stop_conditions>
<any_of>
<average_speed_not_changing_for_ms>
1000
0
</average_speed_not_changing_for_ms>
<total_time_ms>
1000
</total_time_ms>
<average_speed_not_changing_for_ms>
1000
</average_speed_not_changing_for_ms>
<total_time_ms>
1000
0
</total_time_ms>
</any_of>
</stop_conditions>
...
...
dbms/tests/performance/functions_coding.xml
浏览文件 @
5aec6dd0
...
...
@@ -4,8 +4,8 @@
<stop_conditions>
<any_of>
<average_speed_not_changing_for_ms>
10
000
</average_speed_not_changing_for_ms>
<total_time_ms>
1
000
</total_time_ms>
<average_speed_not_changing_for_ms>
5
000
</average_speed_not_changing_for_ms>
<total_time_ms>
20
000
</total_time_ms>
</any_of>
</stop_conditions>
...
...
dbms/tests/performance/if_array_num.xml
浏览文件 @
5aec6dd0
...
...
@@ -4,8 +4,8 @@
<stop_conditions>
<any_of>
<average_speed_not_changing_for_ms>
1000
0
</average_speed_not_changing_for_ms>
<total_time_ms>
1000
</total_time_ms>
<average_speed_not_changing_for_ms>
1000
</average_speed_not_changing_for_ms>
<total_time_ms>
1000
0
</total_time_ms>
</any_of>
</stop_conditions>
...
...
dbms/tests/performance/if_array_string.xml
浏览文件 @
5aec6dd0
...
...
@@ -4,8 +4,8 @@
<stop_conditions>
<any_of>
<average_speed_not_changing_for_ms>
1000
0
</average_speed_not_changing_for_ms>
<total_time_ms>
1000
</total_time_ms>
<average_speed_not_changing_for_ms>
1000
</average_speed_not_changing_for_ms>
<total_time_ms>
1000
0
</total_time_ms>
</any_of>
</stop_conditions>
...
...
dbms/tests/performance/if_string_const.xml
浏览文件 @
5aec6dd0
...
...
@@ -4,8 +4,8 @@
<stop_conditions>
<any_of>
<average_speed_not_changing_for_ms>
1000
0
</average_speed_not_changing_for_ms>
<total_time_ms>
1000
</total_time_ms>
<average_speed_not_changing_for_ms>
1000
</average_speed_not_changing_for_ms>
<total_time_ms>
1000
0
</total_time_ms>
</any_of>
</stop_conditions>
...
...
dbms/tests/performance/simple_join_query.xml
浏览文件 @
5aec6dd0
...
...
@@ -8,7 +8,7 @@
<total_time_ms>
30000
</total_time_ms>
</all_of>
<any_of>
<m
in_time_not_changing_for_ms>
5000
</min_time
_not_changing_for_ms>
<m
ax_speed_not_changing_for_ms>
5000
</max_speed
_not_changing_for_ms>
<total_time_ms>
60000
</total_time_ms>
</any_of>
</stop_conditions>
...
...
dbms/tests/performance/system_numbers.xml
浏览文件 @
5aec6dd0
...
...
@@ -5,8 +5,8 @@
<stop_conditions>
<any_of>
<!-- This is only for infinite running query. -->
<average_speed_not_changing_for_ms>
1000
0
</average_speed_not_changing_for_ms>
<total_time_ms>
1000
</total_time_ms>
<average_speed_not_changing_for_ms>
1000
</average_speed_not_changing_for_ms>
<total_time_ms>
1000
0
</total_time_ms>
</any_of>
</stop_conditions>
...
...
dbms/tests/performance/uniq.xml
浏览文件 @
5aec6dd0
...
...
@@ -13,7 +13,7 @@
</all_of>
<any_of>
<average_speed_not_changing_for_ms>
5000
</average_speed_not_changing_for_ms>
<total_time_ms>
15
000
</total_time_ms>
<total_time_ms>
20
000
</total_time_ms>
</any_of>
</stop_conditions>
...
...
dbms/tests/performance/visit_param_extract_raw.xml
浏览文件 @
5aec6dd0
...
...
@@ -4,8 +4,8 @@
<stop_conditions>
<any_of>
<average_speed_not_changing_for_ms>
1000
0
</average_speed_not_changing_for_ms>
<total_time_ms>
1000
</total_time_ms>
<average_speed_not_changing_for_ms>
1000
</average_speed_not_changing_for_ms>
<total_time_ms>
1000
0
</total_time_ms>
</any_of>
</stop_conditions>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录