From be11b484070c1ecf2b48d20e98f333b293c2c8a5 Mon Sep 17 00:00:00 2001 From: Kaijie Chen Date: Tue, 10 Oct 2023 22:33:50 +0800 Subject: [PATCH] [fix](load) fix MemTableWriter::active_memtable_mem_consumption (#25207) --- be/src/olap/delta_writer_v2.cpp | 4 ---- be/src/olap/delta_writer_v2.h | 1 - be/src/olap/memtable_writer.cpp | 15 +-------------- 3 files changed, 1 insertion(+), 19 deletions(-) diff --git a/be/src/olap/delta_writer_v2.cpp b/be/src/olap/delta_writer_v2.cpp index 0be2e1751a..039ad71400 100644 --- a/be/src/olap/delta_writer_v2.cpp +++ b/be/src/olap/delta_writer_v2.cpp @@ -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; } diff --git a/be/src/olap/delta_writer_v2.h b/be/src/olap/delta_writer_v2.h index 741d939fa8..0f8d21a19b 100644 --- a/be/src/olap/delta_writer_v2.h +++ b/be/src/olap/delta_writer_v2.h @@ -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; } diff --git a/be/src/olap/memtable_writer.cpp b/be/src/olap/memtable_writer.cpp index 955a961f0a..4013f7fda9 100644 --- a/be/src/olap/memtable_writer.cpp +++ b/be/src/olap/memtable_writer.cpp @@ -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 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