thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-25 09:02:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix aliases for row level actions.

Browse Source
This commit is contained in:
Nikolai Kochetov 2021-02-20 17:19:11 +03:00
parent a8bc2722f4
commit 8a876b9510
1 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/Interpreters/InterpreterSelectQuery.cpp
View File

@ -1410,30 +1410,30 @@ void InterpreterSelectQuery::executeFetchColumns(QueryProcessingStage::Enum proc
if (storage)
{
/// Append columns from the table filter to required
if (row_policy_filter)
{
ActionsDAG * row_policy_dag = nullptr;
if (expressions.filter_info)
row_policy_dag = expressions.filter_info->actions.get();
else if (expressions.prewhere_info)
{
if (expressions.prewhere_info->row_level_filter_actions)
row_policy_dag = expressions.prewhere_info->row_level_filter_actions.get();
else if (expressions.prewhere_info->prewhere_actions)
row_policy_dag = expressions.prewhere_info->prewhere_actions.get();
}
// if (row_policy_filter)
// {
// ActionsDAG * row_policy_dag = nullptr;
// if (expressions.filter_info)
// row_policy_dag = expressions.filter_info->actions.get();
// else if (expressions.prewhere_info)
// {
// if (expressions.prewhere_info->row_level_filter_actions)
// row_policy_dag = expressions.prewhere_info->row_level_filter_actions.get();
// else if (expressions.prewhere_info->prewhere_actions)
// row_policy_dag = expressions.prewhere_info->prewhere_actions.get();
// }
if (row_policy_dag)
{
auto required_columns_from_filter = row_policy_dag->getRequiredColumns();
// if (row_policy_dag)
// {
// auto required_columns_from_filter = row_policy_dag->getRequiredColumns();
for (const auto & column : required_columns_from_filter)
{
if (required_columns.end() == std::find(required_columns.begin(), required_columns.end(), column.name))
required_columns.push_back(column.name);
}
}
}
// for (const auto & column : required_columns_from_filter)
// {
// if (required_columns.end() == std::find(required_columns.begin(), required_columns.end(), column.name))
// required_columns.push_back(column.name);
// }
// }
// }
/// Detect, if ALIAS columns are required for query execution
auto alias_columns_required = false;
@ -1463,11 +1463,14 @@ void InterpreterSelectQuery::executeFetchColumns(QueryProcessingStage::Enum proc
if (prewhere_info)
{
/// Get some columns directly from PREWHERE expression actions
auto prewhere_required_columns = (
prewhere_info->row_level_filter_actions ?
prewhere_info->row_level_filter_actions :
prewhere_info->prewhere_actions)->getRequiredColumns().getNames();
auto prewhere_required_columns = prewhere_info->prewhere_actions->getRequiredColumns().getNames();
required_columns_from_prewhere.insert(prewhere_required_columns.begin(), prewhere_required_columns.end());
if (prewhere_info->row_level_filter_actions)
{
auto row_level_required_columns = prewhere_info->row_level_filter_actions->getRequiredColumns().getNames();
required_columns_from_prewhere.insert(row_level_required_columns.begin(), row_level_required_columns.end());
}
}
/// Expression, that contains all raw required columns