morningman commented on a change in pull request #5516:
URL: https://github.com/apache/incubator-doris/pull/5516#discussion_r595944026
##########
File path: be/src/olap/schema_change.cpp
##########
@@ -710,26 +710,26 @@ bool RowBlockSorter::sort(RowBlock** row_block) {
return true;
}
-RowBlockAllocator::RowBlockAllocator(const TabletSchema& tablet_schema, size_t
memory_limitation)
+RowBlockAllocator::RowBlockAllocator(const TabletSchema& tablet_schema,
std::shared_ptr<MemTracker> parent, size_t memory_limitation)
: _tablet_schema(tablet_schema),
- _memory_allocated(0),
+ _mem_tracker(MemTracker::CreateTracker(-1, "RowBlockAllocator",
parent, false)),
_row_len(tablet_schema.row_size()),
_memory_limitation(memory_limitation) {
VLOG_NOTICE << "RowBlockAllocator(). row_len=" << _row_len;
}
RowBlockAllocator::~RowBlockAllocator() {
- if (_memory_allocated != 0) {
- LOG(WARNING) << "memory lost in RowBlockAllocator. memory_size=" <<
_memory_allocated;
+ if (_mem_tracker->consumption() != 0) {
+ LOG(WARNING) << "memory lost in RowBlockAllocator. memory_size=" <<
_mem_tracker->consumption();
}
}
OLAPStatus RowBlockAllocator::allocate(RowBlock** row_block, size_t num_rows,
bool null_supported) {
size_t row_block_size = _row_len * num_rows;
- if (_memory_limitation > 0 && _memory_allocated + row_block_size >
_memory_limitation) {
+ if (_memory_limitation > 0 && _mem_tracker->consumption() + row_block_size
> _memory_limitation) {
VLOG_NOTICE << "RowBlockAllocator::alocate() memory exceeded. "
Review comment:
Change it to LOG(WARNING)
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
