thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-03 21:12:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix header for MergeTreeSequentialBlockInputStream.

Browse Source
This commit is contained in:
Nikolai Kochetov 2019-04-17 19:58:57 +03:00
parent 197afe2eea
commit 197e1cda5d
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dbms/src/Storages/MergeTree/MergeTreeSequentialBlockInputStream.cpp
View File

@ -36,9 +36,6 @@ MergeTreeSequentialBlockInputStream::MergeTreeSequentialBlockInputStream(
addTotalRowsApprox(data_part->rows_count); addTotalRowsApprox(data_part->rows_count);
header = storage.getSampleBlockForColumns(columns_to_read);
fixHeader(header);
/// Add columns because we don't want to read empty blocks /// Add columns because we don't want to read empty blocks
injectRequiredColumns(storage, data_part, columns_to_read); injectRequiredColumns(storage, data_part, columns_to_read);
NamesAndTypesList columns_for_reader; NamesAndTypesList columns_for_reader;
@ -60,6 +57,18 @@ MergeTreeSequentialBlockInputStream::MergeTreeSequentialBlockInputStream(
/* bytes to use AIO (this is hack) */ /* bytes to use AIO (this is hack) */
read_with_direct_io ? 1UL : std::numeric_limits<size_t>::max(), read_with_direct_io ? 1UL : std::numeric_limits<size_t>::max(),
DBMS_DEFAULT_BUFFER_SIZE); DBMS_DEFAULT_BUFFER_SIZE);
header = storage.getSampleBlockForColumns(columns_to_read);
fixHeader(header);
bool should_reorder = false, should_evaluate_missing_defaults = false;
reader->fillMissingColumns(header, should_reorder, should_evaluate_missing_defaults, res.rows());
if (should_evaluate_missing_defaults)
reader->evaluateMissingDefaults(header);
if (should_reorder)
reader->reorderColumns(header, header.getNames(), nullptr);
} }