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

restrict the case of func pk

Browse Source
This commit is contained in:
jsc0218 2024-05-18 03:33:42 +00:00
parent 8b765cb001
commit 4a0a4c68b2
3 changed files with 66 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/Processors/QueryPlan/SortingStep.cpp
View File

@ -262,12 +262,9 @@ void SortingStep::enableVirtualRow(const QueryPipelineBuilder & pipeline) const
}
}
/// If everything is okay, we enable virtual row in MergeTreeSelectProcessor
/// If everything is okay, enable virtual row in MergeTreeSelectProcessor.
if (enable_virtual_row && merge_tree_sources.size() >= 2)
{
/// We have to check further in the case of fixed prefix, for example,
/// primary key ab, query SELECT a, b FROM t WHERE a = 1 ORDER BY b,
/// merge sort would sort based on b, leading to wrong result in comparison.
auto extractNameAfterDot = [](const String & name)
{
size_t pos = name.find_last_of('.');
@ -278,10 +275,25 @@ void SortingStep::enableVirtualRow(const QueryPipelineBuilder & pipeline) const
String column_name = extractNameAfterDot(type_and_name.name);
for (const auto & merge_tree_source : merge_tree_sources)
{
const auto& merge_tree_select_processor = merge_tree_source->getProcessor();
const auto & merge_tree_select_processor = merge_tree_source->getProcessor();
/// Check pk is not func based, as we only check type and name in filling in primary key of virtual row.
const auto & primary_key = merge_tree_select_processor->getPrimaryKey();
if (primary_key.column_names[0] == column_name && primary_key.data_types[0] == type_and_name.type)
const auto & actions = primary_key.expression->getActions();
bool is_okay = true;
for (const auto & action : actions)
{
if (action.node->type != ActionsDAG::ActionType::INPUT)
{
is_okay = false;
break;
}
}
/// We have to check further in the case of fixed prefix, for example,
/// primary key ab, query SELECT a, b FROM t WHERE a = 1 ORDER BY b,
/// merge sort would sort based on b, leading to wrong result in comparison.
if (is_okay && primary_key.column_names[0] == column_name && primary_key.data_types[0] == type_and_name.type)
merge_tree_select_processor->enableVirtualRow();
}
}

4
tests/queries/0_stateless/03031_read_in_order_optimization_with_virtual_row.reference
View File

@ -28,3 +28,7 @@
1 3
1 4
1 4
========
1 3
1 2
1 1

64
tests/queries/0_stateless/03031_read_in_order_optimization_with_virtual_row.sql
View File

@ -13,22 +13,22 @@ ORDER BY (x, y, z)
SETTINGS index_granularity = 8192,
index_granularity_bytes = 10485760;
INSERT INTO t SELECT
number,
number,
number,
number
FROM numbers(8192 * 3);
INSERT INTO t SELECT
number + (8192 * 3),
number + (8192 * 3),
number + (8192 * 3),
number
FROM numbers(8192 * 3);
SYSTEM STOP MERGES t;
INSERT INTO t SELECT
number,
number,
number,
number
FROM numbers(8192 * 3);
INSERT INTO t SELECT
number + (8192 * 3),
number + (8192 * 3),
number + (8192 * 3),
number
FROM numbers(8192 * 3);
-- Expecting 2 virtual rows + one chunk (8192) for result + one extra chunk for next consumption in merge transform (8192),
-- both chunks come from the same part.
SELECT x
@ -126,15 +126,39 @@ DROP TABLE t;
SELECT '========';
-- from 02149_read_in_order_fixed_prefix
DROP TABLE IF EXISTS t_read_in_order;
DROP TABLE IF EXISTS fixed_prefix;
CREATE TABLE t_read_in_order(a UInt32, b UInt32)
CREATE TABLE fixed_prefix(a UInt32, b UInt32)
ENGINE = MergeTree ORDER BY (a, b)
SETTINGS index_granularity = 3;
SYSTEM STOP MERGES t_read_in_order;
SYSTEM STOP MERGES fixed_prefix;
INSERT INTO t_read_in_order VALUES (0, 100), (1, 2), (1, 3), (1, 4), (2, 5);
INSERT INTO t_read_in_order VALUES (0, 100), (1, 2), (1, 3), (1, 4), (2, 5);
INSERT INTO fixed_prefix VALUES (0, 100), (1, 2), (1, 3), (1, 4), (2, 5);
INSERT INTO fixed_prefix VALUES (0, 100), (1, 2), (1, 3), (1, 4), (2, 5);
SELECT a, b FROM t_read_in_order WHERE a = 1 ORDER BY b SETTINGS max_threads = 1;
SELECT a, b FROM fixed_prefix WHERE a = 1 ORDER BY b SETTINGS max_threads = 1;
DROP TABLE fixed_prefix;
SELECT '========';
-- currently don't support virtual row in this case
DROP TABLE IF EXISTS function_pk;
CREATE TABLE function_pk
(
`A` Int64,
`B` Int64
)
ENGINE = MergeTree ORDER BY (A, -B)
SETTINGS index_granularity = 1;
SYSTEM STOP MERGES function_pk;
INSERT INTO function_pk values(1,1);
INSERT INTO function_pk values(1,3);
INSERT INTO function_pk values(1,2);
SELECT * FROM function_pk ORDER BY (A,-B) ASC limit 3 SETTINGS max_threads = 1;
DROP TABLE function_pk;