database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[fix](load) fix MemTableWriter::active_memtable_mem_consumption (#25207)

Browse Source
This commit is contained in:
Kaijie Chen
2023-10-10 22:33:50 +08:00
committed by GitHub
parent fb3b888ff1
commit be11b48407
3 changed files with 1 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
be/src/olap/delta_writer_v2.cpp
View File

@ -196,10 +196,6 @@ int64_t DeltaWriterV2::mem_consumption(MemType mem) {
return _memtable_writer->mem_consumption(mem);
}
int64_t DeltaWriterV2::active_memtable_mem_consumption() {
return _memtable_writer->active_memtable_mem_consumption();
}
int64_t DeltaWriterV2::partition_id() const {
return _req.partition_id;
}

1
be/src/olap/delta_writer_v2.h
View File

@ -89,7 +89,6 @@ public:
int64_t partition_id() const;
int64_t mem_consumption(MemType mem);
int64_t active_memtable_mem_consumption();
int64_t tablet_id() { return _req.tablet_id; }

15
be/src/olap/memtable_writer.cpp
View File

@ -354,20 +354,7 @@ int64_t MemTableWriter::mem_consumption(MemType mem) {
}
int64_t MemTableWriter::active_memtable_mem_consumption() {
if (_flush_token == nullptr) {
// This method may be called before this writer is initialized.
// So _flush_token may be null.
return 0;
}
int64_t mem_usage = 0;
{
std::lock_guard<SpinLock> l(_mem_table_tracker_lock);
if (_mem_table_insert_trackers.size() > 0) {
mem_usage += (*_mem_table_insert_trackers.rbegin())->consumption();
mem_usage += (*_mem_table_flush_trackers.rbegin())->consumption();
}
}
return mem_usage;
return _mem_table != nullptr ? _mem_table->memory_usage() : 0;
}
} // namespace doris