Skip to content

Commit 8a75deb

Browse files
authored
[improve](mow) merge and remove old version of delete bitmap when cumulative compaction is done (apache#186)
* [improve](mow) merge and remove old version of delete bitmap when cumulative compaction is done * add test
1 parent e9ef712 commit 8a75deb

11 files changed

Lines changed: 421 additions & 1 deletion

‎be/src/olap/compaction.cpp‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1202,6 +1202,34 @@ void Compaction::_load_segment_to_cache() {
12021202
}
12031203
}
12041204

1205+
void Compaction::agg_and_remove_old_version_delete_bitmap(
1206+
std::vector<RowsetSharedPtr>& pre_rowsets,
1207+
std::vector<std::tuple<int64_t, DeleteBitmap::BitmapKey, DeleteBitmap::BitmapKey>>&
1208+
to_remove_vec,
1209+
DeleteBitmapPtr& new_delete_bitmap) {
1210+
// agg previously rowset old version delete bitmap
1211+
auto pre_max_version = _output_rowset->version().second;
1212+
new_delete_bitmap = std::make_shared<DeleteBitmap>(_tablet->tablet_meta()->tablet_id());
1213+
for (auto& rowset : pre_rowsets) {
1214+
if (rowset->rowset_meta()->total_disk_size() == 0) {
1215+
continue;
1216+
}
1217+
for (uint32_t seg_id = 0; seg_id < rowset->num_segments(); ++seg_id) {
1218+
rowset->rowset_id().to_string();
1219+
DeleteBitmap::BitmapKey start {rowset->rowset_id(), seg_id, 0};
1220+
DeleteBitmap::BitmapKey end {rowset->rowset_id(), seg_id, pre_max_version};
1221+
DeleteBitmap::BitmapKey before_end {rowset->rowset_id(), seg_id, pre_max_version - 1};
1222+
auto d = _tablet->tablet_meta()->delete_bitmap().get_agg(
1223+
{rowset->rowset_id(), seg_id, pre_max_version});
1224+
to_remove_vec.emplace_back(std::make_tuple(_tablet->tablet_id(), start, before_end));
1225+
if (d->isEmpty()) {
1226+
continue;
1227+
}
1228+
new_delete_bitmap->set(end, *d);
1229+
}
1230+
}
1231+
}
1232+
12051233
#ifdef BE_TEST
12061234
void Compaction::set_input_rowset(const std::vector<RowsetSharedPtr>& rowsets) {
12071235
_input_rowsets = rowsets;

‎be/src/olap/compaction.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,12 @@ class Compaction {
102102
return _allow_delete_in_cumu_compaction;
103103
}
104104

105+
void agg_and_remove_old_version_delete_bitmap(
106+
std::vector<RowsetSharedPtr>& pre_rowsets,
107+
std::vector<std::tuple<int64_t, DeleteBitmap::BitmapKey, DeleteBitmap::BitmapKey>>&
108+
to_remove_vec,
109+
DeleteBitmapPtr& new_delete_bitmap);
110+
105111
private:
106112
bool _check_if_includes_input_rowsets(const RowsetIdUnorderedSet& commit_rowset_ids_set) const;
107113
void _load_segment_to_cache();

‎be/src/olap/cumulative_compaction.cpp‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,11 @@ Status CumulativeCompaction::execute_compact_impl() {
9797
DorisMetrics::instance()->cumulative_compaction_deltas_total->increment(_input_rowsets.size());
9898
DorisMetrics::instance()->cumulative_compaction_bytes_total->increment(_input_rowsets_size);
9999

100+
if (_tablet->keys_type() == KeysType::UNIQUE_KEYS &&
101+
_tablet->enable_unique_key_merge_on_write() && _input_rowsets.size() != 1) {
102+
_process_old_version_delete_bitmap();
103+
}
104+
100105
return Status::OK();
101106
}
102107

@@ -188,4 +193,34 @@ Status CumulativeCompaction::pick_rowsets_to_compact() {
188193
return Status::OK();
189194
}
190195

196+
void CumulativeCompaction::_process_old_version_delete_bitmap() {
197+
std::vector<RowsetSharedPtr> pre_rowsets {};
198+
for (const auto& it : _tablet->rowset_map()) {
199+
if (it.first.second < _input_rowsets.front()->start_version()) {
200+
pre_rowsets.emplace_back(it.second);
201+
}
202+
}
203+
std::sort(pre_rowsets.begin(), pre_rowsets.end(), Rowset::comparator);
204+
if (!pre_rowsets.empty()) {
205+
std::vector<std::tuple<int64_t, DeleteBitmap::BitmapKey, DeleteBitmap::BitmapKey>>
206+
to_remove_vec;
207+
DeleteBitmapPtr new_delete_bitmap = nullptr;
208+
agg_and_remove_old_version_delete_bitmap(pre_rowsets, to_remove_vec, new_delete_bitmap);
209+
if (!new_delete_bitmap->empty()) {
210+
// store agg delete bitmap
211+
Version version(_input_rowsets.front()->start_version(),
212+
_input_rowsets.back()->end_version());
213+
for (auto it = new_delete_bitmap->delete_bitmap.begin();
214+
it != new_delete_bitmap->delete_bitmap.end(); it++) {
215+
_tablet->tablet_meta()->delete_bitmap().set(it->first, it->second);
216+
}
217+
_tablet->tablet_meta()->delete_bitmap().add_to_remove_queue(version.to_string(),
218+
to_remove_vec);
219+
DBUG_EXECUTE_IF("CumulativeCompaction.modify_rowsets.delete_expired_stale_rowsets", {
220+
static_cast<Tablet*>(_tablet.get())->delete_expired_stale_rowset();
221+
});
222+
}
223+
}
224+
}
225+
191226
} // namespace doris

