Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
8358b648
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,发现更多精彩内容 >>
提交
8358b648
编写于
11月 11, 2019
作者:
N
Nikita Mikhaylov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
comment
上级
220ccca2
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
12 addition
and
2 deletion
+12
-2
dbms/src/DataStreams/ParallelParsingBlockInputStream.cpp
dbms/src/DataStreams/ParallelParsingBlockInputStream.cpp
+2
-2
dbms/src/DataStreams/ParallelParsingBlockInputStream.h
dbms/src/DataStreams/ParallelParsingBlockInputStream.h
+2
-0
dbms/src/IO/ReadHelpers.h
dbms/src/IO/ReadHelpers.h
+8
-0
未找到文件。
dbms/src/DataStreams/ParallelParsingBlockInputStream.cpp
浏览文件 @
8358b648
...
...
@@ -15,7 +15,7 @@ void ParallelParsingBlockInputStream::segmentatorThreadFunction()
{
std
::
unique_lock
lock
(
mutex
);
segmentator_condvar
.
wait
(
lock
,
[
&
]{
return
status
[
current_unit_number
]
==
READY_TO_INSERT
||
is_exception_occured
||
is_cancelled
||
executed
;
});
segmentator_condvar
.
wait
(
lock
,
[
&
]{
return
status
[
current_unit_number
]
==
READY_TO_INSERT
||
is_exception_occured
||
executed
;
});
}
if
(
is_exception_occured
)
...
...
@@ -119,7 +119,7 @@ Block ParallelParsingBlockInputStream::readImpl()
std
::
unique_lock
lock
(
mutex
);
const
auto
current_number
=
reader_ticket_number
%
max_threads_to_use
;
reader_condvar
.
wait
(
lock
,
[
&
](){
return
status
[
current_number
]
==
READY_TO_READ
||
is_exception_occured
||
is_cancelled
||
executed
;
});
reader_condvar
.
wait
(
lock
,
[
&
](){
return
status
[
current_number
]
==
READY_TO_READ
||
is_exception_occured
||
executed
;
});
/// Check for an exception and rethrow it
if
(
is_exception_occured
)
...
...
dbms/src/DataStreams/ParallelParsingBlockInputStream.h
浏览文件 @
8358b648
...
...
@@ -100,6 +100,8 @@ public:
if
(
!
is_cancelled
.
compare_exchange_strong
(
old_val
,
true
))
return
;
executed
=
true
;
for
(
auto
&
reader
:
readers
)
if
(
!
reader
->
isCancelled
())
reader
->
cancel
(
kill
);
...
...
dbms/src/IO/ReadHelpers.h
浏览文件 @
8358b648
...
...
@@ -914,6 +914,14 @@ void skipToUnescapedNextLineOrEOF(ReadBuffer & buf);
/** Returns buffer eof() result.
* And saves data if there is no pending data in buffer or it was explicitly asked.
* Why we have to use this strange function? Consider we have begin_pos in the middle of our buffer
* and the cursor in the end of the buffer. When we call eof() it calls next().
* And this function can fill the buffer with new data, so we will lose the data from previous buffer state.
* @param buf - original buffer to read from.
* memory - where to put data from buf
* used_size - special parameter not to do useless reallocations
* begin_pos - defines from which position we will copy the data.
* forse_saving_buffer_state - allows to explicitly copy all the data from begin_pos to current_position.
*/
bool
eofWithSavingBufferState
(
ReadBuffer
&
buf
,
DB
::
Memory
<>
&
memory
,
size_t
&
used_size
,
char
*
&
begin_pos
,
bool
force_saving_buffer_state
=
false
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录