thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-29 21:20:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

add replaceAliasColumnsInFilter function

Browse Source
This commit is contained in:
sundy-li 2020-11-22 12:16:27 +08:00
parent f4808df41e
commit fe8b11fd5f
6 changed files with 43 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Interpreters/ColumnAliasesVisitor.cpp
View File

@ -26,16 +26,16 @@ void ColumnAliasesMatcher::visit(ASTPtr & ast, Data & data)
{
if (auto column_name = IdentifierSemantic::getColumnName(*node))
{
if (const auto column_default = data.columns.getDefault(column_name.value()))
if (const auto column_default = data.columns.getDefault(*column_name))
{
if (column_default.value().kind == ColumnDefaultKind::Alias)
if (column_default->kind == ColumnDefaultKind::Alias)
{
const auto alias_columns = data.columns.getAliases();
for (const auto & alias_column : alias_columns)
{
if (alias_column.name == column_name.value())
if (alias_column.name == *column_name)
{
ast = addTypeConversionToAST(column_default.value().expression->clone(), alias_column.type->getName());
ast = addTypeConversionToAST(column_default->expression->clone(), alias_column.type->getName());
//revisit ast to track recursive alias columns
Visitor(data).visit(ast);
break;

3
src/Interpreters/InterpreterSelectQuery.cpp
View File

@ -21,6 +21,7 @@
#include <Interpreters/InterpreterSetQuery.h>
#include <Interpreters/evaluateConstantExpression.h>
#include <Interpreters/convertFieldToType.h>
#include <Interpreters/replaceAliasColumnsInFilter.h>
#include <Interpreters/addTypeConversionToAST.h>
#include <Interpreters/ExpressionAnalyzer.h>
#include <Interpreters/getTableExpressions.h>
@ -1182,7 +1183,7 @@ void InterpreterSelectQuery::executeFetchColumns(
else // It's possible to optimize count() given only partition predicates
{
SelectQueryInfo temp_query_info;
temp_query_info.query = query_ptr;
temp_query_info.query = replaceAliasColumnsInFilter(query_ptr->clone(), storage->getInMemoryMetadata().getColumns());
temp_query_info.syntax_analyzer_result = syntax_analyzer_result;
temp_query_info.sets = query_analyzer->getPreparedSets();
num_rows = storage->totalRowsByPartitionPredicate(temp_query_info, *context);

22
src/Interpreters/replaceAliasColumnsInFilter.cpp Normal file
View File

@ -0,0 +1,22 @@
#include <Interpreters/replaceAliasColumnsInFilter.h>
#include <Interpreters/ColumnAliasesVisitor.h>
#include <Storages/ColumnsDescription.h>
#include <Parsers/ASTSelectQuery.h>
namespace DB
{
ASTPtr replaceAliasColumnsInFilter(ASTPtr && ast, const ColumnsDescription & columns)
{
auto & temp_select = ast->as<ASTSelectQuery &>();
ColumnAliasesVisitor::Data aliase_column_data(columns);
ColumnAliasesVisitor aliase_column_visitor(aliase_column_data);
if (temp_select.where())
aliase_column_visitor.visit(temp_select.refWhere());
if (temp_select.prewhere())
aliase_column_visitor.visit(temp_select.refPrewhere());
return ast;
}
}

12
src/Interpreters/replaceAliasColumnsInFilter.h Normal file
View File

@ -0,0 +1,12 @@
#pragma once
#include <common/types.h>
#include <Parsers/IAST_fwd.h>
namespace DB
{
class ColumnsDescription;
ASTPtr replaceAliasColumnsInFilter(ASTPtr && ast, const ColumnsDescription & columns);
}

1
src/Interpreters/ya.make
View File

@ -153,6 +153,7 @@ SRCS(
interpretSubquery.cpp
join_common.cpp
loadMetadata.cpp
replaceAliasColumnsInFilter.cpp
sortBlock.cpp
)

10
src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
View File

@ -23,6 +23,7 @@
#include <Parsers/parseIdentifierOrStringLiteral.h>
#include <Interpreters/ExpressionAnalyzer.h>
#include <Interpreters/ColumnAliasesVisitor.h>
#include <Interpreters/replaceAliasColumnsInFilter.h>
#include <Interpreters/Context.h>
#include <Processors/ConcatProcessor.h>
#include <Processors/QueryPlan/QueryPlan.h>
@ -214,14 +215,7 @@ QueryPlanPtr MergeTreeDataSelectExecutor::readFromParts(
SelectQueryInfo query_info_for_index = query_info;
if (!metadata_snapshot->getColumns().getAliases().empty())
{
query_info_for_index.query = query_info.query->clone();
auto & temp_select = query_info_for_index.query->as<ASTSelectQuery &>();
ColumnAliasesVisitor::Data aliase_column_data(metadata_snapshot->getColumns());
ColumnAliasesVisitor aliase_column_visitor(aliase_column_data);
if (temp_select.where())
aliase_column_visitor.visit(temp_select.refWhere());
if (temp_select.prewhere())
aliase_column_visitor.visit(temp_select.refPrewhere());
query_info_for_index.query = replaceAliasColumnsInFilter(query_info.query->clone(), metadata_snapshot->getColumns());
}
KeyCondition key_condition(query_info_for_index, context, primary_key_columns, primary_key.expression);