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

Merge pull request #13491 from ClickHouse/aku/podarray

Browse Source 
Avoid overallocation in PODArray assignment
This commit is contained in:
alexey-milovidov 2020-08-09 01:41:47 +03:00 committed by GitHub
commit 8e3f8aa0ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Common/PODArray.h
View File

@ -220,6 +220,13 @@ public:
realloc(roundUpToPowerOfTwoOrZero(minimum_memory_for_elements(n)), std::forward<TAllocatorParams>(allocator_params)...); realloc(roundUpToPowerOfTwoOrZero(minimum_memory_for_elements(n)), std::forward<TAllocatorParams>(allocator_params)...);
} }
template <typename ... TAllocatorParams>
void reserve_exact(size_t n, TAllocatorParams &&... allocator_params)
{
if (n > capacity())
realloc(minimum_memory_for_elements(n), std::forward<TAllocatorParams>(allocator_params)...);
}
template <typename ... TAllocatorParams> template <typename ... TAllocatorParams>
void resize(size_t n, TAllocatorParams &&... allocator_params) void resize(size_t n, TAllocatorParams &&... allocator_params)
{ {
@ -227,6 +234,13 @@ public:
resize_assume_reserved(n); resize_assume_reserved(n);
} }
template <typename ... TAllocatorParams>
void resize_exact(size_t n, TAllocatorParams &&... allocator_params)
{
reserve_exact(n, std::forward<TAllocatorParams>(allocator_params)...);
resize_assume_reserved(n);
}
void resize_assume_reserved(const size_t n) void resize_assume_reserved(const size_t n)
{ {
c_end = c_start + byte_size(n); c_end = c_start + byte_size(n);
@ -601,7 +615,7 @@ public:
template <typename... TAllocatorParams> template <typename... TAllocatorParams>
void assign(size_t n, const T & x, TAllocatorParams &&... allocator_params) void assign(size_t n, const T & x, TAllocatorParams &&... allocator_params)
{ {
this->resize(n, std::forward<TAllocatorParams>(allocator_params)...); this->resize_exact(n, std::forward<TAllocatorParams>(allocator_params)...);
std::fill(begin(), end(), x); std::fill(begin(), end(), x);
} }
@ -612,7 +626,7 @@ public:
size_t required_capacity = from_end - from_begin; size_t required_capacity = from_end - from_begin;
if (required_capacity > this->capacity()) if (required_capacity > this->capacity())
this->reserve(roundUpToPowerOfTwoOrZero(required_capacity), std::forward<TAllocatorParams>(allocator_params)...); this->reserve_exact(required_capacity, std::forward<TAllocatorParams>(allocator_params)...);
size_t bytes_to_copy = this->byte_size(required_capacity); size_t bytes_to_copy = this->byte_size(required_capacity);
memcpy(this->c_start, reinterpret_cast<const void *>(&*from_begin), bytes_to_copy); memcpy(this->c_start, reinterpret_cast<const void *>(&*from_begin), bytes_to_copy);