From b17d93c39ce4cb7c8280f8790084a40a83cd852f Mon Sep 17 00:00:00 2001 From: Yukang-Lian Date: Tue, 12 Nov 2024 16:24:51 +0800 Subject: [PATCH] 2 --- be/src/cloud/cloud_cumulative_compaction.cpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/be/src/cloud/cloud_cumulative_compaction.cpp b/be/src/cloud/cloud_cumulative_compaction.cpp index 47c440f8ed3285b..10b4cb9ea75d1aa 100644 --- a/be/src/cloud/cloud_cumulative_compaction.cpp +++ b/be/src/cloud/cloud_cumulative_compaction.cpp @@ -85,16 +85,14 @@ Status CloudCumulativeCompaction::prepare_compact() { // pick rowsets to compact auto st = pick_rowsets_to_compact(); - if (!st.ok()) { - if (tried == 0 && _last_delete_version.first != -1) { - // we meet a delete version, should increase the cumulative point to let base compaction handle the delete version. - // plus 1 to skip the delete version. - // NOTICE: after that, the cumulative point may be larger than max version of this tablet, but it doesn't matter. - update_cumulative_point(); - return Status::OK(); - } - return st; + if (tried == 0 && _last_delete_version.first != -1) { + // we meet a delete version, should increase the cumulative point to let base compaction handle the delete version. + // plus 1 to skip the delete version. + // NOTICE: after that, the cumulative point may be larger than max version of this tablet, but it doesn't matter. + update_cumulative_point(); + st = Status::OK(); } + RETURN_IF_ERROR(st); // prepare compaction job cloud::TabletJobInfoPB job;