thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-20 08:40:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed build on clang [#METR-2944].[C

Browse Source
This commit is contained in:
Alexey Milovidov 2016-12-12 08:56:34 +03:00
parent 7e37460c38
commit de82683197
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dbms/include/DB/Storages/MergeTree/MergedBlockOutputStream.h
View File

@ -158,7 +158,7 @@ class MergedColumnOnlyOutputStream : public IMergedBlockOutputStream
{
public:
MergedColumnOnlyOutputStream(
MergeTreeData & storage_, String part_path_, bool sync_, CompressionMethod compression_method, bool skip_offsets_);
MergeTreeData & storage_, String part_path_, bool sync_, CompressionMethod compression_method);
void write(const Block & block) override;
void writeSuffix() override;
@ -169,7 +169,6 @@ private:
bool initialized = false;
bool sync;
bool skip_offsets;
};
}

4
dbms/src/Storages/MergeTree/MergedBlockOutputStream.cpp
View File

@ -558,12 +558,12 @@ void MergedBlockOutputStream::writeImpl(const Block & block, const IColumn::Perm
/// Implementation of MergedColumnOnlyOutputStream.
MergedColumnOnlyOutputStream::MergedColumnOnlyOutputStream(
MergeTreeData & storage_, String part_path_, bool sync_, CompressionMethod compression_method, bool skip_offsets_)
MergeTreeData & storage_, String part_path_, bool sync_, CompressionMethod compression_method)
: IMergedBlockOutputStream(
storage_, storage_.context.getSettings().min_compress_block_size,
storage_.context.getSettings().max_compress_block_size, compression_method,
storage_.context.getSettings().min_bytes_to_use_direct_io),
part_path(part_path_), sync(sync_), skip_offsets(skip_offsets_)
part_path(part_path_), sync(sync_)
{
}