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"
@@ -172,7 +173,7 @@ Status CloudSchemaChangeJob::process_alter_tablet(const TAlterTabletReqV2& reque
172173 reader_context.sequence_id_idx = reader_context.tablet_schema ->sequence_col_idx ();
173174 reader_context.is_unique = _base_tablet->keys_type () == UNIQUE_KEYS ;
174175 reader_context.batch_size = ALTER_TABLE_BATCH_SIZE ;
175- reader_context.delete_bitmap = & _base_tablet->tablet_meta ()->delete_bitmap ();
176+ reader_context.delete_bitmap = _base_tablet->tablet_meta ()->delete_bitmap ();
176177 reader_context.version = Version (0 , start_resp.alter_version ());
177178
178179 for (auto & split : rs_splits) {
@@ -443,7 +444,7 @@ Status CloudSchemaChangeJob::_process_delete_bitmap(int64_t alter_version,
443444 .tag (" alter_version" , alter_version);
444445 RETURN_IF_ERROR (_cloud_storage_engine.register_compaction_stop_token (_new_tablet, initiator));
445446 TabletMetaSharedPtr tmp_meta = std::make_shared<TabletMeta>(*(_new_tablet->tablet_meta ()));
446- tmp_meta->delete_bitmap (). delete_bitmap .clear ();
447+ tmp_meta->delete_bitmap ()-> delete_bitmap .clear ();
447448 std::shared_ptr<CloudTablet> tmp_tablet =
448449 std::make_shared<CloudTablet>(_cloud_storage_engine, tmp_meta);
449450 {
@@ -452,22 +453,21 @@ Status CloudSchemaChangeJob::_process_delete_bitmap(int64_t alter_version,
452453 }
453454
454455 // step 1, process incremental rowset without delete bitmap update lock
455- std::vector<RowsetSharedPtr> incremental_rowsets;
456456 RETURN_IF_ERROR (_cloud_storage_engine.meta_mgr ().sync_tablet_rowsets (tmp_tablet.get ()));
457457 int64_t max_version = tmp_tablet->max_version ().second ;
458458 LOG (INFO ) << " alter table for mow table, calculate delete bitmap of "
459459 << " incremental rowsets without lock, version: " << start_calc_delete_bitmap_version
460460 << " -" << max_version << " new_table_id: " << _new_tablet->tablet_id ();
461461 if (max_version >= start_calc_delete_bitmap_version) {
462- RETURN_IF_ERROR (tmp_tablet->capture_consistent_rowsets_unlocked (
463- {start_calc_delete_bitmap_version, max_version}, &incremental_rowsets ));
462+ auto ret = DORIS_TRY (tmp_tablet->capture_consistent_rowsets_unlocked (
463+ {start_calc_delete_bitmap_version, max_version}, CaptureRowsetOps {} ));
464464 DBUG_EXECUTE_IF (" CloudSchemaChangeJob::_process_delete_bitmap.after.capture_without_lock" ,
465465 DBUG_BLOCK );
466466 {
467467 std::unique_lock wlock (tmp_tablet->get_header_lock ());
468468 tmp_tablet->add_rowsets (_output_rowsets, true , wlock);
469469 }
470- for (auto rowset : incremental_rowsets ) {
470+ for (auto rowset : ret. rowsets ) {
471471 RETURN_IF_ERROR (CloudTablet::update_delete_bitmap_without_lock (tmp_tablet, rowset));
472472 }
473473 }
@@ -483,15 +483,14 @@ Status CloudSchemaChangeJob::_process_delete_bitmap(int64_t alter_version,
483483 LOG (INFO ) << " alter table for mow table, calculate delete bitmap of "
484484 << " incremental rowsets with lock, version: " << max_version + 1 << " -"
485485 << new_max_version << " new_tablet_id: " << _new_tablet->tablet_id ();
486- std::vector<RowsetSharedPtr> new_incremental_rowsets;
487486 if (new_max_version > max_version) {
488- RETURN_IF_ERROR (tmp_tablet->capture_consistent_rowsets_unlocked (
489- {max_version + 1 , new_max_version}, &new_incremental_rowsets ));
487+ auto ret = DORIS_TRY (tmp_tablet->capture_consistent_rowsets_unlocked (
488+ {max_version + 1 , new_max_version}, CaptureRowsetOps {} ));
490489 {
491490 std::unique_lock wlock (tmp_tablet->get_header_lock ());
492491 tmp_tablet->add_rowsets (_output_rowsets, true , wlock);
493492 }
494- for (auto rowset : new_incremental_rowsets ) {
493+ for (auto rowset : ret. rowsets ) {
495494 RETURN_IF_ERROR (CloudTablet::update_delete_bitmap_without_lock (tmp_tablet, rowset));
496495 }
497496 }
@@ -508,13 +507,14 @@ Status CloudSchemaChangeJob::_process_delete_bitmap(int64_t alter_version,
508507 }
509508 });
510509
511- auto & delete_bitmap = tmp_tablet->tablet_meta ()->delete_bitmap ();
510+ auto delete_bitmap = tmp_tablet->tablet_meta ()->delete_bitmap ();
512511
513512 // step4, store delete bitmap
514513 RETURN_IF_ERROR (_cloud_storage_engine.meta_mgr ().update_delete_bitmap (
515- *_new_tablet, SCHEMA_CHANGE_DELETE_BITMAP_LOCK_ID , initiator, & delete_bitmap));
514+ *_new_tablet, SCHEMA_CHANGE_DELETE_BITMAP_LOCK_ID , initiator, delete_bitmap. get () ));
516515
517- _new_tablet->tablet_meta ()->delete_bitmap () = delete_bitmap;
516+ auto original_dbm = _new_tablet->tablet_meta ()->delete_bitmap ();
517+ *original_dbm = std::move (*delete_bitmap);
518518 return Status::OK ();
519519}
520520
0 commit comments