Fixed warnings in clang 8 #4143

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

View File

@ -158,7 +158,7 @@ std::unique_ptr<MergeTreeIndex> MergeTreeMinMaxIndexCreator(
}
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>());
}
}

View File

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

View File

@ -387,7 +387,7 @@ std::unique_ptr<MergeTreeIndex> MergeTreeUniqueIndexCreator(
}
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);
}
}

View File

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