‎be/src/olap/cumulative_compaction.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ class CumulativeCompaction : public Compaction {
4949
private:
5050
Version _last_delete_version {-1, -1};
5151

52+
void _process_old_version_delete_bitmap();
53+
5254
DISALLOW_COPY_AND_ASSIGN(CumulativeCompaction);
5355
};
5456

‎be/src/olap/rowset/beta_rowset_writer.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,8 @@ Status BetaRowsetWriter::_generate_delete_bitmap(int32_t segment_id) {
192192
LOG(INFO) << "[Memtable Flush] construct delete bitmap tablet: " << _context.tablet->tablet_id()
193193
<< ", rowset_ids: " << _context.mow_context->rowset_ids.size()
194194
<< ", cur max_version: " << _context.mow_context->max_version
195-
<< ", transaction_id: " << _context.mow_context->txn_id
195+
<< ", transaction_id: " << _context.mow_context->txn_id << ", delete_bitmap_count: "
196+
<< _context.tablet->tablet_meta()->delete_bitmap().get_delete_bitmap_count()
196197
<< ", cost: " << watch.get_elapse_time_us() << "(us), total rows: " << total_rows;
197198
return Status::OK();
198199
}

‎be/src/olap/tablet.cpp‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -884,10 +884,13 @@ void Tablet::delete_expired_stale_rowset() {
884884
auto old_meta_size = _tablet_meta->all_stale_rs_metas().size();
885885

886886
// do delete operation
887+
std::vector<std::string> version_to_delete;
887888
auto to_delete_iter = stale_version_path_map.begin();
888889
while (to_delete_iter != stale_version_path_map.end()) {
889890
std::vector<TimestampedVersionSharedPtr>& to_delete_version =
890891
to_delete_iter->second->timestamped_versions();
892+
int start_version = -1;
893+
int end_version = -1;
891894
for (auto& timestampedVersion : to_delete_version) {
892895
auto it = _stale_rs_version_map.find(timestampedVersion->version());
893896
if (it != _stale_rs_version_map.end()) {
@@ -906,10 +909,17 @@ void Tablet::delete_expired_stale_rowset() {
906909
<< timestampedVersion->version().second
907910
<< "] not find in stale rs version map";
908911
}
912+
if (start_version < 0) {
913+
start_version = timestampedVersion->version().first;
914+
}
915+
end_version = timestampedVersion->version().second;
909916
_delete_stale_rowset_by_version(timestampedVersion->version());
910917
}
918+
Version version(start_version, end_version);
919+
version_to_delete.emplace_back(version.to_string());
911920
to_delete_iter++;
912921
}
922+
_tablet_meta->delete_bitmap().remove_stale_delete_bitmap_from_queue(version_to_delete);
913923

914924
bool reconstructed = _reconstruct_version_tracker_if_necessary();
915925

‎be/src/olap/tablet_meta.cpp‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1048,6 +1048,7 @@ bool DeleteBitmap::empty() const {
10481048
}
10491049

10501050
uint64_t DeleteBitmap::cardinality() const {
1051+
std::shared_lock l(lock);
10511052
uint64_t res = 0;
10521053
for (auto entry : delete_bitmap) {
10531054
res += entry.second.cardinality();
@@ -1122,6 +1123,44 @@ void DeleteBitmap::merge(const DeleteBitmap& other) {
11221123
}
11231124
}
11241125

1126+
size_t DeleteBitmap::get_size() const {
1127+
std::shared_lock l(lock);
1128+
size_t charge = 0;
1129+
for (auto& [k, v] : delete_bitmap) {
1130+
charge += v.getSizeInBytes();
1131+
}
1132+
return charge;
1133+
}
1134+
1135+
void DeleteBitmap::add_to_remove_queue(
1136+
const std::string& version_str,
1137+
const std::vector<std::tuple<int64_t, DeleteBitmap::BitmapKey, DeleteBitmap::BitmapKey>>&
1138+
vector) {
1139+
std::shared_lock l(stale_delete_bitmap_lock);
1140+
_stale_delete_bitmap.emplace(version_str, vector);
1141+
}
1142+
1143+
void DeleteBitmap::remove_stale_delete_bitmap_from_queue(const std::vector<std::string>& vector) {
1144+
std::shared_lock l(stale_delete_bitmap_lock);
1145+
for (auto& version_str : vector) {
1146+
auto it = _stale_delete_bitmap.find(version_str);
1147+
if (it != _stale_delete_bitmap.end()) {
1148+
auto delete_bitmap_vector = it->second;
1149+
for (auto& delete_bitmap_tuple : it->second) {
1150+
auto start_bmk = std::get<1>(delete_bitmap_tuple);
1151+
auto end_bmk = std::get<2>(delete_bitmap_tuple);
1152+
remove(start_bmk, end_bmk);
1153+
}
1154+
_stale_delete_bitmap.erase(version_str);
1155+
}
1156+
}
1157+
}
1158+
1159+
uint64_t DeleteBitmap::get_delete_bitmap_count() {
1160+
std::shared_lock l(lock);
1161+
return delete_bitmap.size();
1162+
}
1163+
11251164
// We cannot just copy the underlying memory to construct a string
11261165
// due to equivalent objects may have different padding bytes.
11271166
// Reading padding bytes is undefined behavior, neither copy nor

‎be/src/olap/tablet_meta.h‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,7 @@ class TabletMeta {
352352
class DeleteBitmap {
353353
public:
354354
mutable std::shared_mutex lock;
355+
mutable std::shared_mutex stale_delete_bitmap_lock;
355356
using SegmentId = uint32_t;
356357
using Version = uint64_t;
357358
using BitmapKey = std::tuple<RowsetId, SegmentId, Version>;
@@ -431,6 +432,12 @@ class DeleteBitmap {
431432
*/
432433
uint64_t cardinality() const;
433434

435+
/**
436+
* return the total size of the Delete Bitmap(after serialized)
437+
*/
438+
439+
size_t get_size() const;
440+
434441
/**
435442
* Sets the bitmap of specific segment, it's may be insertion or replacement
436443
*
@@ -499,6 +506,13 @@ class DeleteBitmap {
499506
*/
500507
std::shared_ptr<roaring::Roaring> get_agg(const BitmapKey& bmk) const;
501508

509+
void add_to_remove_queue(const std::string& version_str,
510+
const std::vector<std::tuple<int64_t, DeleteBitmap::BitmapKey,
511+
DeleteBitmap::BitmapKey>>& vector);
512+
void remove_stale_delete_bitmap_from_queue(const std::vector<std::string>& vector);
513+
514+
uint64_t get_delete_bitmap_count();
515+
502516
class AggCachePolicy : public LRUCachePolicyTrackingManual {
503517
public:
504518
AggCachePolicy(size_t capacity)
@@ -533,6 +547,10 @@ class DeleteBitmap {
533547
private:
534548
mutable std::shared_ptr<AggCache> _agg_cache;
535549
int64_t _tablet_id;
550+
// <version, <tablet_id, BitmapKeyStart, BitmapKeyEnd>>
551+
std::map<std::string,
552+
std::vector<std::tuple<int64_t, DeleteBitmap::BitmapKey, DeleteBitmap::BitmapKey>>>
553+
_stale_delete_bitmap;
536554
};
537555

538556
inline TabletUid TabletMeta::tablet_uid() const {

‎be/src/service/http_service.cpp‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
#include "http/action/compaction_action.h"
3636
#include "http/action/config_action.h"
3737
#include "http/action/debug_point_action.h"
38+
#include "http/action/delete_bitmap_action.h"
3839
#include "http/action/download_action.h"
3940
#include "http/action/download_binlog_action.h"
4041
#include "http/action/file_cache_action.h"
@@ -276,6 +277,12 @@ Status HttpService::start() {
276277
_ev_http_server->register_handler(HttpMethod::GET, "/api/compaction/run_status",
277278
run_status_compaction_action);
278279

280+
DeleteBitmapAction* count_delete_bitmap_action =
281+
_pool.add(new DeleteBitmapAction(DeleteBitmapActionType::COUNT_INFO, _env,
282+
TPrivilegeHier::GLOBAL, TPrivilegeType::ADMIN));
283+
_ev_http_server->register_handler(HttpMethod::GET, "/api/delete_bitmap/count",
284+
count_delete_bitmap_action);
285+
279286
ConfigAction* update_config_action =
280287
_pool.add(new ConfigAction(ConfigActionType::UPDATE_CONFIG));
281288
_ev_http_server->register_handler(HttpMethod::POST, "/api/update_config", update_config_action);
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
-- This file is automatically generated. You should know what you did if you want to edit this
2+
-- !sql --
3+
0 0 0
4+
1 8 8
5+
6+
-- !sql --
7+
0 0 0
8+
1 8 8
9+
10+
-- !sql --
11+
0 0 0
12+
1 13 13
13+
14+
-- !sql --
15+
0 0 0
16+
1 13 13
17+

0 commit comments

Comments
 (0)