[opt](mow) merge delete bitmap when compaction

apache · Sep 30, 2024 · fccf06a · fccf06a
1 parent f6beec3
commit fccf06a
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 11 deletions.
diff --git a/be/src/olap/compaction.cpp b/be/src/olap/compaction.cpp
@@ -423,7 +423,7 @@ Status Compaction::do_compaction_impl(int64_t permits) {
         _tablet->calc_compaction_output_rowset_delete_bitmap(
                 _input_rowsets, _rowid_conversion, 0, version.second + 1, &missed_rows,
                 &location_map, _tablet->tablet_meta()->delete_bitmap(),
-                &output_rowset_delete_bitmap);
+                &output_rowset_delete_bitmap, _output_version.second);
         if (!allow_delete_in_cumu_compaction()) {
             missed_rows_size = missed_rows.size();
             if (compaction_type() == ReaderType::READER_CUMULATIVE_COMPACTION &&
@@ -830,7 +830,7 @@ Status Compaction::modify_rowsets(const Merger::Statistics* stats) {
         _tablet->calc_compaction_output_rowset_delete_bitmap(
                 _input_rowsets, _rowid_conversion, 0, version.second + 1, missed_rows.get(),
                 location_map.get(), _tablet->tablet_meta()->delete_bitmap(),
-                &output_rowset_delete_bitmap);
+                &output_rowset_delete_bitmap, _output_version.second);
         if (missed_rows) {
             missed_rows_size = missed_rows->size();
             if (stats != nullptr && stats->merged_rows != missed_rows_size &&
@@ -876,7 +876,8 @@ Status Compaction::modify_rowsets(const Merger::Statistics* stats) {
                 DeleteBitmap txn_output_delete_bitmap(_tablet->tablet_id());
                 _tablet->calc_compaction_output_rowset_delete_bitmap(
                         _input_rowsets, _rowid_conversion, 0, UINT64_MAX, missed_rows.get(),
-                        location_map.get(), *it.delete_bitmap.get(), &txn_output_delete_bitmap);
+                        location_map.get(), *it.delete_bitmap.get(), &txn_output_delete_bitmap,
+                        _output_version.second);
                 if (config::enable_merge_on_write_correctness_check) {
                     RowsetIdUnorderedSet rowsetids;
                     rowsetids.insert(_output_rowset->rowset_id());
@@ -897,7 +898,7 @@ Status Compaction::modify_rowsets(const Merger::Statistics* stats) {
             _tablet->calc_compaction_output_rowset_delete_bitmap(
                     _input_rowsets, _rowid_conversion, version.second, UINT64_MAX,
                     missed_rows.get(), location_map.get(), _tablet->tablet_meta()->delete_bitmap(),
-                    &output_rowset_delete_bitmap);
+                    &output_rowset_delete_bitmap, _output_version.second);
 
             if (missed_rows) {
                 DCHECK_EQ(missed_rows->size(), missed_rows_size);

diff --git a/be/src/olap/tablet.cpp b/be/src/olap/tablet.cpp
@@ -3817,7 +3817,8 @@ void Tablet::calc_compaction_output_rowset_delete_bitmap(
         const std::vector<RowsetSharedPtr>& input_rowsets, const RowIdConversion& rowid_conversion,
         uint64_t start_version, uint64_t end_version, std::set<RowLocation>* missed_rows,
         std::map<RowsetSharedPtr, std::list<std::pair<RowLocation, RowLocation>>>* location_map,
-        const DeleteBitmap& input_delete_bitmap, DeleteBitmap* output_rowset_delete_bitmap) {
+        const DeleteBitmap& input_delete_bitmap, DeleteBitmap* output_rowset_delete_bitmap,
+        uint64_t min_version) {
     RowLocation src;
     RowLocation dst;
     for (auto& rowset : input_rowsets) {
@@ -3831,6 +3832,8 @@ void Tablet::calc_compaction_output_rowset_delete_bitmap(
             for (auto iter = subset_map.delete_bitmap.begin();
                  iter != subset_map.delete_bitmap.end(); ++iter) {
                 auto cur_version = std::get<2>(iter->first);
+                auto output_version = cur_version < min_version ? min_version : cur_version;
+                size_t size = 0;
                 for (auto index = iter->second.begin(); index != iter->second.end(); ++index) {
                     src.row_id = *index;
                     if (rowid_conversion.get(src, &dst) != 0) {
@@ -3847,12 +3850,19 @@ void Tablet::calc_compaction_output_rowset_delete_bitmap(
                                << dst.rowset_id << "|" << dst.segment_id << "|" << dst.row_id
                                << " src location: |" << src.rowset_id << "|" << src.segment_id
                                << "|" << src.row_id << " start version: " << start_version
-                               << "end version" << end_version;
+                               << "end version" << end_version << " cur_version: " << cur_version;
+                    ++size;
                     if (location_map) {
                         (*location_map)[rowset].emplace_back(src, dst);
                     }
-                    output_rowset_delete_bitmap->add({dst.rowset_id, dst.segment_id, cur_version},
-                                                     dst.row_id);
+                    output_rowset_delete_bitmap->add(
+                            {dst.rowset_id, dst.segment_id, output_version}, dst.row_id);
+                }
+                if (size > 0 && output_version > cur_version) {
+                    LOG(WARNING) << "Convert " << size
+                                 << " rows delete bitmap from bitmap key: " << src.rowset_id << "|"
+                                 << src.segment_id << "|" << cur_version
+                                 << " to rs: " << dst.rowset_id << ", version: " << output_version;
                 }
             }
         }

diff --git a/be/src/olap/tablet.h b/be/src/olap/tablet.h
@@ -510,12 +510,20 @@ class Tablet : public BaseTablet {
             CalcDeleteBitmapToken* token, RowsetWriter* rowset_writer = nullptr);
 
     Status update_delete_bitmap(TabletTxnInfo* txn_info, int64_t txn_id);
+    /**
+     * min_version: The min version of output delete bitmap.
+     * As show in #41447, there are still some issues that have not been identified and affect the
+     * import speed.
+     * But, we can merge the delete bitmap and reduce the number of delete bitmaps to improve
+     * the load speed.
+     */
     void calc_compaction_output_rowset_delete_bitmap(
             const std::vector<RowsetSharedPtr>& input_rowsets,
             const RowIdConversion& rowid_conversion, uint64_t start_version, uint64_t end_version,
             std::set<RowLocation>* missed_rows,
             std::map<RowsetSharedPtr, std::list<std::pair<RowLocation, RowLocation>>>* location_map,
-            const DeleteBitmap& input_delete_bitmap, DeleteBitmap* output_rowset_delete_bitmap);
+            const DeleteBitmap& input_delete_bitmap, DeleteBitmap* output_rowset_delete_bitmap,
+            uint64_t min_version);
     void merge_delete_bitmap(const DeleteBitmap& delete_bitmap);
     Status check_rowid_conversion(
             RowsetSharedPtr dst_rowset,

diff --git a/be/src/olap/tablet_meta_manager.cpp b/be/src/olap/tablet_meta_manager.cpp
@@ -289,10 +289,11 @@ Status TabletMetaManager::remove_old_version_delete_bitmap(DataDir* store, TTabl
         remove_keys.push_back(key);
         return true;
     };
+    auto st = meta->iterate(
+            META_COLUMN_FAMILY_INDEX, begin_key, get_remove_keys_func);
     LOG(INFO) << "remove old version delete bitmap, tablet_id: " << tablet_id
               << " version: " << version << " removed keys size: " << remove_keys.size();
-    ;
-    RETURN_IF_ERROR(meta->iterate(META_COLUMN_FAMILY_INDEX, begin_key, get_remove_keys_func));
+    RETURN_IF_ERROR(st);
     return meta->remove(META_COLUMN_FAMILY_INDEX, remove_keys);
 }