mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-10-28 11:21:09 +00:00
Fixed error [#CLICKHOUSE-2]
This commit is contained in:
parent
aa77d0b304
commit
5ce62809da
@ -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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -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;
|
||||||
|
Loading…
Reference in New Issue
Block a user