From 4fa6c2f63df9411d0e7960b75150ef1b456c0e6b Mon Sep 17 00:00:00 2001 From: alesapin Date: Fri, 3 Apr 2020 11:59:47 +0300 Subject: [PATCH] Rename parameter --- dbms/Storages/MergeTree/MergeTreeData.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dbms/Storages/MergeTree/MergeTreeData.cpp b/dbms/Storages/MergeTree/MergeTreeData.cpp index 2e00dc864f8..7861c97b620 100644 --- a/dbms/Storages/MergeTree/MergeTreeData.cpp +++ b/dbms/Storages/MergeTree/MergeTreeData.cpp @@ -610,17 +610,17 @@ void checkTTLExpression(const ExpressionActionsPtr & ttl_expression, const Strin } -void MergeTreeData::setTTLExpressions(const ColumnsDescription & columns, +void MergeTreeData::setTTLExpressions(const ColumnsDescription & new_columns, const ASTPtr & new_ttl_table_ast, bool only_check) { - auto new_column_ttls = columns.getColumnTTLs(); + auto new_column_ttls = new_columns.getColumnTTLs(); - auto create_ttl_entry = [this, &columns](ASTPtr ttl_ast) + auto create_ttl_entry = [this, &new_columns](ASTPtr ttl_ast) { TTLEntry result; - auto syntax_result = SyntaxAnalyzer(global_context).analyze(ttl_ast, columns.getAllPhysical()); + auto syntax_result = SyntaxAnalyzer(global_context).analyze(ttl_ast, new_columns.getAllPhysical()); result.expression = ExpressionAnalyzer(ttl_ast, syntax_result, global_context).getActions(false); result.destination_type = PartDestinationType::DELETE; result.result_column = ttl_ast->getColumnName();