From 80d91c1936928b982075b3ed3ec0ed01221c82df 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 --- be/src/olap/delta_writer.cpp | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/be/src/olap/delta_writer.cpp b/be/src/olap/delta_writer.cpp index 2f77c031d2ee39..305550fb415706 100644 --- a/be/src/olap/delta_writer.cpp +++ b/be/src/olap/delta_writer.cpp @@ -626,20 +626,7 @@ int64_t DeltaWriter::mem_consumption(MemType mem) { } int64_t DeltaWriter::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; } int64_t DeltaWriter::partition_id() const {