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

Fix some tests.

Browse Source
This commit is contained in:
Nikolai Kochetov 2024-11-14 14:45:59 +00:00
parent ef0736699e
commit 4c0af76d93
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Interpreters/HashJoin/HashJoin.cpp
View File

@ -609,7 +609,7 @@ bool HashJoin::addBlockToJoin(const Block & source_block_, bool check_limits)
filterBlock(right_key_columns_for_filter, *null_map);
if (onexpr_idx == 0 && right_key_columns_for_filter)
data->right_key_columns_for_filter.emplace_back(std::move(right_key_columns_for_filter));
data->right_key_columns_for_filter.emplace_back(right_key_columns_for_filter);
}
auto join_mask_col = JoinCommon::getColumnAsMask(source_block, onexprs[onexpr_idx].condColumnNames().second);

2
src/Storages/MergeTree/MergeTreeReadPoolBase.cpp
View File

@ -191,7 +191,7 @@ void MergeTreeReadPoolBase::fillPerPartInfos(const RangesInDataParts & parts_ran
is_part_on_remote_disk.push_back(part_with_ranges.data_part->isStoredOnRemoteDisk());
std::tie(read_task_info.min_marks_per_task, read_task_info.approx_size_of_mark)
= calculateMinMarksPerTask(part_with_ranges, column_names, read_task_info.task_columns.pre_columns, pool_settings, merge_tree_determine_task_size_by_prewhere_columns, merge_tree_min_bytes_per_task_for_remote_reading, merge_tree_min_read_task_size);
= calculateMinMarksPerTask(part_with_ranges, column_names, read_task_info.task_columns.pre_columns, pool_settings, merge_tree_determine_task_size_by_prewhere_columns, merge_tree_min_read_task_size, merge_tree_min_bytes_per_task_for_remote_reading);
per_part_infos.push_back(std::make_shared<MergeTreeReadTaskInfo>(std::move(read_task_info)));
}
}

4
tests/queries/0_stateless/02242_system_filesystem_cache_log_table.sh
View File

@ -21,9 +21,9 @@ for STORAGE_POLICY in 's3_cache' 'local_cache' 'azure_cache'; do
$CLICKHOUSE_CLIENT --enable_filesystem_cache_on_write_operations=0 --enable_filesystem_cache_log=1 --query "SELECT 2242, '$STORAGE_POLICY', * FROM test_2242 FORMAT Null"
$CLICKHOUSE_CLIENT --query "SYSTEM FLUSH LOGS"
$CLICKHOUSE_CLIENT --query "SELECT file_segment_range, read_type FROM system.filesystem_cache_log WHERE query_id = (SELECT query_id from system.query_log where query LIKE '%SELECT 2242%$STORAGE_POLICY%' AND current_database = currentDatabase() AND type = 'QueryFinish' ORDER BY event_time desc LIMIT 1) ORDER BY file_segment_range, read_type"
echo '----'
$CLICKHOUSE_CLIENT --enable_filesystem_cache_on_write_operations=0 --enable_filesystem_cache_log=1 --query "SELECT 2243, '$STORAGE_POLICY', * FROM test_2242 FORMAT Null"
$CLICKHOUSE_CLIENT --query "SYSTEM FLUSH LOGS"
$CLICKHOUSE_CLIENT --query "SELECT file_segment_range, read_type FROM system.filesystem_cache_log WHERE query_id = (SELECT query_id from system.query_log where query LIKE '%SELECT 2243%$STORAGE_POLICY%' AND current_database = currentDatabase() AND type = 'QueryFinish' ORDER BY event_time desc LIMIT 1) ORDER BY file_segment_range, read_type"
echo '----'
done