database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-06-15 03:21:42 +03:00
Code Activity

chore(): re-enabled memory accounting for RGData generated by PP::execute()

Browse Source
This commit is contained in:
drrtuy
2025-04-29 19:30:24 +00:00
parent f5494ad7a2
commit d4fe2e7a45
3 changed files with 5 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
primitives/primproc/batchprimitiveprocessor.cpp
View File

@ -2287,34 +2287,29 @@ int BatchPrimitiveProcessor::operator()()
void BatchPrimitiveProcessor::allocLargeBuffers() void BatchPrimitiveProcessor::allocLargeBuffers()
{ {
// auto allocator = exemgr::globServiceExeMgr->getRm().getAllocator<rowgroup::RGDataBufType>(); auto allocator = exemgr::globServiceExeMgr->getRm().getAllocator<rowgroup::RGDataBufType>();
if (ot == ROW_GROUP && !outRowGroupData) if (ot == ROW_GROUP && !outRowGroupData)
{ {
// outputRG.setUseStringTable(true); outRowGroupData.reset(new RGData(outputRG, allocator));
// outRowGroupData.reset(new RGData(outputRG, allocator));
outRowGroupData.reset(new RGData(outputRG));
outputRG.setData(outRowGroupData.get()); outputRG.setData(outRowGroupData.get());
} }
if (fe1 && !fe1Data) if (fe1 && !fe1Data)
{ {
// fe1Data.reset(new RGData(fe1Input, allocator)); fe1Data.reset(new RGData(fe1Input, allocator));
fe1Data.reset(new RGData(fe1Input));
fe1Input.setData(fe1Data.get()); fe1Input.setData(fe1Data.get());
} }
if (fe2 && !fe2Data) if (fe2 && !fe2Data)
{ {
// fe2Data.reset(new RGData(fe2Output, allocator)); fe2Data.reset(new RGData(fe2Output, allocator));
fe2Data.reset(new RGData(fe2Output));
fe2Output.setData(fe2Data.get()); fe2Output.setData(fe2Data.get());
} }
if (getTupleJoinRowGroupData && !joinedRGMem) if (getTupleJoinRowGroupData && !joinedRGMem)
{ {
// joinedRGMem.reset(new RGData(joinedRG, allocator)); joinedRGMem.reset(new RGData(joinedRG, allocator));
joinedRGMem.reset(new RGData(joinedRG));
joinedRG.setData(joinedRGMem.get()); joinedRG.setData(joinedRGMem.get());
} }
} }

2
utils/joiner/tuplejoiner.h
View File

@ -207,8 +207,6 @@ class TypelessDataStructure
using RowPointersVec = using RowPointersVec =
std::vector<rowgroup::Row::Pointer, allocators::CountingAllocator<rowgroup::Row::Pointer>>; std::vector<rowgroup::Row::Pointer, allocators::CountingAllocator<rowgroup::Row::Pointer>>;
// using RowPointersVec =
// std::vector<rowgroup::Row::Pointer>;
using RowPointersVecUP = std::unique_ptr<RowPointersVec>; using RowPointersVecUP = std::unique_ptr<RowPointersVec>;
class TupleJoiner class TupleJoiner
{ {

25
utils/windowfunction/idborderby.h
View File

@ -81,31 +81,6 @@ class ReservablePQ : private std::priority_queue<_Tp, _Sequence, _Compare>
using std::priority_queue<_Tp, _Sequence, _Compare>::empty; using std::priority_queue<_Tp, _Sequence, _Compare>::empty;
}; };
// template <typename _Tp, typename _Sequence = std::vector<_Tp>,
// typename _Compare = std::less<typename _Sequence::value_type> >
// class ReservablePQ : private std::priority_queue<_Tp, _Sequence, _Compare>
// {
// public:
// typedef typename std::priority_queue<_Tp, _Sequence, _Compare>::size_type size_type;
// explicit ReservablePQ(size_type capacity = 0)
// {
// reserve(capacity);
// };
// void reserve(size_type capacity)
// {
// this->c.reserve(capacity);
// }
// size_type capacity() const
// {
// return this->c.capacity();
// }
// using std::priority_queue<_Tp, _Sequence, _Compare>::size;
// using std::priority_queue<_Tp, _Sequence, _Compare>::top;
// using std::priority_queue<_Tp, _Sequence, _Compare>::pop;
// using std::priority_queue<_Tp, _Sequence, _Compare>::push;
// using std::priority_queue<_Tp, _Sequence, _Compare>::empty;
// };
// forward reference // forward reference
class IdbCompare; class IdbCompare;
class OrderByRow; class OrderByRow;