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

Fixed error [#CLICKHOUSE-2]

Browse Source
This commit is contained in:
Alexey Milovidov 2018-04-07 06:46:20 +03:00 committed by proller
parent aa77d0b304
commit 5ce62809da
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dbms/src/DataStreams/MergeSortingBlockInputStream.cpp
View File

@ -140,7 +140,7 @@ Block MergeSortingBlockInputStream::readImpl()
/// Create sorted streams to merge. /// Create sorted streams to merge.
for (const auto & file : temporary_files) for (const auto & file : temporary_files)
{ {
temporary_inputs.emplace_back(std::make_unique<TemporaryFileStream>(file->path())); temporary_inputs.emplace_back(std::make_unique<TemporaryFileStream>(file->path(), header));
inputs_to_merge.emplace_back(temporary_inputs.back()->block_in); inputs_to_merge.emplace_back(temporary_inputs.back()->block_in);
} }

4
dbms/src/DataStreams/MergeSortingBlockInputStream.h
View File

@ -115,8 +115,8 @@ private:
CompressedReadBuffer compressed_in; CompressedReadBuffer compressed_in;
BlockInputStreamPtr block_in; BlockInputStreamPtr block_in;
TemporaryFileStream(const std::string & path) TemporaryFileStream(const std::string & path, const Block & header)
: file_in(path), compressed_in(file_in), block_in(std::make_shared<NativeBlockInputStream>(compressed_in, 0)) {} : file_in(path), compressed_in(file_in), block_in(std::make_shared<NativeBlockInputStream>(compressed_in, header, 0)) {}
}; };
std::vector<std::unique_ptr<TemporaryFileStream>> temporary_inputs; std::vector<std::unique_ptr<TemporaryFileStream>> temporary_inputs;