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

Merge pull request #63478 from kitaisreal/analyzer-setting-max-streams-to-max-threads-ratio-overflow-fix

Browse Source 
Analyzer setting max_streams_to_max_threads_ratio overflow fix
This commit is contained in:
Raúl Marín 2024-05-07 19:52:34 +00:00 committed by GitHub
commit ffeceeb491
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/AggregateFunctions/AggregateFunctionSparkbar.cpp
View File

@ -253,9 +253,9 @@ private:
else else
{ {
Y scaled; Y scaled;
bool has_overfllow = common::mulOverflow<Y>(y, levels_num, scaled); bool has_overflow = common::mulOverflow<Y>(y, levels_num, scaled);
if (has_overfllow) if (has_overflow)
y = y / (y_max / levels_num) + 1; y = y / (y_max / levels_num) + 1;
else else
y = scaled / y_max + 1; y = scaled / y_max + 1;

10
src/Planner/PlannerJoinTree.cpp
View File

@ -708,7 +708,15 @@ JoinTreeQueryPlan buildQueryPlanForTableExpression(QueryTreeNodePtr table_expres
/// If necessary, we request more sources than the number of threads - to distribute the work evenly over the threads /// If necessary, we request more sources than the number of threads - to distribute the work evenly over the threads
if (max_streams > 1 && !is_sync_remote) if (max_streams > 1 && !is_sync_remote)
max_streams = static_cast<size_t>(max_streams * settings.max_streams_to_max_threads_ratio); {
if (auto streams_with_ratio = max_streams * settings.max_streams_to_max_threads_ratio; canConvertTo<size_t>(streams_with_ratio))
max_streams = static_cast<size_t>(streams_with_ratio);
else
throw Exception(ErrorCodes::PARAMETER_OUT_OF_BOUND,
"Exceeded limit for `max_streams` with `max_streams_to_max_threads_ratio`. "
"Make sure that `max_streams * max_streams_to_max_threads_ratio` is in some reasonable boundaries, current value: {}",
streams_with_ratio);
}
if (table_node) if (table_node)
table_expression_query_info.table_expression_modifiers = table_node->getTableExpressionModifiers(); table_expression_query_info.table_expression_modifiers = table_node->getTableExpressionModifiers();

0
tests/queries/0_stateless/03148_setting_max_streams_to_max_threads_ratio_overflow.reference Normal file
View File

14
tests/queries/0_stateless/03148_setting_max_streams_to_max_threads_ratio_overflow.sql Normal file
View File

@ -0,0 +1,14 @@
DROP TABLE IF EXISTS test_table;
CREATE TABLE test_table
(
id UInt64,
value String
) ENGINE = MergeTree ORDER BY id;
INSERT INTO test_table VALUES (0, 'Value_0');
SELECT * FROM test_table SETTINGS max_threads = 1025, max_streams_to_max_threads_ratio = -9223372036854775808, allow_experimental_analyzer = 1; -- { serverError PARAMETER_OUT_OF_BOUND }
SELECT * FROM test_table SETTINGS max_threads = 1025, max_streams_to_max_threads_ratio = -9223372036854775808, allow_experimental_analyzer = 0; -- { serverError PARAMETER_OUT_OF_BOUND }
DROP TABLE test_table;