thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-10-05 08:00:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove redundant function

Browse Source
This commit is contained in:
alesapin 2020-02-19 17:43:34 +03:00
parent 3f29ea0756
commit 7a9b96a8f9
2 changed files with 6 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dbms/src/Storages/AlterCommands.cpp
View File

@ -684,7 +684,7 @@ void AlterCommands::validate(const StorageInMemoryMetadata & metadata, const Con
throw Exception{"Data type have to be specified for column " + column_name + " to add", ErrorCodes::ILLEGAL_COLUMN};
if (command.default_expression)
validateDefaultExpressionForNewColumn(command.default_expression, column_name, command.data_type, all_columns, context);
validateDefaultExpressionForColumn(command.default_expression, column_name, command.data_type, all_columns, context);
all_columns.add(ColumnDescription(column_name, command.data_type, false));
}
@ -702,15 +702,15 @@ void AlterCommands::validate(const StorageInMemoryMetadata & metadata, const Con
if (command.default_expression)
{
if (!command.data_type)
validateDefaultExpressionForNewColumn(
validateDefaultExpressionForColumn(
command.default_expression, column_name, column_in_table.type, all_columns, context);
else
validateDefaultExpressionForNewColumn(
validateDefaultExpressionForColumn(
command.default_expression, column_name, command.data_type, all_columns, context);
}
else if (column_in_table.default_desc.expression && command.data_type)
{
validateDefaultExpressionForNewColumn(
validateDefaultExpressionForColumn(
column_in_table.default_desc.expression, column_name, command.data_type, all_columns, context);
}
}
@ -749,26 +749,8 @@ void AlterCommands::validate(const StorageInMemoryMetadata & metadata, const Con
}
}
}
DataTypePtr AlterCommands::getDefaultExpressionType(
const ASTPtr default_expression,
const String & column_name,
const ColumnsDescription & all_columns,
const Context & context) const
{
String tmp_column_name = "__tmp" + column_name;
auto copy_expression = default_expression->clone();
auto query_with_alias = setAlias(copy_expression, tmp_column_name);
auto syntax_result = SyntaxAnalyzer(context).analyze(query_with_alias, all_columns.getAll());
const auto actions = ExpressionAnalyzer(query_with_alias, syntax_result, context).getActions(true);
const auto & sample_block = actions->getSampleBlock();
auto result_column = sample_block.getByName(tmp_column_name);
return result_column.type;
}
void AlterCommands::validateDefaultExpressionForNewColumn(
void AlterCommands::validateDefaultExpressionForColumn(
const ASTPtr default_expression,
const String & column_name,
const DataTypePtr column_type,

7
dbms/src/Storages/AlterCommands.h
View File

@ -130,13 +130,8 @@ class AlterCommands : public std::vector<AlterCommand>
private:
bool prepared = false;
private:
DataTypePtr getDefaultExpressionType(
const ASTPtr default_expression,
const String & column_name,
const ColumnsDescription & all_columns,
const Context & context) const;
void validateDefaultExpressionForNewColumn(
void validateDefaultExpressionForColumn(
const ASTPtr default_expression,
const String & column_name,
const DataTypePtr column_type,