2727#include " cloud/cloud_meta_mgr.h"
2828#include " cloud/cloud_tablet_mgr.h"
2929#include " common/status.h"
30+ #include " olap/base_tablet.h"
3031#include " olap/delete_handler.h"
3132#include " olap/olap_define.h"
3233#include " olap/rowset/beta_rowset.h"
@@ -179,7 +180,7 @@ Status CloudSchemaChangeJob::process_alter_tablet(const TAlterTabletReqV2& reque
179180 reader_context.sequence_id_idx = reader_context.tablet_schema ->sequence_col_idx ();
180181 reader_context.is_unique = _base_tablet->keys_type () == UNIQUE_KEYS ;
181182 reader_context.batch_size = ALTER_TABLE_BATCH_SIZE ;
182- reader_context.delete_bitmap = & _base_tablet->tablet_meta ()->delete_bitmap ();
183+ reader_context.delete_bitmap = _base_tablet->tablet_meta ()->delete_bitmap ();
183184 reader_context.version = Version (0 , start_resp.alter_version ());
184185
185186 for (auto & split : rs_splits) {
@@ -450,7 +451,7 @@ Status CloudSchemaChangeJob::_process_delete_bitmap(int64_t alter_version,
450451 .tag (" alter_version" , alter_version);
451452 RETURN_IF_ERROR (_cloud_storage_engine.register_compaction_stop_token (_new_tablet, initiator));
452453 TabletMetaSharedPtr tmp_meta = std::make_shared<TabletMeta>(*(_new_tablet->tablet_meta ()));
453- tmp_meta->delete_bitmap (). delete_bitmap .clear ();
454+ tmp_meta->delete_bitmap ()-> delete_bitmap .clear ();
454455 std::shared_ptr<CloudTablet> tmp_tablet =
455456 std::make_shared<CloudTablet>(_cloud_storage_engine, tmp_meta);
456457 {
@@ -459,22 +460,21 @@ Status CloudSchemaChangeJob::_process_delete_bitmap(int64_t alter_version,
459460 }
460461
461462 // step 1, process incremental rowset without delete bitmap update lock
462- std::vector<RowsetSharedPtr> incremental_rowsets;
463463 RETURN_IF_ERROR (_cloud_storage_engine.meta_mgr ().sync_tablet_rowsets (tmp_tablet.get ()));
464464 int64_t max_version = tmp_tablet->max_version ().second ;
465465 LOG (INFO ) << " alter table for mow table, calculate delete bitmap of "
466466 << " incremental rowsets without lock, version: " << start_calc_delete_bitmap_version
467467 << " -" << max_version << " new_table_id: " << _new_tablet->tablet_id ();
468468 if (max_version >= start_calc_delete_bitmap_version) {
469- RETURN_IF_ERROR (tmp_tablet->capture_consistent_rowsets_unlocked (
470- {start_calc_delete_bitmap_version, max_version}, &incremental_rowsets ));
469+ auto ret = DORIS_TRY (tmp_tablet->capture_consistent_rowsets_unlocked (
470+ {start_calc_delete_bitmap_version, max_version}, CaptureRowsetOps {} ));
471471 DBUG_EXECUTE_IF (" CloudSchemaChangeJob::_process_delete_bitmap.after.capture_without_lock" ,
472472 DBUG_BLOCK );
473473 {
474474 std::unique_lock wlock (tmp_tablet->get_header_lock ());
475475 tmp_tablet->add_rowsets (_output_rowsets, true , wlock);
476476 }
477- for (auto rowset : incremental_rowsets ) {
477+ for (auto rowset : ret. rowsets ) {
478478 RETURN_IF_ERROR (CloudTablet::update_delete_bitmap_without_lock (tmp_tablet, rowset));
479479 }
480480 }
@@ -490,15 +490,14 @@ Status CloudSchemaChangeJob::_process_delete_bitmap(int64_t alter_version,
490490 LOG (INFO ) << " alter table for mow table, calculate delete bitmap of "
491491 << " incremental rowsets with lock, version: " << max_version + 1 << " -"
492492 << new_max_version << " new_tablet_id: " << _new_tablet->tablet_id ();
493- std::vector<RowsetSharedPtr> new_incremental_rowsets;
494493 if (new_max_version > max_version) {
495- RETURN_IF_ERROR (tmp_tablet->capture_consistent_rowsets_unlocked (
496- {max_version + 1 , new_max_version}, &new_incremental_rowsets ));
494+ auto ret = DORIS_TRY (tmp_tablet->capture_consistent_rowsets_unlocked (
495+ {max_version + 1 , new_max_version}, CaptureRowsetOps {} ));
497496 {
498497 std::unique_lock wlock (tmp_tablet->get_header_lock ());
499498 tmp_tablet->add_rowsets (_output_rowsets, true , wlock);
500499 }
501- for (auto rowset : new_incremental_rowsets ) {
500+ for (auto rowset : ret. rowsets ) {
502501 RETURN_IF_ERROR (CloudTablet::update_delete_bitmap_without_lock (tmp_tablet, rowset));
503502 }
504503 }
@@ -515,13 +514,14 @@ Status CloudSchemaChangeJob::_process_delete_bitmap(int64_t alter_version,
515514 }
516515 });
517516
518- auto & delete_bitmap = tmp_tablet->tablet_meta ()->delete_bitmap ();
517+ auto delete_bitmap = tmp_tablet->tablet_meta ()->delete_bitmap ();
519518
520519 // step4, store delete bitmap
521520 RETURN_IF_ERROR (_cloud_storage_engine.meta_mgr ().update_delete_bitmap (
522- *_new_tablet, SCHEMA_CHANGE_DELETE_BITMAP_LOCK_ID , initiator, & delete_bitmap));
521+ *_new_tablet, SCHEMA_CHANGE_DELETE_BITMAP_LOCK_ID , initiator, delete_bitmap. get () ));
523522
524- _new_tablet->tablet_meta ()->delete_bitmap () = delete_bitmap;
523+ auto original_dbm = _new_tablet->tablet_meta ()->delete_bitmap ();
524+ *original_dbm = std::move (*delete_bitmap);
525525 return Status::OK ();
526526}
527527
0 commit comments