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

Fix bad optimization of ORDER BY in subquery if it contains WITH FILL

Browse Source
This commit is contained in:
Alexey Milovidov 2021-09-12 01:24:02 +03:00
parent 526c7253d0
commit d85588210d
4 changed files with 137 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

124
src/Interpreters/DuplicateOrderByVisitor.cpp Normal file
View File

@ -0,0 +1,124 @@
#include <Interpreters/DuplicateOrderByVisitor.h>
#include <Functions/FunctionFactory.h>
#include <AggregateFunctions/AggregateFunctionFactory.h>
#include <IO/WriteHelpers.h>
#include <Parsers/ASTFunction.h>
#include <Parsers/ASTLiteral.h>
#include <Parsers/ASTSelectQuery.h>
#include <Parsers/ASTSetQuery.h>
#include <Parsers/ASTTablesInSelectQuery.h>
#include <Parsers/ASTOrderByElement.h>
#include <Common/typeid_cast.h>
namespace DB
{
namespace ErrorCodes
{
extern const int UNKNOWN_TYPE_OF_AST_NODE;
}
namespace
{
/// Checks if SELECT has stateful functions
class ASTFunctionStatefulData
{
public:
using TypeToVisit = ASTFunction;
ContextPtr context;
bool & is_stateful;
void visit(ASTFunction & ast_function, ASTPtr &)
{
auto aggregate_function_properties = AggregateFunctionFactory::instance().tryGetProperties(ast_function.name);
if (aggregate_function_properties && aggregate_function_properties->is_order_dependent)
{
is_stateful = true;
return;
}
const auto & function = FunctionFactory::instance().tryGet(ast_function.name, context);
if (function && function->isStateful())
{
is_stateful = true;
return;
}
}
};
using ASTFunctionStatefulMatcher = OneTypeMatcher<ASTFunctionStatefulData>;
using ASTFunctionStatefulVisitor = InDepthNodeVisitor<ASTFunctionStatefulMatcher, true>;
}
void DuplicateOrderByFromSubqueriesData::visit(ASTSelectQuery & select_query, ASTPtr &)
{
if (done)
return;
done = true;
if (select_query.orderBy())
{
/// If we have limits then the ORDER BY is non-removable.
if (select_query.limitBy()
|| select_query.limitByOffset()
|| select_query.limitByLength()
|| select_query.limitLength()
|| select_query.limitOffset())
{
return;
}
/// If ORDER BY contains filling (in addition to sorting) it is non-removable.
for (const auto & child : select_query.orderBy()->children)
{
auto * ast = child->as<ASTOrderByElement>();
if (!ast || ast->children.empty())
throw Exception("Bad order expression AST", ErrorCodes::UNKNOWN_TYPE_OF_AST_NODE);
if (ast->with_fill)
return;
}
select_query.setExpression(ASTSelectQuery::Expression::ORDER_BY, nullptr);
}
}
void DuplicateOrderByData::visit(ASTSelectQuery & select_query, ASTPtr &)
{
if (select_query.orderBy() || select_query.groupBy())
{
for (auto & elem : select_query.children)
{
if (elem->as<ASTExpressionList>())
{
bool is_stateful = false;
ASTFunctionStatefulVisitor::Data data{context, is_stateful};
ASTFunctionStatefulVisitor(data).visit(elem);
if (is_stateful) //-V547
return;
}
}
if (auto select_table_ptr = select_query.tables())
{
if (auto * select_table = select_table_ptr->as<ASTTablesInSelectQuery>())
{
if (!select_table->children.empty())
{
DuplicateOrderByFromSubqueriesVisitor::Data data{false};
DuplicateOrderByFromSubqueriesVisitor(data).visit(select_table->children[0]);
}
}
}
}
}
}

111
src/Interpreters/DuplicateOrderByVisitor.h
View File

