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

ASTs

Browse Source
This commit is contained in:
Nikita Vasilev 2019-02-06 10:51:35 +03:00
parent b613d780e4
commit 258367c1dd
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dbms/src/Storages/IndicesDescription.h
View File

@ -6,11 +6,11 @@
namespace DB namespace DB
{ {
using IndicesAsts = std::vector<std::shared_ptr<ASTIndexDeclaration>>; using IndicesASTs = std::vector<std::shared_ptr<ASTIndexDeclaration>>;
struct IndicesDescription struct IndicesDescription
{ {
IndicesAsts indices; IndicesASTs indices;
IndicesDescription() = default; IndicesDescription() = default;

4
dbms/src/Storages/MergeTree/MergeTreeData.cpp
View File

@ -1148,7 +1148,7 @@ void MergeTreeData::checkAlter(const AlterCommands & commands)
} }
void MergeTreeData::createConvertExpression(const DataPartPtr & part, const NamesAndTypesList & old_columns, const NamesAndTypesList & new_columns, void MergeTreeData::createConvertExpression(const DataPartPtr & part, const NamesAndTypesList & old_columns, const NamesAndTypesList & new_columns,
const IndicesAsts & old_indices, const IndicesAsts & new_indices, ExpressionActionsPtr & out_expression, const IndicesASTs & old_indices, const IndicesASTs & new_indices, ExpressionActionsPtr & out_expression,
NameToNameMap & out_rename_map, bool & out_force_update_metadata) const NameToNameMap & out_rename_map, bool & out_force_update_metadata) const
{ {
out_expression = nullptr; out_expression = nullptr;
@ -1308,7 +1308,7 @@ void MergeTreeData::createConvertExpression(const DataPartPtr & part, const Name
MergeTreeData::AlterDataPartTransactionPtr MergeTreeData::alterDataPart( MergeTreeData::AlterDataPartTransactionPtr MergeTreeData::alterDataPart(
const DataPartPtr & part, const DataPartPtr & part,
const NamesAndTypesList & new_columns, const NamesAndTypesList & new_columns,
const IndicesAsts & new_indices, const IndicesASTs & new_indices,
bool skip_sanity_checks) bool skip_sanity_checks)
{ {
ExpressionActionsPtr expression; ExpressionActionsPtr expression;

4
dbms/src/Storages/MergeTree/MergeTreeData.h
View File

@ -490,7 +490,7 @@ public:
AlterDataPartTransactionPtr alterDataPart( AlterDataPartTransactionPtr alterDataPart(
const DataPartPtr & part, const DataPartPtr & part,
const NamesAndTypesList & new_columns, const NamesAndTypesList & new_columns,
const IndicesAsts & new_indices, const IndicesASTs & new_indices,
bool skip_sanity_checks); bool skip_sanity_checks);
/// Freezes all parts. /// Freezes all parts.
@ -746,7 +746,7 @@ private:
/// Files to be deleted are mapped to an empty string in out_rename_map. /// Files to be deleted are mapped to an empty string in out_rename_map.
/// If part == nullptr, just checks that all type conversions are possible. /// If part == nullptr, just checks that all type conversions are possible.
void createConvertExpression(const DataPartPtr & part, const NamesAndTypesList & old_columns, const NamesAndTypesList & new_columns, void createConvertExpression(const DataPartPtr & part, const NamesAndTypesList & old_columns, const NamesAndTypesList & new_columns,
const IndicesAsts & old_indices, const IndicesAsts & new_indices, const IndicesASTs & old_indices, const IndicesASTs & new_indices,
ExpressionActionsPtr & out_expression, NameToNameMap & out_rename_map, bool & out_force_update_metadata) const; ExpressionActionsPtr & out_expression, NameToNameMap & out_rename_map, bool & out_force_update_metadata) const;
/// Calculates column sizes in compressed form for the current state of data_parts. Call with data_parts mutex locked. /// Calculates column sizes in compressed form for the current state of data_parts. Call with data_parts mutex locked.