Skip to content

Commit 413bc94

Browse files
committed
tmp
1 parent 59b268a commit 413bc94

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

be/src/olap/compaction.cpp

+7-6
Original file line numberDiff line numberDiff line change
@@ -1274,12 +1274,6 @@ Status CompactionMixin::modify_rowsets() {
12741274
}
12751275

12761276
tablet()->merge_delete_bitmap(output_rowset_delete_bitmap);
1277-
if (config::enable_delete_bitmap_merge_on_compaction &&
1278-
compaction_type() == ReaderType::READER_CUMULATIVE_COMPACTION &&
1279-
_tablet->keys_type() == KeysType::UNIQUE_KEYS &&
1280-
_tablet->enable_unique_key_merge_on_write() && _input_rowsets.size() != 1) {
1281-
process_old_version_delete_bitmap();
1282-
}
12831277
RETURN_IF_ERROR(tablet()->modify_rowsets(output_rowsets, _input_rowsets, true));
12841278
}
12851279
} else {
@@ -1294,6 +1288,13 @@ Status CompactionMixin::modify_rowsets() {
12941288
tablet()->delete_expired_stale_rowset();
12951289
}
12961290

1291+
if (config::enable_delete_bitmap_merge_on_compaction &&
1292+
compaction_type() == ReaderType::READER_CUMULATIVE_COMPACTION &&
1293+
_tablet->keys_type() == KeysType::UNIQUE_KEYS &&
1294+
_tablet->enable_unique_key_merge_on_write() && _input_rowsets.size() != 1) {
1295+
process_old_version_delete_bitmap();
1296+
}
1297+
12971298
int64_t cur_max_version = 0;
12981299
{
12991300
std::shared_lock rlock(_tablet->get_header_lock());

0 commit comments

Comments
 (0)