Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
6b8e6173
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,发现更多精彩内容 >>
提交
6b8e6173
编写于
10月 05, 2019
作者:
V
Vitaliy Zakaznikov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
* Fixing crash in LIVE VIEW
* Re-enabling all LIVE VIEW tests
上级
ffe8931c
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
6 addition
and
10 deletion
+6
-10
dbms/src/Storages/LiveView/LiveViewEventsBlockInputStream.h
dbms/src/Storages/LiveView/LiveViewEventsBlockInputStream.h
+2
-6
dbms/src/Storages/LiveView/StorageLiveView.cpp
dbms/src/Storages/LiveView/StorageLiveView.cpp
+3
-3
dbms/tests/queries/0_stateless/helpers/client.py
dbms/tests/queries/0_stateless/helpers/client.py
+1
-1
未找到文件。
dbms/src/Storages/LiveView/LiveViewEventsBlockInputStream.h
浏览文件 @
6b8e6173
...
...
@@ -213,12 +213,8 @@ protected:
// move right to the end
it
=
end
;
if
(
it
==
end
)
{
end_of_blocks
=
false
;
num_updates
+=
1
;
}
end_of_blocks
=
false
;
num_updates
+=
1
;
last_event_timestamp_usec
=
static_cast
<
UInt64
>
(
timestamp
.
epochMicroseconds
());
...
...
dbms/src/Storages/LiveView/StorageLiveView.cpp
浏览文件 @
6b8e6173
...
...
@@ -499,8 +499,7 @@ BlockInputStreams StorageLiveView::read(
const
size_t
/*max_block_size*/
,
const
unsigned
/*num_streams*/
)
{
/// add user to the blocks_ptr
std
::
shared_ptr
<
BlocksPtr
>
stream_blocks_ptr
=
blocks_ptr
;
std
::
shared_ptr
<
BlocksBlockInputStream
>
stream
;
{
std
::
lock_guard
lock
(
mutex
);
if
(
!
(
*
blocks_ptr
))
...
...
@@ -508,8 +507,9 @@ BlockInputStreams StorageLiveView::read(
if
(
getNewBlocks
())
condition
.
notify_all
();
}
stream
=
std
::
make_shared
<
BlocksBlockInputStream
>
(
blocks_ptr
,
getHeader
());
}
return
{
st
d
::
make_shared
<
BlocksBlockInputStream
>
(
stream_blocks_ptr
,
getHeader
())
};
return
{
st
ream
};
}
BlockInputStreams
StorageLiveView
::
watch
(
...
...
dbms/tests/queries/0_stateless/helpers/client.py
浏览文件 @
6b8e6173
...
...
@@ -15,7 +15,7 @@ class client(object):
def
__init__
(
self
,
command
=
None
,
name
=
''
,
log
=
None
):
self
.
client
=
uexpect
.
spawn
([
'/bin/bash'
,
'--noediting'
])
if
command
is
None
:
command
=
os
.
environ
.
get
(
'CLICKHOUSE_BINARY'
,
'clickhouse'
)
+
'
-
client'
command
=
os
.
environ
.
get
(
'CLICKHOUSE_BINARY'
,
'clickhouse'
)
+
'
client'
self
.
client
.
command
=
command
self
.
client
.
eol
(
'
\r
'
)
self
.
client
.
logger
(
log
,
prefix
=
name
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录