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

Fixed PODArray

Browse Source
This commit is contained in:
Maksim Kita 2021-03-09 14:14:31 +03:00
parent 9ed791fd30
commit 8dd52f087e
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Common/PODArray.h
View File

@ -166,17 +166,6 @@ protected:
return (stack_threshold > 0) && (allocated_bytes() <= stack_threshold); return (stack_threshold > 0) && (allocated_bytes() <= stack_threshold);
} }
bool shouldReserveForNextSizeBeforeInsert() const
{
/** end_of_storage = left_padding + (start + elements_size * ELEMENT_SIZE).
* end = start + elements_size * ELEMENT_SIZE
* We use end + ELEMENT_SIZE >= end_of_storage because it
* It is not safe to use end == end_of_storage here because left_padding
* is not always multiple of ELEMENT_SIZE.
*/
return (c_end + ELEMENT_SIZE) >= c_end_of_storage;
}
template <typename ... TAllocatorParams> template <typename ... TAllocatorParams>
void reserveForNextSize(TAllocatorParams &&... allocator_params) void reserveForNextSize(TAllocatorParams &&... allocator_params)
{ {
@ -441,7 +430,7 @@ public:
template <typename U, typename ... TAllocatorParams> template <typename U, typename ... TAllocatorParams>
void push_back(U && x, TAllocatorParams &&... allocator_params) void push_back(U && x, TAllocatorParams &&... allocator_params)
{ {
if (unlikely(this->shouldReserveForNextSizeBeforeInsert())) if (unlikely(this->c_end == this->c_end_of_storage))
this->reserveForNextSize(std::forward<TAllocatorParams>(allocator_params)...); this->reserveForNextSize(std::forward<TAllocatorParams>(allocator_params)...);
new (t_end()) T(std::forward<U>(x)); new (t_end()) T(std::forward<U>(x));
@ -454,7 +443,7 @@ public:
template <typename... Args> template <typename... Args>
void emplace_back(Args &&... args) void emplace_back(Args &&... args)
{ {
if (unlikely(this->shouldReserveForNextSizeBeforeInsert())) if (unlikely(this->c_end == this->c_end_of_storage))
this->reserveForNextSize(); this->reserveForNextSize();
new (t_end()) T(std::forward<Args>(args)...); new (t_end()) T(std::forward<Args>(args)...);