From d71b0650b4e9ef0eea0690febed74c30bbad6429 Mon Sep 17 00:00:00 2001 From: Kaijie Chen Date: Tue, 4 Mar 2025 20:04:07 +0800 Subject: [PATCH] [fix](memtable) revert #47860 and fix #47610 (#48489) ### What problem does this PR solve? Issue Number: DORIS-18927 Related PR: #47860 and #47610 --- be/src/olap/memtable_writer.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/be/src/olap/memtable_writer.cpp b/be/src/olap/memtable_writer.cpp index 14b656b230fae7..3dc88ae668f20f 100644 --- a/be/src/olap/memtable_writer.cpp +++ b/be/src/olap/memtable_writer.cpp @@ -126,7 +126,7 @@ Status MemTableWriter::write(const vectorized::Block* block, // thus preventing potential crashes if (!st.ok()) [[unlikely]] { std::lock_guard l(_mem_table_ptr_lock); - _mem_table.reset(); + _reset_mem_table(); return st; } @@ -180,11 +180,6 @@ Status MemTableWriter::flush_async() { return _cancel_status; } - // _mem_table may be null after write failure triggers reset - if (_mem_table == nullptr) { - return Status::OK(); - } - VLOG_NOTICE << "flush memtable to reduce mem consumption. memtable size: " << _mem_table->memory_usage() << ", tablet: " << _req.tablet_id << ", load id: " << print_id(_req.load_id);