Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
08ed7473
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,发现更多精彩内容 >>
未验证
提交
08ed7473
编写于
9月 02, 2020
作者:
A
alexey-milovidov
提交者:
GitHub
9月 02, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #14320 from bharatnc/ncb/fix-alter-live-lock
fix ALTER LIVE VIEW [REFRESH] lock issue
上级
951bce59
f0d1c6c7
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
16 addition
and
4 deletion
+16
-4
src/Interpreters/InterpreterAlterQuery.cpp
src/Interpreters/InterpreterAlterQuery.cpp
+1
-1
src/Storages/LiveView/StorageLiveView.cpp
src/Storages/LiveView/StorageLiveView.cpp
+3
-2
src/Storages/LiveView/StorageLiveView.h
src/Storages/LiveView/StorageLiveView.h
+1
-1
tests/queries/0_stateless/01463_test_alter_live_view_refresh.reference
.../0_stateless/01463_test_alter_live_view_refresh.reference
+1
-0
tests/queries/0_stateless/01463_test_alter_live_view_refresh.sql
...ueries/0_stateless/01463_test_alter_live_view_refresh.sql
+10
-0
未找到文件。
src/Interpreters/InterpreterAlterQuery.cpp
浏览文件 @
08ed7473
...
...
@@ -101,7 +101,7 @@ BlockIO InterpreterAlterQuery::execute()
switch
(
command
.
type
)
{
case
LiveViewCommand
::
REFRESH
:
live_view
->
refresh
(
context
);
live_view
->
refresh
();
break
;
}
}
...
...
src/Storages/LiveView/StorageLiveView.cpp
浏览文件 @
08ed7473
...
...
@@ -518,9 +518,10 @@ void StorageLiveView::drop()
condition
.
notify_all
();
}
void
StorageLiveView
::
refresh
(
const
Context
&
context
)
void
StorageLiveView
::
refresh
()
{
auto
table_lock
=
lockExclusively
(
context
.
getCurrentQueryId
(),
context
.
getSettingsRef
().
lock_acquire_timeout
);
// Lock is already acquired exclusively from InterperterAlterQuery.cpp InterpreterAlterQuery::execute() method.
// So, reacquiring lock is not needed and will result in an exception.
{
std
::
lock_guard
lock
(
mutex
);
if
(
getNewBlocks
())
...
...
src/Storages/LiveView/StorageLiveView.h
浏览文件 @
08ed7473
...
...
@@ -122,7 +122,7 @@ public:
void
startup
()
override
;
void
shutdown
()
override
;
void
refresh
(
const
Context
&
context
);
void
refresh
();
Pipe
read
(
const
Names
&
column_names
,
...
...
tests/queries/0_stateless/01463_test_alter_live_view_refresh.reference
0 → 100644
浏览文件 @
08ed7473
ALTER LIVE VIEW live1 REFRESH
tests/queries/0_stateless/01463_test_alter_live_view_refresh.sql
0 → 100644
浏览文件 @
08ed7473
CREATE
TABLE
test0
(
c0
UInt64
)
ENGINE
=
MergeTree
()
PARTITION
BY
c0
ORDER
BY
c0
;
SET
allow_experimental_live_view
=
1
;
CREATE
LIVE
VIEW
live1
AS
SELECT
*
FROM
test0
;
select
'ALTER LIVE VIEW live1 REFRESH'
;
ALTER
LIVE
VIEW
live1
REFRESH
;
-- success
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录