From 0bb9cb4819b458b49799227f00441e3e74e98488 Mon Sep 17 00:00:00 2001 From: hongyunyan <649330952@qq.com> Date: Wed, 8 Feb 2023 12:41:58 +0800 Subject: [PATCH] Fix new segment check in gcTrySegmentMergeDelta/gcTrySegmentMerge (#6774) close pingcap/tiflash#6775 --- dbms/src/Storages/DeltaMerge/DeltaMergeStore_InternalBg.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dbms/src/Storages/DeltaMerge/DeltaMergeStore_InternalBg.cpp b/dbms/src/Storages/DeltaMerge/DeltaMergeStore_InternalBg.cpp index 4f3f3503a63..94fcbdffa0c 100644 --- a/dbms/src/Storages/DeltaMerge/DeltaMergeStore_InternalBg.cpp +++ b/dbms/src/Storages/DeltaMerge/DeltaMergeStore_InternalBg.cpp @@ -595,7 +595,7 @@ SegmentPtr DeltaMergeStore::gcTrySegmentMerge(const DMContextPtr & dm_context, c auto new_segment = segmentMerge(*dm_context, segments_to_merge, SegmentMergeReason::BackgroundGCThread); if (new_segment) { - checkSegmentUpdate(dm_context, segment, ThreadType::BG_GC); + checkSegmentUpdate(dm_context, new_segment, ThreadType::BG_GC); } return new_segment; @@ -718,7 +718,7 @@ SegmentPtr DeltaMergeStore::gcTrySegmentMergeDelta(const DMContextPtr & dm_conte } segment_snap = {}; - checkSegmentUpdate(dm_context, segment, ThreadType::BG_GC); + checkSegmentUpdate(dm_context, new_segment, ThreadType::BG_GC); return new_segment; }