thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-24 16:42:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some tests.

Browse Source
This commit is contained in:
Nikolai Kochetov 2021-03-30 18:14:20 +03:00
parent 88bfa6c9ba
commit 8fad179800
5 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Processors/QueryPlan/ReadFromMergeTree.cpp
View File

@ -91,7 +91,7 @@ Pipe ReadFromMergeTree::readFromPool()
template<typename TSource> template<typename TSource>
ProcessorPtr ReadFromMergeTree::createSource(const RangesInDataPart & part) ProcessorPtr ReadFromMergeTree::createSource(const RangesInDataPart & part)
{ {
return std::make_shared<MergeTreeSelectProcessor>( return std::make_shared<TSource>(
storage, metadata_snapshot, part.data_part, settings.max_block_size, settings.preferred_block_size_bytes, storage, metadata_snapshot, part.data_part, settings.max_block_size, settings.preferred_block_size_bytes,
settings.preferred_max_column_in_block_size_bytes, required_columns, part.ranges, settings.use_uncompressed_cache, settings.preferred_max_column_in_block_size_bytes, required_columns, part.ranges, settings.use_uncompressed_cache,
prewhere_info, true, settings.reader_settings, virt_column_names, part.part_index_in_query); prewhere_info, true, settings.reader_settings, virt_column_names, part.part_index_in_query);

3
src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
View File

@ -1017,9 +1017,6 @@ QueryPlanPtr MergeTreeDataSelectExecutor::spreadMarkRangesAmongStreams(
if (num_streams > 1) if (num_streams > 1)
{ {
/// Parallel query execution.
Pipes res;
/// Reduce the number of num_streams if the data is small. /// Reduce the number of num_streams if the data is small.
if (sum_marks < num_streams * min_marks_for_concurrent_read && parts.size() < num_streams) if (sum_marks < num_streams * min_marks_for_concurrent_read && parts.size() < num_streams)
num_streams = std::max((sum_marks + min_marks_for_concurrent_read - 1) / min_marks_for_concurrent_read, parts.size()); num_streams = std::max((sum_marks + min_marks_for_concurrent_read - 1) / min_marks_for_concurrent_read, parts.size());

6
tests/queries/0_stateless/01551_mergetree_read_in_order_spread.reference
View File

@ -13,16 +13,16 @@ ExpressionTransform
(MergingSorted) (MergingSorted)
(Expression) (Expression)
ExpressionTransform ExpressionTransform
(ReadFromStorage) (ReadFromMergeTree)
MergeTree 0 → 1 MergeTree 0 → 1
(MergingSorted) (MergingSorted)
MergingSortedTransform 2 → 1 MergingSortedTransform 2 → 1
(Expression) (Expression)
ExpressionTransform × 2 ExpressionTransform × 2
(ReadFromStorage) (ReadFromMergeTree)
MergeTree × 2 0 → 1 MergeTree × 2 0 → 1
(MergingSorted) (MergingSorted)
(Expression) (Expression)
ExpressionTransform ExpressionTransform
(ReadFromStorage) (ReadFromMergeTree)
MergeTree 0 → 1 MergeTree 0 → 1

6
tests/queries/0_stateless/01562_optimize_monotonous_functions_in_order_by.reference
View File

@ -11,7 +11,7 @@ Expression (Projection)
PartialSorting (Sort each block for ORDER BY) PartialSorting (Sort each block for ORDER BY)
Expression (Before ORDER BY) Expression (Before ORDER BY)
SettingQuotaAndLimits (Set limits and quota after reading from storage) SettingQuotaAndLimits (Set limits and quota after reading from storage)
ReadFromStorage (MergeTree) ReadFromMergeTree
SELECT SELECT
timestamp, timestamp,
key key
@ -23,7 +23,7 @@ Expression (Projection)
FinishSorting FinishSorting
Expression (Before ORDER BY) Expression (Before ORDER BY)
SettingQuotaAndLimits (Set limits and quota after reading from storage) SettingQuotaAndLimits (Set limits and quota after reading from storage)
ReadFromStorage (MergeTree with order) ReadFromMergeTree
SELECT SELECT
timestamp, timestamp,
key key
@ -37,7 +37,7 @@ Expression (Projection)
FinishSorting FinishSorting
Expression (Before ORDER BY) Expression (Before ORDER BY)
SettingQuotaAndLimits (Set limits and quota after reading from storage) SettingQuotaAndLimits (Set limits and quota after reading from storage)
ReadFromStorage (MergeTree with order) ReadFromMergeTree
SELECT SELECT
timestamp, timestamp,
key key

28
tests/queries/0_stateless/01576_alias_column_rewrite.reference
View File

@ -28,47 +28,47 @@ Expression (Projection)
PartialSorting (Sort each block for ORDER BY) PartialSorting (Sort each block for ORDER BY)
Expression ((Before ORDER BY + Add table aliases)) Expression ((Before ORDER BY + Add table aliases))
SettingQuotaAndLimits (Set limits and quota after reading from storage) SettingQuotaAndLimits (Set limits and quota after reading from storage)
ReadFromStorage (MergeTree) ReadFromMergeTree
Expression (Projection) Expression (Projection)
Limit (preliminary LIMIT) Limit (preliminary LIMIT)
FinishSorting FinishSorting
Expression ((Before ORDER BY + Add table aliases)) Expression ((Before ORDER BY + Add table aliases))
SettingQuotaAndLimits (Set limits and quota after reading from storage) SettingQuotaAndLimits (Set limits and quota after reading from storage)
Union Union
ReadFromStorage (MergeTree with order) ReadFromMergeTree
ReadFromStorage (MergeTree with order) ReadFromMergeTree
ReadFromStorage (MergeTree with order) ReadFromMergeTree
Expression (Projection) Expression (Projection)
Limit (preliminary LIMIT) Limit (preliminary LIMIT)
FinishSorting FinishSorting
Expression (Before ORDER BY) Expression (Before ORDER BY)
SettingQuotaAndLimits (Set limits and quota after reading from storage) SettingQuotaAndLimits (Set limits and quota after reading from storage)
Union Union
ReadFromStorage (MergeTree with order) ReadFromMergeTree
ReadFromStorage (MergeTree with order) ReadFromMergeTree
ReadFromStorage (MergeTree with order) ReadFromMergeTree
optimize_aggregation_in_order optimize_aggregation_in_order
Expression ((Projection + Before ORDER BY)) Expression ((Projection + Before ORDER BY))
Aggregating Aggregating
Expression ((Before GROUP BY + Add table aliases)) Expression ((Before GROUP BY + Add table aliases))
SettingQuotaAndLimits (Set limits and quota after reading from storage) SettingQuotaAndLimits (Set limits and quota after reading from storage)
ReadFromStorage (MergeTree) ReadFromMergeTree
Expression ((Projection + Before ORDER BY)) Expression ((Projection + Before ORDER BY))
Aggregating Aggregating
Expression ((Before GROUP BY + Add table aliases)) Expression ((Before GROUP BY + Add table aliases))
SettingQuotaAndLimits (Set limits and quota after reading from storage) SettingQuotaAndLimits (Set limits and quota after reading from storage)
Union Union
ReadFromStorage (MergeTree with order) ReadFromMergeTree
ReadFromStorage (MergeTree with order) ReadFromMergeTree
ReadFromStorage (MergeTree with order) ReadFromMergeTree
Expression ((Projection + Before ORDER BY)) Expression ((Projection + Before ORDER BY))
Aggregating Aggregating
Expression (Before GROUP BY) Expression (Before GROUP BY)
SettingQuotaAndLimits (Set limits and quota after reading from storage) SettingQuotaAndLimits (Set limits and quota after reading from storage)
Union Union
ReadFromStorage (MergeTree with order) ReadFromMergeTree
ReadFromStorage (MergeTree with order) ReadFromMergeTree
ReadFromStorage (MergeTree with order) ReadFromMergeTree
second-index second-index
1 1
1 1