thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-22 15:42:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Try fix tests.

Browse Source
This commit is contained in:
Nikolai Kochetov 2020-11-10 13:26:26 +03:00
parent 363c1e05c0
commit 046830967c
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Storages/StorageMergeTree.cpp
View File

@ -181,7 +181,8 @@ void StorageMergeTree::read(
size_t max_block_size,
unsigned num_streams)
{
query_plan = std::move(*reader.read(column_names, metadata_snapshot, query_info, context, max_block_size, num_streams));
if (auto plan = reader.read(column_names, metadata_snapshot, query_info, context, max_block_size, num_streams))
query_plan = std::move(*plan);
}
Pipe StorageMergeTree::read(

6
src/Storages/StorageReplicatedMergeTree.cpp
View File

@ -3629,11 +3629,13 @@ void StorageReplicatedMergeTree::read(
if (context.getSettingsRef().select_sequential_consistency)
{
auto max_added_blocks = getMaxAddedBlocks();
query_plan = std::move(*reader.read(column_names, metadata_snapshot, query_info, context, max_block_size, num_streams, &max_added_blocks));
if (auto plan = reader.read(column_names, metadata_snapshot, query_info, context, max_block_size, num_streams, &max_added_blocks))
query_plan = std::move(*plan);
return;
}
query_plan = std::move(*reader.read(column_names, metadata_snapshot, query_info, context, max_block_size, num_streams));
if (auto plan = reader.read(column_names, metadata_snapshot, query_info, context, max_block_size, num_streams))
query_plan = std::move(*plan);
}
Pipe StorageReplicatedMergeTree::read(