Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
45b8a138
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,发现更多精彩内容 >>
提交
45b8a138
编写于
2月 25, 2019
作者:
A
alesapin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix flap on kill query test
上级
fff2d074
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
30 addition
and
28 deletion
+30
-28
dbms/tests/queries/0_stateless/00417_kill_query.reference
dbms/tests/queries/0_stateless/00417_kill_query.reference
+0
-1
dbms/tests/queries/0_stateless/00417_kill_query.sh
dbms/tests/queries/0_stateless/00417_kill_query.sh
+0
-27
dbms/tests/queries/0_stateless/00909_kill_not_initialized_query.reference
...es/0_stateless/00909_kill_not_initialized_query.reference
+1
-0
dbms/tests/queries/0_stateless/00909_kill_not_initialized_query.sh
...s/queries/0_stateless/00909_kill_not_initialized_query.sh
+29
-0
未找到文件。
dbms/tests/queries/0_stateless/00417_kill_query.reference
浏览文件 @
45b8a138
SELECT sleep(1) FROM system.numbers LIMIT 4
SELECT sleep(1) FROM system.numbers LIMIT 5
0
dbms/tests/queries/0_stateless/00417_kill_query.sh
浏览文件 @
45b8a138
...
...
@@ -19,30 +19,3 @@ $CLICKHOUSE_CLIENT -q "KILL QUERY WHERE 0 ASYNC"
$CLICKHOUSE_CLIENT
-q
"KILL QUERY WHERE 0 FORMAT TabSeparated"
$CLICKHOUSE_CLIENT
-q
"KILL QUERY WHERE 0 SYNC FORMAT TabSeparated"
$CLICKHOUSE_CLIENT
-q
"KILL QUERY WHERE 1 TEST"
&>/dev/null
$CLICKHOUSE_CLIENT
-q
"DROP TABLE IF EXISTS test.cannot_kill_query"
$CLICKHOUSE_CLIENT
-q
"CREATE TABLE test.cannot_kill_query (x UInt64) ENGINE = MergeTree ORDER BY x"
&> /dev/null
$CLICKHOUSE_CLIENT
-q
"INSERT INTO test.cannot_kill_query SELECT * FROM numbers(10000000)"
&> /dev/null
query_for_pending
=
"SELECT count() FROM test.cannot_kill_query WHERE NOT ignore(sleep(1)) SETTINGS max_threads=1"
$CLICKHOUSE_CLIENT
-q
"
$query_for_pending
"
&>/dev/null &
$CLICKHOUSE_CLIENT
-q
"ALTER TABLE test.cannot_kill_query MODIFY COLUMN x UInt64"
&>/dev/null &
query_to_kill
=
"SELECT sum(1) FROM test.cannot_kill_query WHERE NOT ignore(sleep(1)) SETTINGS max_threads=1"
$CLICKHOUSE_CLIENT
-q
"
$query_to_kill
"
&>/dev/null &
sleep
1
# just to be sure that 'KILL ...' will be executed after 'SELECT ... WHERE NOT ignore(sleep(1))'
$CLICKHOUSE_CLIENT
-q
"KILL QUERY WHERE query='
$query_to_kill
'"
&>/dev/null &
# 'SELECT ... WHERE NOT ignore(sleep(1))' is executing much longer than 3 secs, so this sleep doesn't fail test logic
# but guarantees to eliminate flaps, when SELECT from system.process is executed before KILL is completed
sleep
3
$CLICKHOUSE_CLIENT
-q
"SELECT count() FROM system.processes where query='
$query_to_kill
'"
$CLICKHOUSE_CLIENT
-q
"KILL QUERY WHERE query='
$query_for_pending
'"
&>/dev/null &
# kill pending query
$CLICKHOUSE_CLIENT
-q
"DROP TABLE IF EXISTS test.cannot_kill_query"
&>/dev/null
dbms/tests/queries/0_stateless/00909_kill_not_initialized_query.reference
0 → 100644
浏览文件 @
45b8a138
0
dbms/tests/queries/0_stateless/00909_kill_not_initialized_query.sh
0 → 100755
浏览文件 @
45b8a138
#!/usr/bin/env bash
set
-e
CURDIR
=
$(
cd
"
$(
dirname
"
${
BASH_SOURCE
[0]
}
"
)
"
&&
pwd
)
.
$CURDIR
/../shell_config.sh
$CLICKHOUSE_CLIENT
-q
"DROP TABLE IF EXISTS test.cannot_kill_query"
$CLICKHOUSE_CLIENT
-q
"CREATE TABLE test.cannot_kill_query (x UInt64) ENGINE = MergeTree ORDER BY x"
&> /dev/null
$CLICKHOUSE_CLIENT
-q
"INSERT INTO test.cannot_kill_query SELECT * FROM numbers(10000000)"
&> /dev/null
query_for_pending
=
"SELECT count() FROM test.cannot_kill_query WHERE NOT ignore(sleep(1)) SETTINGS max_threads=1, max_block_size=1"
$CLICKHOUSE_CLIENT
-q
"
$query_for_pending
"
&>/dev/null &
$CLICKHOUSE_CLIENT
-q
"ALTER TABLE test.cannot_kill_query MODIFY COLUMN x UInt64"
&>/dev/null &
query_to_kill
=
"SELECT sum(1) FROM test.cannot_kill_query WHERE NOT ignore(sleep(1)) SETTINGS max_threads=1"
$CLICKHOUSE_CLIENT
-q
"
$query_to_kill
"
&>/dev/null &
sleep
3
# just to be sure that 'KILL ...' will be executed after 'SELECT ... WHERE NOT ignore(sleep(1))'
timeout
15
$CLICKHOUSE_CLIENT
-q
"KILL QUERY WHERE query='
$query_to_kill
' SYNC"
&>/dev/null
$CLICKHOUSE_CLIENT
-q
"SELECT count() FROM system.processes where query='
$query_to_kill
'"
$CLICKHOUSE_CLIENT
-q
"KILL QUERY WHERE query='
$query_for_pending
'"
&>/dev/null &
# kill pending query
$CLICKHOUSE_CLIENT
-q
"DROP TABLE IF EXISTS test.cannot_kill_query"
&>/dev/null
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录