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

dbms: Server: cleanups [#METR-19266]

Browse Source
This commit is contained in:
Alexey Arno 2016-09-11 13:06:34 +03:00
parent ef7eb14979
commit b7ca838dc0
7 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dbms/include/DB/AggregateFunctions/AggregateFunctionNull.h
View File

@ -60,7 +60,7 @@ public:
nested_function->setArguments(new_args);
}
void setParameters(const Array & params)
void setParameters(const Array & params) override
{
nested_function->setParameters(params);
}

14
dbms/include/DB/DataStreams/MaterializingBlockOutputStream.h
View File

@ -12,13 +12,13 @@ class MaterializingBlockOutputStream : public IBlockOutputStream
public:
MaterializingBlockOutputStream(const BlockOutputStreamPtr & output);
void write(const Block & block) override;
void flush();
void writePrefix();
void writeSuffix();
void setRowsBeforeLimit(size_t rows_before_limit);
void setTotals(const Block & totals);
void setExtremes(const Block & extremes);
String getContentType() const;
void flush() override;
void writePrefix() override;
void writeSuffix() override;
void setRowsBeforeLimit(size_t rows_before_limit) override;
void setTotals(const Block & totals) override;
void setExtremes(const Block & extremes) override;
String getContentType() const override;
private:
static Block materialize(const Block & original_block);

4
dbms/include/DB/Functions/FunctionsStringArray.h
View File

@ -419,7 +419,7 @@ public:
class FunctionArrayStringConcat : public IFunction
{
private:
void executeImpl(
void executeInternal(
const ColumnString::Chars_t & src_chars,
const ColumnString::Offsets_t & src_string_offsets,
const ColumnArray::Offsets_t & src_array_offsets,
@ -541,7 +541,7 @@ public:
std::shared_ptr<ColumnString> col_res = std::make_shared<ColumnString>();
block.getByPosition(result).column = col_res;
executeImpl(
executeInternal(
col_string.getChars(), col_string.getOffsets(), col_arr.getOffsets(),
delimiter.data(), delimiter.size(),
col_res->getChars(), col_res->getOffsets());

2
dbms/include/DB/Parsers/ExpressionListParsers.h
View File

@ -213,7 +213,7 @@ protected:
class ParserNullityChecking : public IParserBase
{
protected:
const char * getName() const { return "nullity checking"; }
const char * getName() const override { return "nullity checking"; }
bool parseImpl(Pos & pos, Pos end, ASTPtr & node, Pos & max_parsed_pos, Expected & expected) override;
};

1
dbms/include/DB/Storages/MergeTree/MergeTreeReader.h
View File

@ -99,7 +99,6 @@ private:
std::unique_ptr<CompressedReadBufferFromFile> non_cached_buffer;
std::string path_prefix;
std::string extension;
size_t max_mark_range;
};
using FileStreams = std::map<std::string, std::unique_ptr<Stream>>;

2
dbms/src/DataTypes/DataTypeNullable.cpp
View File

@ -58,7 +58,7 @@ struct NullDeserializer
if (*istr.position() == Null::name[0])
{
++istr.position();
static constexpr auto length = strlen(Null::name);
static constexpr auto length = __builtin_strlen(Null::name);
if (length > 1)
assertString(&Null::name[1], istr);

7
dbms/src/Storages/StorageLog.cpp
View File

@ -59,8 +59,7 @@ public:
null_mark_number(0),
rows_limit(rows_limit_),
current_mark(mark_number_),
max_read_buffer_size(max_read_buffer_size_),
has_null_marks(false)
max_read_buffer_size(max_read_buffer_size_)
{
}
@ -75,8 +74,7 @@ public:
null_mark_number(null_mark_number_),
rows_limit(rows_limit_),
current_mark(mark_number_),
max_read_buffer_size(max_read_buffer_size_),
has_null_marks(true)
max_read_buffer_size(max_read_buffer_size_)
{
}
@ -108,7 +106,6 @@ private:
size_t rows_read = 0;
size_t current_mark;
size_t max_read_buffer_size;
bool has_null_marks;
struct Stream
{