@ -1,59 +1,13 @@
#pragma once
#include <Functions/FunctionFactory.h>
#include <AggregateFunctions/AggregateFunctionFactory.h>
#include <IO/WriteHelpers.h>
#include <Interpreters/InDepthNodeVisitor.h>
#include <Parsers/ASTFunction.h>
#include <Parsers/ASTLiteral.h>
#include <Parsers/ASTSelectQuery.h>
#include <Parsers/ASTSetQuery.h>
#include <Parsers/ASTTablesInSelectQuery.h>
#include <Parsers/ASTOrderByElement.h>
#include <Parsers/IAST.h>
#include <Common/typeid_cast.h>
namespace DB
{
namespace ErrorCodes
{
extern const int UNKNOWN_TYPE_OF_AST_NODE;
}
/// Checks if SELECT has stateful functions
class ASTFunctionStatefulData
{
public:
using TypeToVisit = ASTFunction;
ContextPtr context;
bool & is_stateful;
void visit(ASTFunction & ast_function, ASTPtr &)
{
auto aggregate_function_properties = AggregateFunctionFactory::instance().tryGetProperties(ast_function.name);
if (aggregate_function_properties && aggregate_function_properties->is_order_dependent)
{
is_stateful = true;
return;
}
const auto & function = FunctionFactory::instance().tryGet(ast_function.name, context);
if (function && function->isStateful())
{
is_stateful = true;
return;
}
}
};
using ASTFunctionStatefulMatcher = OneTypeMatcher<ASTFunctionStatefulData>;
using ASTFunctionStatefulVisitor = InDepthNodeVisitor<ASTFunctionStatefulMatcher, true>;
class ASTSelectQuery;
/// Erases unnecessary ORDER BY from subquery
class DuplicateOrderByFromSubqueriesData
@ -63,38 +17,7 @@ public:
bool done = false;
void visit(ASTSelectQuery & select_query, ASTPtr &)
{
if (done)
return;
done = true;
if (select_query.orderBy())
{
/// If we have limits then the ORDER BY is non-removable.
if (select_query.limitBy()
|| select_query.limitByOffset()
|| select_query.limitByLength()
|| select_query.limitLength()
|| select_query.limitOffset())
{
return;
}
/// If ORDER BY contains filling (in addition to sorting) it is non-removable.
for (const auto & child : select_query.orderBy()->children)
{
auto * ast = child->as<ASTOrderByElement>();
if (!ast || ast->children.empty())
throw Exception("Bad order expression AST", ErrorCodes::UNKNOWN_TYPE_OF_AST_NODE);
if (ast->with_fill)
return;
}
select_query.setExpression(ASTSelectQuery::Expression::ORDER_BY, nullptr);
}
}
void visit(ASTSelectQuery & select_query, ASTPtr &);
};
using DuplicateOrderByFromSubqueriesMatcher = OneTypeMatcher<DuplicateOrderByFromSubqueriesData>;
@ -109,35 +32,7 @@ public:
ContextPtr context;
void visit(ASTSelectQuery & select_query, ASTPtr &)
{
if (select_query.orderBy() || select_query.groupBy())
{
for (auto & elem : select_query.children)
{
if (elem->as<ASTExpressionList>())
{
bool is_stateful = false;
ASTFunctionStatefulVisitor::Data data{context, is_stateful};
ASTFunctionStatefulVisitor(data).visit(elem);
if (is_stateful) //-V547
return;
}
}
if (auto select_table_ptr = select_query.tables())
{
if (auto * select_table = select_table_ptr->as<ASTTablesInSelectQuery>())
{
if (!select_table->children.empty())
{
DuplicateOrderByFromSubqueriesVisitor::Data data{false};
DuplicateOrderByFromSubqueriesVisitor(data).visit(select_table->children[0]);
}
}
}
}
}
void visit(ASTSelectQuery & select_query, ASTPtr &);
};
using DuplicateOrderByMatcher = OneTypeMatcher<DuplicateOrderByData>;

9
tests/queries/0_stateless/2015_order_by_with_fill_misoptimization.reference Normal file
View File

@ -0,0 +1,9 @@
Hello

1
tests/queries/0_stateless/2015_order_by_with_fill_misoptimization.sql Normal file
View File

@ -0,0 +1 @@
SELECT s FROM (SELECT 5 AS x, 'Hello' AS s ORDER BY x WITH FILL FROM 1 TO 10) ORDER BY s;