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

fixed aliases for ARRAY JOIN section (unknown kolumn issue) [#CONV-7967]

Browse Source
This commit is contained in:
Vyacheslav Alipov 2013-07-31 11:28:55 +00:00
parent 857063ebf3
commit d6acde63a9
2 changed files with 49 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dbms/include/DB/Interpreters/ExpressionAnalyzer.h
View File

@ -218,6 +218,11 @@ private:
NamesAndTypesList::iterator findColumn(const String & name, NamesAndTypesList & cols);
NamesAndTypesList::iterator findColumn(const String & name) { return findColumn(name, columns); }
/// Проверяет является ли данный столбец результатом ARRAY JOIN
bool isArrayJoinedColumnName(const String & name);
/// Возвращает исходное имя столбца до применения к нему ARRAY JOIN
String getOriginalNestedName(const String & name);
void removeUnusedColumns();
/** Создать словарь алиасов.

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

@ -115,6 +115,38 @@ NamesAndTypesList::iterator ExpressionAnalyzer::findColumn(const String & name,
}
bool ExpressionAnalyzer::isArrayJoinedColumnName(const String & name)
{
if (select_query && select_query->array_join_identifier)
{
String maybe_array_joined_nested_table = select_query->array_join_identifier->getAlias();
return name == maybe_array_joined_nested_table
|| DataTypeNested::extractNestedTableName(name) == maybe_array_joined_nested_table;
}
return false;
}
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();
if (name == aliased_nested_table)
return nested_table;
if (DataTypeNested::extractNestedTableName(name) == aliased_nested_table)
{
String nested_column = DataTypeNested::extractNestedColumnName(name);
return DataTypeNested::concatenateNestedName(nested_table, nested_column);
}
}
return name;
}
void ExpressionAnalyzer::createAliasesDict(ASTPtr & ast)
{
/// Обход снизу-вверх. Не опускаемся в подзапросы.
@ -357,6 +389,16 @@ void ExpressionAnalyzer::normalizeTreeImpl(ASTPtr & ast, MapOfASTs & finished_as
throw Exception("Requested Sign column while sign-rewrite is on.", ErrorCodes::QUERY_SECTION_DOESNT_MAKE_SENSE);
}
}
/// на случай если подставили алиас
node = dynamic_cast<ASTIdentifier *>(&*ast);
if (node && node->kind == ASTIdentifier::Column && isArrayJoinedColumnName(node->name))
{
String original_name = getOriginalNestedName(node->name);
node->alias = node->name;
node->name = original_name;
}
}
else if (ASTExpressionList * node = dynamic_cast<ASTExpressionList *>(&*ast))
{
@ -530,20 +572,8 @@ void ExpressionAnalyzer::getArrayJoinedColumnsImpl(ASTPtr ast, NameToNameMap & a
{
if (ASTIdentifier * node = dynamic_cast<ASTIdentifier *>(&*ast))
{
String maybe_array_joined_nested_table = select_query->array_join_identifier->getAlias();
if (node->kind == ASTIdentifier::Column &&
(node->name == maybe_array_joined_nested_table
|| DataTypeNested::extractNestedTableName(node->name) == maybe_array_joined_nested_table))
{
String nested_table = select_query->array_join_identifier->getColumnName();
String nested_column = DataTypeNested::extractNestedColumnName(node->name);
String from_name = DataTypeNested::concatenateNestedName(nested_table, nested_column);
String to_name = DataTypeNested::concatenateNestedName(maybe_array_joined_nested_table, nested_column);
array_joined_columns[from_name] = to_name;
}
if (node->kind == ASTIdentifier::Column && isArrayJoinedColumnName(node->name))
array_joined_columns[node->name] = node->alias;
}
else
{
@ -1153,25 +1183,7 @@ void ExpressionAnalyzer::getRequiredColumnsImpl(ASTPtr ast, NamesSet & required_
if (ASTIdentifier * node = dynamic_cast<ASTIdentifier *>(&*ast))
{
if (node->kind == ASTIdentifier::Column && !ignored_names.count(node->name))
{
/// Разрешаем алиасы для вложенной таблицы, чтобы в требуемые столбцы попали исходные имена
if (select_query && select_query->array_join_identifier)
{
String maybe_array_joined_nested_table = select_query->array_join_identifier->getAlias();
if (node->name == maybe_array_joined_nested_table
|| DataTypeNested::extractNestedTableName(node->name) == maybe_array_joined_nested_table)
{
String nested_table = select_query->array_join_identifier->getColumnName();
String nested_column = DataTypeNested::extractNestedColumnName(node->name);
String original_name = DataTypeNested::concatenateNestedName(nested_table, nested_column);
required_columns.insert(original_name);
return;
}
}
required_columns.insert(node->name);
}
return;
}