Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix scalar subquery in LIMIT #62567

Merged
merged 2 commits into from
Apr 12, 2024
Merged

Fix scalar subquery in LIMIT #62567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e16309
Allow constant folding throught __getScalar
KochetovNicolai Apr 11, 2024
61d4d9a
Update QueryAnalysisPass.cpp
KochetovNicolai Apr 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 20 additions & 2 deletions src/Analyzer/Passes/QueryAnalysisPass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5624,17 +5624,35 @@ ProjectionNames QueryAnalyzer::resolveFunction(QueryTreeNodePtr & node, Identifi
function_name,
scope.scope_node->formatASTForErrorMessage());

bool argument_is_constant = false;
const auto * constant_node = function_argument->as<ConstantNode>();
if (constant_node)
{
argument_column.column = constant_node->getResultType()->createColumnConst(1, constant_node->getValue());
argument_column.type = constant_node->getResultType();
argument_is_constant = true;
}
else
else if (const auto * get_scalar_function_node = function_argument->as<FunctionNode>();
get_scalar_function_node && get_scalar_function_node->getFunctionName() == "__getScalar")
{
all_arguments_constants = false;
/// Allow constant folding through getScalar
const auto * get_scalar_const_arg = get_scalar_function_node->getArguments().getNodes().at(0)->as<ConstantNode>();
if (get_scalar_const_arg && scope.context->hasQueryContext())
{
auto query_context = scope.context->getQueryContext();
auto scalar_string = toString(get_scalar_const_arg->getValue());
if (query_context->hasScalar(scalar_string))
{
auto scalar = query_context->getScalar(scalar_string);
argument_column.column = ColumnConst::create(scalar.getByPosition(0).column, 1);
argument_column.type = get_scalar_function_node->getResultType();
argument_is_constant = true;
}
}
}

all_arguments_constants &= argument_is_constant;

argument_types.push_back(argument_column.type);
argument_columns.emplace_back(std::move(argument_column));
}
Expand Down
3 changes: 3 additions & 0 deletions tests/queries/0_stateless/00834_limit_with_constant_expressions.reference
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,6 @@
2
3
4
0
1
2
2 changes: 2 additions & 0 deletions tests/queries/0_stateless/00834_limit_with_constant_expressions.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,5 @@ SELECT * FROM numbers(10) LIMIT LENGTH('NNN') + COS(0), toDate('0000-00-02'); --
SELECT * FROM numbers(10) LIMIT a + 5 - a; -- { serverError 47 }
SELECT * FROM numbers(10) LIMIT a + b; -- { serverError 47 }
SELECT * FROM numbers(10) LIMIT 'Hello'; -- { serverError 440 }

SELECT number from numbers(10) order by number limit (select sum(number), count() from numbers(3)).1;