thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-26 01:22:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Better

Browse Source
This commit is contained in:
kssenii 2021-06-25 14:30:58 +00:00
parent ded9007ca0
commit c2ac9b6027
1 changed files with 26 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/Storages/StorageMerge.cpp
View File

@ -11,6 +11,8 @@
#include <Interpreters/InterpreterSelectQuery.h> #include <Interpreters/InterpreterSelectQuery.h>
#include <Interpreters/IdentifierSemantic.h> #include <Interpreters/IdentifierSemantic.h>
#include <Interpreters/getHeaderForProcessingStage.h> #include <Interpreters/getHeaderForProcessingStage.h>
#include <Interpreters/addTypeConversionToAST.h>
#include <Interpreters/replaceAliasColumnsInQuery.h>
#include <Parsers/ASTSelectQuery.h> #include <Parsers/ASTSelectQuery.h>
#include <Parsers/ASTLiteral.h> #include <Parsers/ASTLiteral.h>
#include <Parsers/ASTIdentifier.h> #include <Parsers/ASTIdentifier.h>
@ -255,51 +257,39 @@ Pipe StorageMerge::read(
if (processed_stage == QueryProcessingStage::FetchColumns && !storage_columns.getAliases().empty()) if (processed_stage == QueryProcessingStage::FetchColumns && !storage_columns.getAliases().empty())
{ {
NameSet required_columns_set; auto syntax_result = TreeRewriter(local_context).analyzeSelect(query_info.query, TreeRewriterResult({}, storage, storage_metadata_snapshot));
std::function<void(ASTPtr)> extract_columns_from_alias_expression = [&](ASTPtr expr) ASTPtr required_columns_expr_list = std::make_shared<ASTExpressionList>();
{
if (!expr)
return;
if (typeid_cast<const ASTLiteral *>(expr.get())) ASTPtr column_expr;
return; for (const auto & column : real_column_names)
if (const auto * ast_function = typeid_cast<const ASTFunction *>(expr.get()))
{ {
if (!ast_function->arguments)
return;
for (const auto & arg : ast_function->arguments->children)
extract_columns_from_alias_expression(arg);
}
else if (const auto * ast_identifier = typeid_cast<const ASTIdentifier *>(expr.get()))
{
auto column = ast_identifier->name();
const auto column_default = storage_columns.getDefault(column); const auto column_default = storage_columns.getDefault(column);
bool is_alias = column_default && column_default->kind == ColumnDefaultKind::Alias; bool is_alias = column_default && column_default->kind == ColumnDefaultKind::Alias;
if (is_alias) if (is_alias)
{ {
auto alias_expression = column_default->expression; column_expr = column_default->expression->clone();
replaceAliasColumnsInQuery(column_expr, storage_metadata_snapshot->getColumns(),
syntax_result->array_join_result_to_source, local_context);
auto column_description = storage_columns.get(column);
column_expr = addTypeConversionToAST(std::move(column_expr), column_description.type->getName(),
storage_metadata_snapshot->getColumns().getAll(), local_context);
column_expr = setAlias(column_expr, column);
auto type = sample_block.getByName(column).type; auto type = sample_block.getByName(column).type;
aliases.push_back({ .name = column, .type = type, .expression = alias_expression }); aliases.push_back({ .name = column, .type = type, .expression = column_expr->clone() });
extract_columns_from_alias_expression(alias_expression);
} }
else else
{ column_expr = std::make_shared<ASTIdentifier>(column);
required_columns_set.insert(column);
}
}
else
{
throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected expression: {}", expr->getID());
}
};
for (const auto & column : real_column_names) required_columns_expr_list->children.emplace_back(std::move(column_expr));
extract_columns_from_alias_expression(std::make_shared<ASTIdentifier>(column)); }
required_columns = std::vector(required_columns_set.begin(), required_columns_set.end()); syntax_result = TreeRewriter(local_context).analyze(required_columns_expr_list, storage_columns.getAllPhysical(),
storage, storage_metadata_snapshot);
auto alias_actions = ExpressionAnalyzer(required_columns_expr_list, syntax_result, local_context).getActionsDAG(true);
required_columns = alias_actions->getRequiredColumns().getNames();
} }
auto source_pipe = createSources( auto source_pipe = createSources(
@ -562,8 +552,6 @@ void StorageMerge::convertingSourceStream(
{ {
pipe_columns.emplace_back(NameAndTypePair(alias.name, alias.type)); pipe_columns.emplace_back(NameAndTypePair(alias.name, alias.type));
ASTPtr expr = std::move(alias.expression); ASTPtr expr = std::move(alias.expression);
expr->setAlias(alias.name);
auto syntax_result = TreeRewriter(local_context).analyze(expr, pipe_columns); auto syntax_result = TreeRewriter(local_context).analyze(expr, pipe_columns);
auto expression_analyzer = ExpressionAnalyzer{alias.expression, syntax_result, local_context}; auto expression_analyzer = ExpressionAnalyzer{alias.expression, syntax_result, local_context};