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

Shutup clang tidy

Browse Source
This commit is contained in:
alesapin 2021-03-02 19:13:36 +03:00
parent 4e33587043
commit c29d7c7f49
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Storages/MergeTree/MergeTreeData.cpp
View File

@ -423,7 +423,7 @@ ExpressionActionsPtr getCombinedIndicesExpression(
} }
ExpressionActionsPtr MergeTreeData::getMinMaxExpr(const KeyDescription & partition_key) const ExpressionActionsPtr MergeTreeData::getMinMaxExpr(const KeyDescription & partition_key)
{ {
NamesAndTypesList partition_key_columns; NamesAndTypesList partition_key_columns;
if (!partition_key.column_names.empty()) if (!partition_key.column_names.empty())
@ -432,14 +432,14 @@ ExpressionActionsPtr MergeTreeData::getMinMaxExpr(const KeyDescription & partiti
return std::make_shared<ExpressionActions>(std::make_shared<ActionsDAG>(partition_key_columns)); return std::make_shared<ExpressionActions>(std::make_shared<ActionsDAG>(partition_key_columns));
} }
Names MergeTreeData::getMinMaxColumnsNames(const KeyDescription & partition_key) const Names MergeTreeData::getMinMaxColumnsNames(const KeyDescription & partition_key)
{ {
if (!partition_key.column_names.empty()) if (!partition_key.column_names.empty())
return partition_key.expression->getRequiredColumns(); return partition_key.expression->getRequiredColumns();
return {}; return {};
} }
DataTypes MergeTreeData::getMinMaxColumnsTypes(const KeyDescription & partition_key) const DataTypes MergeTreeData::getMinMaxColumnsTypes(const KeyDescription & partition_key)
{ {
if (!partition_key.column_names.empty()) if (!partition_key.column_names.empty())
return partition_key.expression->getRequiredColumnsWithTypes().getTypes(); return partition_key.expression->getRequiredColumnsWithTypes().getTypes();

6
src/Storages/MergeTree/MergeTreeData.h
View File

@ -697,11 +697,11 @@ public:
Int64 minmax_idx_time_column_pos = -1; /// In other cases, minmax index often includes a dateTime column. Int64 minmax_idx_time_column_pos = -1; /// In other cases, minmax index often includes a dateTime column.
/// Get partition key expression on required columns /// Get partition key expression on required columns
ExpressionActionsPtr getMinMaxExpr(const KeyDescription & partition_key) const; static ExpressionActionsPtr getMinMaxExpr(const KeyDescription & partition_key);
/// Get column names required for partition key /// Get column names required for partition key
Names getMinMaxColumnsNames(const KeyDescription & partition_key) const; static Names getMinMaxColumnsNames(const KeyDescription & partition_key);
/// Get column types required for partition key /// Get column types required for partition key
DataTypes getMinMaxColumnsTypes(const KeyDescription & partition_key) const; static DataTypes getMinMaxColumnsTypes(const KeyDescription & partition_key);
ExpressionActionsPtr getPrimaryKeyAndSkipIndicesExpression(const StorageMetadataPtr & metadata_snapshot) const; ExpressionActionsPtr getPrimaryKeyAndSkipIndicesExpression(const StorageMetadataPtr & metadata_snapshot) const;
ExpressionActionsPtr getSortingKeyAndSkipIndicesExpression(const StorageMetadataPtr & metadata_snapshot) const; ExpressionActionsPtr getSortingKeyAndSkipIndicesExpression(const StorageMetadataPtr & metadata_snapshot) const;

2
src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
View File

@ -1892,7 +1892,7 @@ void MergeTreeDataSelectExecutor::selectPartsToRead(
const std::optional<KeyCondition> & minmax_idx_condition, const std::optional<KeyCondition> & minmax_idx_condition,
const DataTypes & minmax_columns_types, const DataTypes & minmax_columns_types,
std::optional<PartitionPruner> & partition_pruner, std::optional<PartitionPruner> & partition_pruner,
const PartitionIdToMaxBlock * max_block_numbers_to_read) const const PartitionIdToMaxBlock * max_block_numbers_to_read)
{ {
auto prev_parts = parts; auto prev_parts = parts;
parts.clear(); parts.clear();

4
src/Storages/MergeTree/MergeTreeDataSelectExecutor.h
View File

@ -119,13 +119,13 @@ private:
/// Select the parts in which there can be data that satisfy `minmax_idx_condition` and that match the condition on `_part`, /// Select the parts in which there can be data that satisfy `minmax_idx_condition` and that match the condition on `_part`,
/// as well as `max_block_number_to_read`. /// as well as `max_block_number_to_read`.
void selectPartsToRead( static void selectPartsToRead(
MergeTreeData::DataPartsVector & parts, MergeTreeData::DataPartsVector & parts,
const std::unordered_set<String> & part_values, const std::unordered_set<String> & part_values,
const std::optional<KeyCondition> & minmax_idx_condition, const std::optional<KeyCondition> & minmax_idx_condition,
const DataTypes & minmax_columns_types, const DataTypes & minmax_columns_types,
std::optional<PartitionPruner> & partition_pruner, std::optional<PartitionPruner> & partition_pruner,
const PartitionIdToMaxBlock * max_block_numbers_to_read) const; const PartitionIdToMaxBlock * max_block_numbers_to_read);
/// Same as previous but also skip parts uuids if any to the query context, or skip parts which uuids marked as excluded. /// Same as previous but also skip parts uuids if any to the query context, or skip parts which uuids marked as excluded.
void selectPartsToReadWithUUIDFilter( void selectPartsToReadWithUUIDFilter(