thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-22 17:50:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed getRequiredColumns, getSelectSampleBlock, aliases dict and originalNestedName [#CONV-7967]

Browse Source
This commit is contained in:
Vyacheslav Alipov 2013-08-01 14:43:04 +00:00
parent 733db69d41
commit 371c8ce796
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dbms/src/Interpreters/ExpressionAnalyzer.cpp
View File

@ -134,16 +134,16 @@ String ExpressionAnalyzer::getOriginalNestedName(const String & name)
{
if (select_query && select_query->array_join_identifier)
{
String aliased_nested_table = select_query->array_join_identifier->getAlias();
String nested_table = select_query->array_join_identifier->getColumnName();
String nested_table_name = select_query->array_join_identifier->getColumnName();
String nested_table_alias = select_query->array_join_identifier->getAlias();
if (name == aliased_nested_table)
return nested_table;
if (name == nested_table_alias)
return nested_table_name;
if (DataTypeNested::extractNestedTableName(name) == aliased_nested_table)
if (DataTypeNested::extractNestedTableName(name) == nested_table_alias)
{
String nested_column = DataTypeNested::extractNestedColumnName(name);
return DataTypeNested::concatenateNestedName(nested_table, nested_column);
return DataTypeNested::concatenateNestedName(nested_table_name, nested_column);
}
}
return name;
@ -152,6 +152,10 @@ String ExpressionAnalyzer::getOriginalNestedName(const String & name)
void ExpressionAnalyzer::createAliasesDict(ASTPtr & ast)
{
if (ASTIdentifier * node = dynamic_cast<ASTIdentifier *>(&*ast))
if (node->kind == ASTIdentifier::ArrayJoin)
return;
/// Обход снизу-вверх. Не опускаемся в подзапросы.
for (ASTs::iterator it = ast->children.begin(); it != ast->children.end(); ++it)
if (!dynamic_cast<ASTSelectQuery *>(&**it))
@ -603,7 +607,9 @@ void ExpressionAnalyzer::addMultipleArrayJoinAction(ExpressionActions & actions)
if (nested_column == nested_table_name || (nested_table == nested_table_name && array_joined_columns.count(nested_column)))
{
added_columns = true;
String array_joined_name = DataTypeNested::concatenateNestedName(nested_table_alias, nested_column);
String array_joined_name = nested_column == nested_table_name
? nested_table_alias
: DataTypeNested::concatenateNestedName(nested_table_alias, nested_column);
actions.add(ExpressionActions::Action::copyColumn(*it, array_joined_name));
}
}
@ -1075,6 +1081,7 @@ Block ExpressionAnalyzer::getSelectSampleBlock()
assertSelect();
ExpressionActions temp_actions(aggregated_columns, settings);
addMultipleArrayJoinAction(temp_actions);
NamesWithAliases result_columns;
ASTs asts = select_query->select_expression_list->children;
@ -1213,7 +1220,12 @@ void ExpressionAnalyzer::getRequiredColumnsImpl(ASTPtr ast, NamesSet & required_
if (ASTIdentifier * node = dynamic_cast<ASTIdentifier *>(&*ast))
{
if (node->kind == ASTIdentifier::Column && !ignored_names.count(node->name))
required_columns.insert(node->name);
{
if (isArrayJoinedColumnName(node->name))
required_columns.insert(getOriginalNestedName(node->name));
else
required_columns.insert(node->name);
}
return;
}