mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-11-22 07:31:57 +00:00
handle the case first prefix fixed
This commit is contained in:
parent
45471d841b
commit
6af5fe48ba
@ -370,6 +370,7 @@ InputOrderInfoPtr buildInputOrderInfo(
|
|||||||
int read_direction = 0;
|
int read_direction = 0;
|
||||||
size_t next_description_column = 0;
|
size_t next_description_column = 0;
|
||||||
size_t next_sort_key = 0;
|
size_t next_sort_key = 0;
|
||||||
|
bool first_prefix_fixed = false;
|
||||||
|
|
||||||
while (next_description_column < description.size() && next_sort_key < sorting_key.column_names.size())
|
while (next_description_column < description.size() && next_sort_key < sorting_key.column_names.size())
|
||||||
{
|
{
|
||||||
@ -447,6 +448,9 @@ InputOrderInfoPtr buildInputOrderInfo(
|
|||||||
}
|
}
|
||||||
else if (fixed_key_columns.contains(sort_column_node))
|
else if (fixed_key_columns.contains(sort_column_node))
|
||||||
{
|
{
|
||||||
|
if (next_sort_key == 0)
|
||||||
|
first_prefix_fixed = true;
|
||||||
|
|
||||||
//std::cerr << "+++++++++ Found fixed key by match" << std::endl;
|
//std::cerr << "+++++++++ Found fixed key by match" << std::endl;
|
||||||
++next_sort_key;
|
++next_sort_key;
|
||||||
}
|
}
|
||||||
@ -481,7 +485,7 @@ InputOrderInfoPtr buildInputOrderInfo(
|
|||||||
if (read_direction == 0 || order_key_prefix_descr.empty())
|
if (read_direction == 0 || order_key_prefix_descr.empty())
|
||||||
return nullptr;
|
return nullptr;
|
||||||
|
|
||||||
return std::make_shared<InputOrderInfo>(order_key_prefix_descr, next_sort_key, read_direction, limit);
|
return std::make_shared<InputOrderInfo>(order_key_prefix_descr, next_sort_key, read_direction, limit, first_prefix_fixed);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// We really need three different sort descriptions here.
|
/// We really need three different sort descriptions here.
|
||||||
@ -685,7 +689,7 @@ AggregationInputOrder buildInputOrderInfo(
|
|||||||
for (const auto & key : not_matched_group_by_keys)
|
for (const auto & key : not_matched_group_by_keys)
|
||||||
group_by_sort_description.emplace_back(SortColumnDescription(std::string(key)));
|
group_by_sort_description.emplace_back(SortColumnDescription(std::string(key)));
|
||||||
|
|
||||||
auto input_order = std::make_shared<InputOrderInfo>(order_key_prefix_descr, next_sort_key, /*read_direction*/ 1, /* limit */ 0);
|
auto input_order = std::make_shared<InputOrderInfo>(order_key_prefix_descr, next_sort_key, /*read_direction*/ 1, /* limit */ 0, false);
|
||||||
return { std::move(input_order), std::move(sort_description_for_merging), std::move(group_by_sort_description) };
|
return { std::move(input_order), std::move(sort_description_for_merging), std::move(group_by_sort_description) };
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -823,7 +827,7 @@ InputOrderInfoPtr buildInputOrderInfo(SortingStep & sorting, QueryPlan::Node & n
|
|||||||
|
|
||||||
bool use_buffering = (order_info->limit == 0) && sorting.getSettings().read_in_order_use_buffering;
|
bool use_buffering = (order_info->limit == 0) && sorting.getSettings().read_in_order_use_buffering;
|
||||||
/// Avoid conflict with buffering.
|
/// Avoid conflict with buffering.
|
||||||
if (!use_buffering)
|
if (!use_buffering && !order_info->first_prefix_fixed)
|
||||||
reading->enableVirtualRow();
|
reading->enableVirtualRow();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1808,7 +1808,7 @@ bool ReadFromMergeTree::requestReadingInOrder(size_t prefix_size, int direction,
|
|||||||
if (direction != 1 && query_info.isFinal())
|
if (direction != 1 && query_info.isFinal())
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
query_info.input_order_info = std::make_shared<InputOrderInfo>(SortDescription{}, prefix_size, direction, read_limit);
|
query_info.input_order_info = std::make_shared<InputOrderInfo>(SortDescription{}, prefix_size, direction, read_limit, false);
|
||||||
reader_settings.read_in_order = true;
|
reader_settings.read_in_order = true;
|
||||||
|
|
||||||
/// In case or read-in-order, don't create too many reading streams.
|
/// In case or read-in-order, don't create too many reading streams.
|
||||||
|
@ -249,7 +249,7 @@ InputOrderInfoPtr ReadInOrderOptimizer::getInputOrderImpl(
|
|||||||
if (sort_description_for_merging.empty())
|
if (sort_description_for_merging.empty())
|
||||||
return {};
|
return {};
|
||||||
|
|
||||||
return std::make_shared<InputOrderInfo>(std::move(sort_description_for_merging), key_pos, read_direction, limit);
|
return std::make_shared<InputOrderInfo>(std::move(sort_description_for_merging), key_pos, read_direction, limit, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
InputOrderInfoPtr ReadInOrderOptimizer::getInputOrder(
|
InputOrderInfoPtr ReadInOrderOptimizer::getInputOrder(
|
||||||
|
@ -119,13 +119,22 @@ struct InputOrderInfo
|
|||||||
const int direction;
|
const int direction;
|
||||||
const UInt64 limit;
|
const UInt64 limit;
|
||||||
|
|
||||||
|
/** For virtual row optimization only
|
||||||
|
* for example, when pk is (a,b), a = 1, order by b, virtual row should be
|
||||||
|
* disabled in the following case:
|
||||||
|
* 1st part (0, 100), (1, 2), (1, 3), (1, 4)
|
||||||
|
* 2nd part (0, 100), (1, 2), (1, 3), (1, 4).
|
||||||
|
*/
|
||||||
|
bool first_prefix_fixed;
|
||||||
|
|
||||||
InputOrderInfo(
|
InputOrderInfo(
|
||||||
const SortDescription & sort_description_for_merging_,
|
const SortDescription & sort_description_for_merging_,
|
||||||
size_t used_prefix_of_sorting_key_size_,
|
size_t used_prefix_of_sorting_key_size_,
|
||||||
int direction_, UInt64 limit_)
|
int direction_, UInt64 limit_, bool first_prefix_fixed_)
|
||||||
: sort_description_for_merging(sort_description_for_merging_)
|
: sort_description_for_merging(sort_description_for_merging_)
|
||||||
, used_prefix_of_sorting_key_size(used_prefix_of_sorting_key_size_)
|
, used_prefix_of_sorting_key_size(used_prefix_of_sorting_key_size_)
|
||||||
, direction(direction_), limit(limit_)
|
, direction(direction_), limit(limit_)
|
||||||
|
, first_prefix_fixed(first_prefix_fixed_)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -28,6 +28,12 @@
|
|||||||
1 3
|
1 3
|
||||||
1 4
|
1 4
|
||||||
1 4
|
1 4
|
||||||
|
1 2
|
||||||
|
1 2
|
||||||
|
1 3
|
||||||
|
1 3
|
||||||
|
1 4
|
||||||
|
1 4
|
||||||
========
|
========
|
||||||
1 3
|
1 3
|
||||||
1 2
|
1 2
|
||||||
|
@ -147,6 +147,15 @@ read_in_order_use_buffering = false,
|
|||||||
optimize_read_in_order = 1,
|
optimize_read_in_order = 1,
|
||||||
read_in_order_two_level_merge_threshold = 0; --force preliminary merge
|
read_in_order_two_level_merge_threshold = 0; --force preliminary merge
|
||||||
|
|
||||||
|
SELECT a, b
|
||||||
|
FROM fixed_prefix
|
||||||
|
WHERE a = 1
|
||||||
|
ORDER BY b
|
||||||
|
SETTINGS max_threads = 1,
|
||||||
|
read_in_order_use_buffering = false,
|
||||||
|
optimize_read_in_order = 1,
|
||||||
|
read_in_order_two_level_merge_threshold = 5; --avoid preliminary merge
|
||||||
|
|
||||||
DROP TABLE fixed_prefix;
|
DROP TABLE fixed_prefix;
|
||||||
|
|
||||||
SELECT '========';
|
SELECT '========';
|
||||||
|
Loading…
Reference in New Issue
Block a user