Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
e9232fc2
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,发现更多精彩内容 >>
提交
e9232fc2
编写于
12月 30, 2014
作者:
A
Alexey Milovidov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
dbms: more scalable aggregator: development [#METR-2944].
上级
716fad23
变更
12
隐藏空白更改
内联
并排
Showing
12 changed file
with
45 addition
and
29 deletion
+45
-29
dbms/include/DB/Common/HashTable/TwoLevelHashTable.h
dbms/include/DB/Common/HashTable/TwoLevelHashTable.h
+9
-0
dbms/include/DB/Common/VirtualColumnUtils.h
dbms/include/DB/Common/VirtualColumnUtils.h
+9
-10
dbms/include/DB/DataStreams/RemoteBlockInputStream.h
dbms/include/DB/DataStreams/RemoteBlockInputStream.h
+2
-0
dbms/include/DB/Interpreters/AggregationCommon.h
dbms/include/DB/Interpreters/AggregationCommon.h
+0
-2
dbms/include/DB/Interpreters/Aggregator.h
dbms/include/DB/Interpreters/Aggregator.h
+2
-0
dbms/src/Common/VirtualColumnUtils.cpp
dbms/src/Common/VirtualColumnUtils.cpp
+4
-8
dbms/src/Interpreters/Aggregator.cpp
dbms/src/Interpreters/Aggregator.cpp
+6
-9
dbms/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
dbms/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
+1
-0
dbms/src/Storages/StorageChunkMerger.cpp
dbms/src/Storages/StorageChunkMerger.cpp
+3
-0
dbms/src/Storages/StorageChunks.cpp
dbms/src/Storages/StorageChunks.cpp
+2
-0
dbms/src/Storages/StorageMerge.cpp
dbms/src/Storages/StorageMerge.cpp
+5
-0
dbms/src/Storages/StorageReplicatedMergeTree.cpp
dbms/src/Storages/StorageReplicatedMergeTree.cpp
+2
-0
未找到文件。
dbms/include/DB/Common/HashTable/TwoLevelHashTable.h
浏览文件 @
e9232fc2
...
...
@@ -95,6 +95,7 @@ public:
{
typename
Source
::
const_iterator
it
=
src
.
begin
();
/// Предполагается, что нулевой ключ (хранящийся отдельно) при итерировании идёт первым.
if
(
it
!=
src
.
end
()
&&
it
.
getPtr
()
->
isZero
(
src
))
{
insert
(
*
it
);
...
...
@@ -142,6 +143,8 @@ public:
value_type
&
operator
*
()
const
{
return
*
current_it
;
}
value_type
*
operator
->
()
const
{
return
&*
current_it
;
}
Cell
*
getPtr
()
const
{
return
current_it
.
getPtr
();
}
};
...
...
@@ -177,6 +180,8 @@ public:
const
value_type
&
operator
*
()
const
{
return
*
current_it
;
}
const
value_type
*
operator
->
()
const
{
return
&*
current_it
;
}
const
Cell
*
getPtr
()
const
{
return
current_it
.
getPtr
();
}
};
...
...
@@ -205,6 +210,10 @@ public:
std
::
pair
<
iterator
,
bool
>
res
;
emplace
(
Cell
::
getKey
(
x
),
res
.
first
,
res
.
second
,
hash_value
);
if
(
res
.
second
)
res
.
first
.
getPtr
()
->
setMapped
(
x
);
return
res
;
}
...
...
dbms/include/DB/Common/VirtualColumnUtils.h
浏览文件 @
e9232fc2
#pragma once
#include <DB/Interpreters/Context.h>
#include <DB/DataStreams/AddingConstColumnBlockInputStream.h>
#include <DB/DataStreams/OneBlockInputStream.h>
#include <DB/DataTypes/DataTypeString.h>
#include <DB/DataTypes/DataTypesNumberFixed.h>
#include <DB/Parsers/ASTIdentifier.h>
#include <DB/Parsers/ASTExpressionList.h>
#include <DB/Parsers/ASTLiteral.h>
#include <DB/Parsers/ASTSelectQuery.h>
#include <DB/Columns/ColumnString.h>
#include <set>
#include <DB/Core/Block.h>
#include <DB/Core/NamesAndTypes.h>
#include <DB/Parsers/IAST.h>
namespace
DB
{
class
Context
;
namespace
VirtualColumnUtils
{
...
...
dbms/include/DB/DataStreams/RemoteBlockInputStream.h
浏览文件 @
e9232fc2
...
...
@@ -3,7 +3,9 @@
#include <Yandex/logger_useful.h>
#include <DB/DataStreams/IProfilingBlockInputStream.h>
#include <DB/DataStreams/OneBlockInputStream.h>
#include <DB/Common/VirtualColumnUtils.h>
#include <DB/Interpreters/Context.h>
#include <DB/Client/ConnectionPool.h>
...
...
dbms/include/DB/Interpreters/AggregationCommon.h
浏览文件 @
e9232fc2
...
...
@@ -9,8 +9,6 @@
#include <DB/Core/Defines.h>
#include <DB/Core/StringRef.h>
#include <DB/Columns/IColumn.h>
#include <DB/Common/HashTable/HashMap.h>
#include <DB/Common/HashTable/TwoLevelHashMap.h>
template
<
>
...
...
dbms/include/DB/Interpreters/Aggregator.h
浏览文件 @
e9232fc2
...
...
@@ -7,6 +7,8 @@
#include <DB/Core/StringRef.h>
#include <DB/Common/Arena.h>
#include <DB/Common/HashTable/HashMap.h>
#include <DB/Common/HashTable/TwoLevelHashMap.h>
#include <DB/DataStreams/IBlockInputStream.h>
...
...
dbms/src/Common/VirtualColumnUtils.cpp
浏览文件 @
e9232fc2
#include <DB/Common/VirtualColumnUtils.h>
#include <DB/Interpreters/Context.h>
#include <DB/DataStreams/AddingConstColumnBlockInputStream.h>
#include <DB/DataStreams/OneBlockInputStream.h>
#include <DB/DataTypes/DataTypeString.h>
#include <DB/DataTypes/DataTypesNumberFixed.h>
#include <DB/Interpreters/ExpressionAnalyzer.h>
#include <DB/Parsers/ASTIdentifier.h>
#include <DB/Parsers/ASTExpressionList.h>
#include <DB/Parsers/ASTLiteral.h>
#include <DB/Parsers/ASTSelectQuery.h>
#include <DB/Storages/IStorage.h>
#include <DB/Interpreters/InterpreterSelectQuery.h>
#include <DB/Common/VirtualColumnUtils.h>
namespace
DB
{
...
...
dbms/src/Interpreters/Aggregator.cpp
浏览文件 @
e9232fc2
...
...
@@ -442,10 +442,7 @@ void NO_INLINE Aggregator::mergeTwoLevelDataImpl(
}
};
/// future и packaged_task используются, чтобы исключения автоматически прокидывались в основной поток.
std
::
vector
<
std
::
future
<
void
>>
futures
;
futures
.
reserve
(
Method
::
Data
::
NUM_BUCKETS
);
/// packaged_task используются, чтобы исключения автоматически прокидывались в основной поток.
std
::
vector
<
std
::
packaged_task
<
void
()
>>
tasks
;
tasks
.
reserve
(
Method
::
Data
::
NUM_BUCKETS
);
...
...
@@ -453,7 +450,6 @@ void NO_INLINE Aggregator::mergeTwoLevelDataImpl(
for
(
size_t
bucket
=
0
;
bucket
<
Method
::
Data
::
NUM_BUCKETS
;
++
bucket
)
{
tasks
.
emplace_back
(
std
::
bind
(
merge_bucket
,
bucket
,
current_memory_tracker
));
futures
.
emplace_back
(
tasks
.
back
().
get_future
());
if
(
thread_pool
)
thread_pool
->
schedule
([
bucket
,
&
tasks
]
{
tasks
[
bucket
]();
});
...
...
@@ -464,8 +460,8 @@ void NO_INLINE Aggregator::mergeTwoLevelDataImpl(
if
(
thread_pool
)
thread_pool
->
wait
();
for
(
auto
&
future
:
future
s
)
future
.
get
();
for
(
auto
&
task
:
task
s
)
task
.
get_future
()
.
get
();
}
...
...
@@ -635,16 +631,17 @@ bool Aggregator::executeOnBlock(Block & block, AggregatedDataVariants & result,
/** Почему выбрано 30 000? Потому что при таком количестве элементов, в TwoLevelHashTable,
* скорее всего, хватит места на все ключи, с размером таблицы по-умолчанию
* (256 корзин по 256 ячеек, fill factor = 0.5)
* TODO Не конвертировать, если запрос выполняется в один поток.
*/
if
(
result
.
isConvertibleToTwoLevel
()
&&
result_size
>=
TWO_LEVEL_HASH_TABLE_THRESHOLD
)
result
.
convertToTwoLevel
();
/// Проверка ограничений.
if
(
!
no_more_keys
&&
max_rows_to_group_by
&&
result
.
size
()
>
max_rows_to_group_by
)
if
(
!
no_more_keys
&&
max_rows_to_group_by
&&
result
_size
>
max_rows_to_group_by
)
{
if
(
group_by_overflow_mode
==
OverflowMode
::
THROW
)
throw
Exception
(
"Limit for rows to GROUP BY exceeded: has "
+
toString
(
result
.
size
()
)
throw
Exception
(
"Limit for rows to GROUP BY exceeded: has "
+
toString
(
result
_size
)
+
" rows, maximum: "
+
toString
(
max_rows_to_group_by
),
ErrorCodes
::
TOO_MUCH_ROWS
);
else
if
(
group_by_overflow_mode
==
OverflowMode
::
BREAK
)
...
...
dbms/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
浏览文件 @
e9232fc2
...
...
@@ -6,6 +6,7 @@
#include <DB/DataStreams/FilterBlockInputStream.h>
#include <DB/DataStreams/ConcatBlockInputStream.h>
#include <DB/DataStreams/CollapsingFinalBlockInputStream.h>
#include <DB/DataStreams/AddingConstColumnBlockInputStream.h>
#include <DB/DataTypes/DataTypesNumberFixed.h>
#include <DB/Common/VirtualColumnUtils.h>
...
...
dbms/src/Storages/StorageChunkMerger.cpp
浏览文件 @
e9232fc2
...
...
@@ -14,7 +14,10 @@
#include <DB/DataStreams/ConcatBlockInputStream.h>
#include <DB/DataStreams/narrowBlockInputStreams.h>
#include <DB/DataStreams/AddingDefaultBlockInputStream.h>
#include <DB/DataStreams/AddingConstColumnBlockInputStream.h>
#include <DB/Common/VirtualColumnUtils.h>
#include <DB/DataTypes/DataTypeString.h>
#include <DB/Columns/ColumnString.h>
namespace
DB
...
...
dbms/src/Storages/StorageChunks.cpp
浏览文件 @
e9232fc2
...
...
@@ -6,6 +6,8 @@
#include <DB/Interpreters/InterpreterDropQuery.h>
#include <DB/Parsers/ASTDropQuery.h>
#include <DB/Common/VirtualColumnUtils.h>
#include <DB/DataTypes/DataTypeString.h>
#include <DB/Columns/ColumnString.h>
namespace
DB
...
...
dbms/src/Storages/StorageMerge.cpp
浏览文件 @
e9232fc2
#include <DB/DataStreams/narrowBlockInputStreams.h>
#include <DB/DataStreams/AddingConstColumnBlockInputStream.h>
#include <DB/Storages/StorageMerge.h>
#include <DB/Common/VirtualColumnUtils.h>
#include <DB/Interpreters/InterpreterAlterQuery.h>
#include <DB/Storages/VirtualColumnFactory.h>
#include <DB/Parsers/ASTSelectQuery.h>
#include <DB/DataTypes/DataTypeString.h>
#include <DB/Columns/ColumnString.h>
namespace
DB
{
...
...
dbms/src/Storages/StorageReplicatedMergeTree.cpp
浏览文件 @
e9232fc2
...
...
@@ -8,8 +8,10 @@
#include <DB/IO/ReadBufferFromString.h>
#include <DB/Interpreters/InterpreterAlterQuery.h>
#include <DB/Common/VirtualColumnUtils.h>
#include <DB/DataStreams/AddingConstColumnBlockInputStream.h>
#include <time.h>
namespace
DB
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录