You've already forked mariadb-columnstore-engine
mirror of
https://github.com/mariadb-corporation/mariadb-columnstore-engine.git
synced 2025-07-30 19:23:07 +03:00
chore(): merge cleanup
This commit is contained in:
@ -609,7 +609,6 @@ class Row
|
||||
}
|
||||
|
||||
const CHARSET_INFO* getCharset(uint32_t col) const;
|
||||
inline bool inStringTable(uint32_t col) const;
|
||||
|
||||
private:
|
||||
inline bool inStringTable(uint32_t col) const;
|
||||
|
@ -52,7 +52,7 @@ class ReservablePQ : private std::priority_queue<_Tp, _Sequence, _Compare>
|
||||
{
|
||||
public:
|
||||
typedef typename std::priority_queue<_Tp, _Sequence, _Compare>::size_type size_type;
|
||||
explicit explicit ReservablePQ(size_type capacity, std::atomic<int64_t>* memoryLimit,
|
||||
explicit ReservablePQ(size_type capacity, std::atomic<int64_t>* memoryLimit,
|
||||
const int64_t checkPointStepSize = allocators::CheckPointStepSize,
|
||||
const int64_t lowerBound = allocators::MemoryLimitLowerBound)
|
||||
: std::priority_queue<_Tp, _Sequence, _Compare>(_Compare(),
|
||||
|
Reference in New Issue
Block a user