From de82683197084c64e4be0a03b55e561ae5fe9bf8 Mon Sep 17 00:00:00 2001 From: Alexey Milovidov Date: Mon, 12 Dec 2016 08:56:34 +0300 Subject: [PATCH] Fixed build on clang [#METR-2944].[C --- dbms/include/DB/Storages/MergeTree/MergedBlockOutputStream.h | 3 +-- dbms/src/Storages/MergeTree/MergedBlockOutputStream.cpp | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dbms/include/DB/Storages/MergeTree/MergedBlockOutputStream.h b/dbms/include/DB/Storages/MergeTree/MergedBlockOutputStream.h index d4e4fa475ed..3ea5e1b1bef 100644 --- a/dbms/include/DB/Storages/MergeTree/MergedBlockOutputStream.h +++ b/dbms/include/DB/Storages/MergeTree/MergedBlockOutputStream.h @@ -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; }; } diff --git a/dbms/src/Storages/MergeTree/MergedBlockOutputStream.cpp b/dbms/src/Storages/MergeTree/MergedBlockOutputStream.cpp index 4607e339955..4d98f022c46 100644 --- a/dbms/src/Storages/MergeTree/MergedBlockOutputStream.cpp +++ b/dbms/src/Storages/MergeTree/MergedBlockOutputStream.cpp @@ -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_) { }