Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
54d55177
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,发现更多精彩内容 >>
提交
54d55177
编写于
6月 24, 2015
作者:
A
Andrey Mironov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Merge
上级
aa7fe639
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
30 addition
and
21 deletion
+30
-21
dbms/include/DB/Storages/MergeTree/MergeTreeReadPool.h
dbms/include/DB/Storages/MergeTree/MergeTreeReadPool.h
+8
-3
dbms/include/DB/Storages/MergeTree/MergeTreeReader.h
dbms/include/DB/Storages/MergeTree/MergeTreeReader.h
+10
-8
dbms/include/DB/Storages/MergeTree/MergeTreeThreadBlockInputStream.h
...e/DB/Storages/MergeTree/MergeTreeThreadBlockInputStream.h
+12
-10
未找到文件。
dbms/include/DB/Storages/MergeTree/MergeTreeReadPool.h
浏览文件 @
54d55177
...
...
@@ -20,14 +20,16 @@ struct MergeTreeReadTask
const
NamesAndTypesList
&
columns
;
const
NamesAndTypesList
&
pre_columns
;
const
bool
remove_prewhere_column
;
const
MarkRanges
&
all_ranges
;
MergeTreeReadTask
(
const
MergeTreeData
::
DataPartPtr
&
data_part
,
const
MarkRanges
&
ranges
,
const
std
::
size_t
part_index_in_query
,
const
Names
&
ordered_names
,
const
NameSet
&
column_name_set
,
const
NamesAndTypesList
&
columns
,
const
NamesAndTypesList
&
pre_columns
,
const
bool
remove_prewhere_column
)
const
NamesAndTypesList
&
pre_columns
,
const
bool
remove_prewhere_column
,
const
MarkRanges
&
all_ranges
)
:
data_part
{
data_part
},
mark_ranges
{
ranges
},
part_index_in_query
{
part_index_in_query
},
ordered_names
{
ordered_names
},
column_name_set
{
column_name_set
},
columns
{
columns
},
pre_columns
{
pre_columns
},
remove_prewhere_column
{
remove_prewhere_column
}
remove_prewhere_column
{
remove_prewhere_column
}
,
all_ranges
{
all_ranges
}
{}
};
...
...
@@ -115,7 +117,7 @@ public:
return
std
::
make_unique
<
MergeTreeReadTask
>
(
part
.
data_part
,
ranges_to_get_from_part
,
part
.
part_index_in_query
,
ordered_names
,
column_name_set
,
columns
,
pre_columns
,
remove_prewhere_column
);
pre_columns
,
remove_prewhere_column
,
per_part_all_ranges
[
part_id
]
);
}
public:
...
...
@@ -124,6 +126,8 @@ public:
{
for
(
const
auto
&
part
:
parts
)
{
per_part_all_ranges
.
push_back
(
part
.
ranges
);
per_part_columns_lock
.
push_back
(
std
::
make_unique
<
Poco
::
ScopedReadRWLock
>
(
part
.
data_part
->
columns_lock
));
...
...
@@ -238,6 +242,7 @@ public:
std
::
vector
<
std
::
unique_ptr
<
Poco
::
ScopedReadRWLock
>>
per_part_columns_lock
;
RangesInDataParts
parts
;
std
::
vector
<
MarkRanges
>
per_part_all_ranges
;
std
::
vector
<
std
::
size_t
>
per_part_sum_marks
;
std
::
size_t
sum_marks
;
MergeTreeData
&
data
;
...
...
dbms/include/DB/Storages/MergeTree/MergeTreeReader.h
浏览文件 @
54d55177
...
...
@@ -203,13 +203,15 @@ public:
fillMissingColumnsImpl
(
res
,
ordered_names
,
true
);
}
const
MergeTreeData
::
DataPartPtr
&
getDataPart
()
const
{
return
data_part
;
}
private:
struct
Stream
{
MarkCache
::
MappedPtr
marks
;
ReadBuffer
*
data_buffer
;
Poco
::
SharedP
tr
<
CachedCompressedReadBuffer
>
cached_buffer
;
Poco
::
SharedP
tr
<
CompressedReadBufferFromFile
>
non_cached_buffer
;
std
::
unique_p
tr
<
CachedCompressedReadBuffer
>
cached_buffer
;
std
::
unique_p
tr
<
CompressedReadBufferFromFile
>
non_cached_buffer
;
std
::
string
path_prefix
;
size_t
max_mark_range
;
...
...
@@ -269,15 +271,15 @@ private:
if
(
uncompressed_cache
)
{
cached_buffer
=
new
CachedCompressedReadBuffer
(
path_prefix
+
".bin"
,
uncompressed_cache
,
estimated_size
,
aio_threshold
,
buffer_size
);
data_buffer
=
&*
cached_buffer
;
cached_buffer
=
std
::
make_unique
<
CachedCompressedReadBuffer
>
(
path_prefix
+
".bin"
,
uncompressed_cache
,
estimated_size
,
aio_threshold
,
buffer_size
);
data_buffer
=
cached_buffer
.
get
()
;
}
else
{
non_cached_buffer
=
new
CompressedReadBufferFromFile
(
path_prefix
+
".bin"
,
estimated_size
,
aio_threshold
,
buffer_size
);
data_buffer
=
&*
non_cached_buffer
;
non_cached_buffer
=
std
::
make_unique
<
CompressedReadBufferFromFile
>
(
path_prefix
+
".bin"
,
estimated_size
,
aio_threshold
,
buffer_size
);
data_buffer
=
non_cached_buffer
.
get
()
;
}
}
...
...
dbms/include/DB/Storages/MergeTree/MergeTreeThreadBlockInputStream.h
浏览文件 @
54d55177
...
...
@@ -77,16 +77,18 @@ protected:
const
auto
path
=
storage
.
getFullPath
()
+
task
->
data_part
->
name
+
'/'
;
reader
=
std
::
make_unique
<
MergeTreeReader
>
(
path
,
task
->
data_part
,
task
->
columns
,
owned_uncompressed_cache
.
get
(),
owned_mark_cache
.
get
(),
storage
,
task
->
mark_ranges
,
min_bytes_to_use_direct_io
,
max_read_buffer_size
);
if
(
prewhere_actions
)
pre_reader
=
std
::
make_unique
<
MergeTreeReader
>
(
path
,
task
->
data_part
,
task
->
pre_columns
,
owned_uncompressed_cache
.
get
(),
owned_mark_cache
.
get
(),
storage
,
task
->
mark_ranges
,
min_bytes_to_use_direct_io
,
max_read_buffer_size
);
if
(
!
reader
||
reader
->
getDataPart
()
!=
task
->
data_part
)
{
reader
=
std
::
make_unique
<
MergeTreeReader
>
(
path
,
task
->
data_part
,
task
->
columns
,
owned_uncompressed_cache
.
get
(),
owned_mark_cache
.
get
(),
storage
,
task
->
all_ranges
,
min_bytes_to_use_direct_io
,
max_read_buffer_size
);
if
(
prewhere_actions
)
pre_reader
=
std
::
make_unique
<
MergeTreeReader
>
(
path
,
task
->
data_part
,
task
->
pre_columns
,
owned_uncompressed_cache
.
get
(),
owned_mark_cache
.
get
(),
storage
,
task
->
all_ranges
,
min_bytes_to_use_direct_io
,
max_read_buffer_size
);
}
}
res
=
readFromPart
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录