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"
@@ -168,7 +169,7 @@ Status CloudSchemaChangeJob::process_alter_tablet(const TAlterTabletReqV2& reque
168169 reader_context.sequence_id_idx = reader_context.tablet_schema ->sequence_col_idx ();
169170 reader_context.is_unique = _base_tablet->keys_type () == UNIQUE_KEYS ;
170171 reader_context.batch_size = ALTER_TABLE_BATCH_SIZE ;
171- reader_context.delete_bitmap = & _base_tablet->tablet_meta ()->delete_bitmap ();
172+ reader_context.delete_bitmap = _base_tablet->tablet_meta ()->delete_bitmap ();
172173 reader_context.version = Version (0 , start_resp.alter_version ());
173174
174175 for (auto & split : rs_splits) {
@@ -436,7 +437,7 @@ Status CloudSchemaChangeJob::_process_delete_bitmap(int64_t alter_version,
436437 .tag (" alter_version" , alter_version);
437438 RETURN_IF_ERROR (_cloud_storage_engine.register_compaction_stop_token (_new_tablet, initiator));
438439 TabletMetaSharedPtr tmp_meta = std::make_shared<TabletMeta>(*(_new_tablet->tablet_meta ()));
439- tmp_meta->delete_bitmap (). delete_bitmap .clear ();
440+ tmp_meta->delete_bitmap ()-> delete_bitmap .clear ();
440441 std::shared_ptr<CloudTablet> tmp_tablet =
441442 std::make_shared<CloudTablet>(_cloud_storage_engine, tmp_meta);
442443 {
@@ -445,22 +446,21 @@ Status CloudSchemaChangeJob::_process_delete_bitmap(int64_t alter_version,
445446 }
446447
447448 // step 1, process incremental rowset without delete bitmap update lock
448- std::vector<RowsetSharedPtr> incremental_rowsets;
449449 RETURN_IF_ERROR (_cloud_storage_engine.meta_mgr ().sync_tablet_rowsets (tmp_tablet.get ()));
450450 int64_t max_version = tmp_tablet->max_version ().second ;
451451 LOG (INFO ) << " alter table for mow table, calculate delete bitmap of "
452452 << " incremental rowsets without lock, version: " << start_calc_delete_bitmap_version
453453 << " -" << max_version << " new_table_id: " << _new_tablet->tablet_id ();
454454 if (max_version >= start_calc_delete_bitmap_version) {
455- RETURN_IF_ERROR (tmp_tablet->capture_consistent_rowsets_unlocked (
456- {start_calc_delete_bitmap_version, max_version}, &incremental_rowsets ));
455+ auto ret = DORIS_TRY (tmp_tablet->capture_consistent_rowsets_unlocked (
456+ {start_calc_delete_bitmap_version, max_version}, CaptureRowsetOps {} ));
457457 DBUG_EXECUTE_IF (" CloudSchemaChangeJob::_process_delete_bitmap.after.capture_without_lock" ,
458458 DBUG_BLOCK );
459459 {
460460 std::unique_lock wlock (tmp_tablet->get_header_lock ());
461461 tmp_tablet->add_rowsets (_output_rowsets, true , wlock);
462462 }
463- for (auto rowset : incremental_rowsets ) {
463+ for (auto rowset : ret. rowsets ) {
464464 RETURN_IF_ERROR (CloudTablet::update_delete_bitmap_without_lock (tmp_tablet, rowset));
465465 }
466466 }
@@ -476,15 +476,14 @@ Status CloudSchemaChangeJob::_process_delete_bitmap(int64_t alter_version,
476476 LOG (INFO ) << " alter table for mow table, calculate delete bitmap of "
477477 << " incremental rowsets with lock, version: " << max_version + 1 << " -"
478478 << new_max_version << " new_tablet_id: " << _new_tablet->tablet_id ();
479- std::vector<RowsetSharedPtr> new_incremental_rowsets;
480479 if (new_max_version > max_version) {
481- RETURN_IF_ERROR (tmp_tablet->capture_consistent_rowsets_unlocked (
482- {max_version + 1 , new_max_version}, &new_incremental_rowsets ));
480+ auto ret = DORIS_TRY (tmp_tablet->capture_consistent_rowsets_unlocked (
481+ {max_version + 1 , new_max_version}, CaptureRowsetOps {} ));
483482 {
484483 std::unique_lock wlock (tmp_tablet->get_header_lock ());
485484 tmp_tablet->add_rowsets (_output_rowsets, true , wlock);
486485 }
487- for (auto rowset : new_incremental_rowsets ) {
486+ for (auto rowset : ret. rowsets ) {
488487 RETURN_IF_ERROR (CloudTablet::update_delete_bitmap_without_lock (tmp_tablet, rowset));
489488 }
490489 }
@@ -501,13 +500,14 @@ Status CloudSchemaChangeJob::_process_delete_bitmap(int64_t alter_version,
501500 }
502501 });
503502
504- auto & delete_bitmap = tmp_tablet->tablet_meta ()->delete_bitmap ();
503+ auto delete_bitmap = tmp_tablet->tablet_meta ()->delete_bitmap ();
505504
506505 // step4, store delete bitmap
507506 RETURN_IF_ERROR (_cloud_storage_engine.meta_mgr ().update_delete_bitmap (
508- *_new_tablet, SCHEMA_CHANGE_DELETE_BITMAP_LOCK_ID , initiator, & delete_bitmap));
507+ *_new_tablet, SCHEMA_CHANGE_DELETE_BITMAP_LOCK_ID , initiator, delete_bitmap. get () ));
509508
510- _new_tablet->tablet_meta ()->delete_bitmap () = delete_bitmap;
509+ auto original_dbm = _new_tablet->tablet_meta ()->delete_bitmap ();
510+ *original_dbm = std::move (*delete_bitmap);
511511 return Status::OK ();
512512}
513513
0 commit comments