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

fix

Browse Source
This commit is contained in:
vdimir 2023-09-14 12:58:35 +00:00
parent 40d42f4123
commit 01ee24eefa
No known key found for this signature in database
GPG Key ID: 6EE4CE2BEDC51862
1 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/Interpreters/HashJoin.cpp
View File

@ -921,32 +921,34 @@ void HashJoin::shrinkStoredBlocksToFit(size_t & total_bytes_in_join)
* is bigger than half of all memory available for query, * is bigger than half of all memory available for query,
* then shrink stored blocks to fit. * then shrink stored blocks to fit.
*/ */
if ((max_total_bytes_in_join && total_bytes_in_join > max_total_bytes_in_join / 2) || shrink_blocks = (max_total_bytes_in_join && total_bytes_in_join > max_total_bytes_in_join / 2) ||
(max_total_bytes_for_query && query_memory_usage_delta > max_total_bytes_for_query / 2)) (max_total_bytes_for_query && query_memory_usage_delta > max_total_bytes_for_query / 2);
{ if (!shrink_blocks)
shrink_blocks = true; return;
LOG_DEBUG(log, "Shrinking stored blocks, memory consumption is {} / {} caclulated by join, {} / {} by memory tracker",
ReadableSize(total_bytes_in_join), ReadableSize(max_total_bytes_in_join),
ReadableSize(query_memory_usage_delta), ReadableSize(max_total_bytes_for_query));
for (auto & stored_block : data->blocks)
{
size_t old_size = stored_block.allocatedBytes();
stored_block = stored_block.shrinkToFit();
size_t new_size = stored_block.allocatedBytes();
chassert(old_size >= new_size);
data->blocks_allocated_size -= old_size - new_size;
}
auto new_total_bytes_in_join = getTotalByteCount();
Int64 new_current_memory_usage = getCurrentQueryMemoryUsage();
size_t total_bytes_delta = total_bytes_in_join - new_total_bytes_in_join; LOG_DEBUG(log, "Shrinking stored blocks, memory consumption is {} {} calculated by join, {} {} by memory tracker",
chassert(new_total_bytes_in_join <= total_bytes_in_join); ReadableSize(total_bytes_in_join), max_total_bytes_in_join ? fmt::format("/ {}", ReadableSize(max_total_bytes_in_join)) : "",
LOG_DEBUG(log, "Shrunk stored blocks {} freed ({} by memory tracker), new memory consumption is {} ({} by memory tracker)", ReadableSize(query_memory_usage_delta), max_total_bytes_for_query ? fmt::format("/ {}", ReadableSize(max_total_bytes_for_query)) : "");
ReadableSize(total_bytes_delta), ReadableSize(new_current_memory_usage - current_memory_usage),
ReadableSize(new_total_bytes_in_join), ReadableSize(new_current_memory_usage)); for (auto & stored_block : data->blocks)
total_bytes_in_join = new_total_bytes_in_join; {
size_t old_size = stored_block.allocatedBytes();
stored_block = stored_block.shrinkToFit();
size_t new_size = stored_block.allocatedBytes();
chassert(old_size >= new_size);
data->blocks_allocated_size -= old_size - new_size;
} }
auto new_total_bytes_in_join = getTotalByteCount();
chassert(new_total_bytes_in_join <= total_bytes_in_join);
Int64 new_current_memory_usage = getCurrentQueryMemoryUsage();
LOG_DEBUG(log, "Shrunk stored blocks {} freed ({} by memory tracker), new memory consumption is {} ({} by memory tracker)",
ReadableSize(total_bytes_in_join - new_total_bytes_in_join), ReadableSize(current_memory_usage - new_current_memory_usage),
ReadableSize(new_total_bytes_in_join), ReadableSize(new_current_memory_usage));
total_bytes_in_join = new_total_bytes_in_join;
} }