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

Fixing warnings on clang [#METR-2807].

Browse Source
This commit is contained in:
Alexey Milovidov 2016-03-07 07:43:14 +03:00
parent 8f7425a906
commit a75b6ca3dd
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dbms/include/DB/IO/ReadBufferFromFileDescriptor.h
View File

@ -37,7 +37,7 @@ protected:
int fd; int fd;
off_t pos_in_file; /// Какому сдвигу в файле соответствует working_buffer.end(). off_t pos_in_file; /// Какому сдвигу в файле соответствует working_buffer.end().
bool nextImpl() bool nextImpl() override
{ {
size_t bytes_read = 0; size_t bytes_read = 0;
while (!bytes_read) while (!bytes_read)
@ -86,7 +86,7 @@ protected:
} }
/// Имя или описание файла /// Имя или описание файла
virtual std::string getFileName() const override std::string getFileName() const override
{ {
return "(fd = " + toString(fd) + ")"; return "(fd = " + toString(fd) + ")";
} }

3
dbms/src/Storages/MergeTree/MergeTreeDataMerger.cpp
View File

@ -692,8 +692,7 @@ MergeTreeData::PerShardDataParts MergeTreeDataMerger::reshardPartition(
MergeTreeSharder sharder(data, job); MergeTreeSharder sharder(data, job);
Block block; while (Block block = merged_stream->read())
while (block = merged_stream->read())
{ {
abortIfRequested(); abortIfRequested();