[improvement](merge-on-write) move segment check to delta writer (apa…

…che#18643)

be/src/olap/delta_writer.cpp

@@ -23,6 +23,7 @@
 #include "olap/data_dir.h"
 #include "olap/memtable.h"
 #include "olap/memtable_flush_executor.h"
+#include "olap/rowset/beta_rowset.h"
 #include "olap/rowset/beta_rowset_writer.h"
 #include "olap/rowset/rowset_writer_context.h"
 #include "olap/schema.h"
@@ -396,6 +397,16 @@ Status DeltaWriter::close_wait(const PSlaveTabletNodes& slave_tablet_nodes,
  return res;
  }
  if (_tablet->enable_unique_key_merge_on_write()) {
+ auto beta_rowset = reinterpret_cast<BetaRowset*>(_cur_rowset.get());
+ std::vector<segment_v2::SegmentSharedPtr> segments;
+ RETURN_IF_ERROR(beta_rowset->load_segments(&segments));
+ // tablet is under alter process. The delete bitmap will be calculated after conversion.
+ if (_tablet->tablet_state() == TABLET_NOTREADY &&
+ SchemaChangeHandler::tablet_in_converting(_tablet->tablet_id())) {
+ return Status::OK();
+ }
+ RETURN_IF_ERROR(_tablet->calc_delete_bitmap(beta_rowset->rowset_id(), segments, nullptr,
+ _delete_bitmap, _cur_max_version, true));
  _storage_engine->txn_manager()->set_txn_related_delete_bitmap(
  _req.partition_id, _req.txn_id, _tablet->tablet_id(), _tablet->schema_hash(),
  _tablet->tablet_uid(), true, _delete_bitmap, _rowset_ids);

be/src/olap/tablet.cpp

@@ -2242,7 +2242,7 @@ Status Tablet::update_delete_bitmap(const RowsetSharedPtr& rowset, const TabletT
  }
 
  RETURN_IF_ERROR(calc_delete_bitmap(rowset->rowset_id(), segments, &rowset_ids_to_add,
- delete_bitmap, cur_version - 1, true));
+ delete_bitmap, cur_version - 1, false));
 
  // update version without write lock, compaction and publish_txn
  // will update delete bitmap, handle compaction with _rowset_update_lock