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

Fixed warnings in clang 8 #4143

Browse Source
This commit is contained in:
Alexey Milovidov 2019-02-05 19:43:52 +03:00
parent a1b0dede07
commit 9dd2e75b71
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dbms/src/Storages/MergeTree/MergeTreeMinMaxIndex.cpp
View File

@ -140,11 +140,11 @@ std::unique_ptr<MergeTreeIndex> MergeTreeMinMaxIndexCreator(
ASTPtr expr_list = MergeTreeData::extractKeyExpressionList(node->expr->clone()); ASTPtr expr_list = MergeTreeData::extractKeyExpressionList(node->expr->clone());
auto syntax = SyntaxAnalyzer(context, {}).analyze( auto syntax = SyntaxAnalyzer(context, {}).analyze(
expr_list, new_columns); expr_list, new_columns);
auto minmax_expr = ExpressionAnalyzer(expr_list, syntax, context).getActions(false); auto minmax_expr = ExpressionAnalyzer(expr_list, syntax, context).getActions(false);
auto sample = ExpressionAnalyzer(expr_list, syntax, context) auto sample = ExpressionAnalyzer(expr_list, syntax, context)
.getActions(true)->getSampleBlock(); .getActions(true)->getSampleBlock();
Names columns; Names columns;
DataTypes data_types; DataTypes data_types;
@ -158,7 +158,7 @@ std::unique_ptr<MergeTreeIndex> MergeTreeMinMaxIndexCreator(
} }
return std::make_unique<MergeTreeMinMaxIndex>( return std::make_unique<MergeTreeMinMaxIndex>(
node->name, std::move(minmax_expr), columns, data_types, sample, node->granularity.get<size_t>());; node->name, std::move(minmax_expr), columns, data_types, sample, node->granularity.get<size_t>());
} }
} }

14
dbms/src/Storages/MergeTree/MergeTreeMinMaxIndex.h
View File

@ -55,13 +55,13 @@ class MergeTreeMinMaxIndex : public MergeTreeIndex
{ {
public: public:
MergeTreeMinMaxIndex( MergeTreeMinMaxIndex(
String name, String name_,
ExpressionActionsPtr expr, ExpressionActionsPtr expr_,
const Names & columns, const Names & columns_,
const DataTypes & data_types, const DataTypes & data_types_,
const Block & header, const Block & header_,
size_t granularity) size_t granularity_)
: MergeTreeIndex(name, expr, columns, data_types, header, granularity) {} : MergeTreeIndex(name_, expr_, columns_, data_types_, header_, granularity_) {}
~MergeTreeMinMaxIndex() override = default; ~MergeTreeMinMaxIndex() override = default;

2
dbms/src/Storages/MergeTree/MergeTreeUniqueIndex.cpp
View File

@ -387,7 +387,7 @@ std::unique_ptr<MergeTreeIndex> MergeTreeUniqueIndexCreator(
} }
return std::make_unique<MergeTreeUniqueIndex>( return std::make_unique<MergeTreeUniqueIndex>(
node->name, std::move(unique_expr), columns, data_types, header, node->granularity.get<size_t>(), max_rows);; node->name, std::move(unique_expr), columns, data_types, header, node->granularity.get<size_t>(), max_rows);
} }
} }

16
dbms/src/Storages/MergeTree/MergeTreeUniqueIndex.h
View File

@ -68,14 +68,14 @@ class MergeTreeUniqueIndex : public MergeTreeIndex
{ {
public: public:
MergeTreeUniqueIndex( MergeTreeUniqueIndex(
String name, String name_,
ExpressionActionsPtr expr, ExpressionActionsPtr expr_,
const Names & columns, const Names & columns_,
const DataTypes & data_types, const DataTypes & data_types_,
const Block & header, const Block & header_,
size_t granularity, size_t granularity_,
size_t _max_rows) size_t max_rows_)
: MergeTreeIndex(std::move(name), std::move(expr), columns, data_types, header, granularity), max_rows(_max_rows) {} : MergeTreeIndex(std::move(name_), std::move(expr_), columns_, data_types_, header_, granularity_), max_rows(max_rows_) {}
~MergeTreeUniqueIndex() override = default; ~MergeTreeUniqueIndex() override = default;