Skip to content

Commit 687b6d7

Browse files
committed
r
1 parent f23aba7 commit 687b6d7

File tree

3 files changed

+15
-7
lines changed

3 files changed

+15
-7
lines changed

be/src/olap/compaction.cpp

+3-4
Original file line numberDiff line numberDiff line change
@@ -1070,10 +1070,9 @@ void Compaction::agg_and_remove_old_version_delete_bitmap(
10701070
auto d = _tablet->tablet_meta()->delete_bitmap().get_agg(
10711071
{rowset->rowset_id(), seg_id, pre_max_version});
10721072
to_remove_vec.emplace_back(std::make_tuple(_tablet->tablet_id(), start, end));
1073-
LOG(INFO) << "sout: add dm to remove for tablet=" << _tablet->tablet_id()
1074-
<< ", version=" << rowset->version().to_string()
1075-
<< ", rowset=" << rowset->rowset_id() << ", seg=" << seg_id
1076-
<< ", start_version=0, end_version=" << pre_max_version;
1073+
LOG(INFO) << "sout: add a to_remove dm for tablet=" << _tablet->tablet_id()
1074+
<< ", rowset=" << rowset->rowset_id() << ", seg=" << seg_id << ", version=["
1075+
<< 0 << ", " << pre_max_version << "]";
10771076
if (d->isEmpty()) {
10781077
continue;
10791078
}

be/src/olap/tablet.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -831,8 +831,8 @@ void Tablet::delete_expired_stale_rowset() {
831831
while (to_delete_iter != stale_version_path_map.end()) {
832832
std::vector<TimestampedVersionSharedPtr>& to_delete_version =
833833
to_delete_iter->second->timestamped_versions();
834-
LOG(INFO) << "sout: tablet=" << tablet_id() << ", to_delete_version size="
835-
<< to_delete_version.size() << ", path_id=" << to_delete_iter->first;
834+
LOG(INFO) << "sout: tablet=" << tablet_id()
835+
<< ", to_delete_version size=" << to_delete_version.size();
836836
int64_t start_version = -1;
837837
int64_t end_version = -1;
838838
for (auto& timestampedVersion : to_delete_version) {
@@ -863,6 +863,8 @@ void Tablet::delete_expired_stale_rowset() {
863863
}
864864
Version version(start_version, end_version);
865865
version_to_delete.emplace_back(version.to_string());
866+
LOG(INFO) << "sout: delete stale dm. tablet=" << tablet_id()
867+
<< ", version=" << version.to_string();
866868
to_delete_iter++;
867869
}
868870
_tablet_meta->delete_bitmap().remove_stale_delete_bitmap_from_queue(version_to_delete);

be/src/olap/tablet_meta.cpp

+8-1
Original file line numberDiff line numberDiff line change
@@ -1238,7 +1238,7 @@ void DeleteBitmap::add_to_remove_queue(
12381238
// val: vector of [tablet_id, {rowset_id, seg_id, start_version}, {rowset_id, seg_id, end_version}]
12391239
// note that the end version is the end version of input rowsets
12401240
_stale_delete_bitmap.emplace(version_str, vector);
1241-
LOG(INFO) << "sout: tablet_id=" << _tablet_id << ", add key=" << version_str
1241+
LOG(INFO) << "sout: add_to_remove_queue. tablet_id=" << _tablet_id << ", key=" << version_str
12421242
<< ", stale dm size=" << _stale_delete_bitmap.size();
12431243
}
12441244

@@ -1253,13 +1253,20 @@ void DeleteBitmap::remove_stale_delete_bitmap_from_queue(const std::vector<std::
12531253
for (auto& version_str : vector) {
12541254
auto it = _stale_delete_bitmap.find(version_str);
12551255
if (it != _stale_delete_bitmap.end()) {
1256+
LOG(INFO) << "sout: remove_stale_delete_bitmap_from_queue. tablet_id=" << _tablet_id
1257+
<< ", key=" << version_str << ", stale dm size=" << it->second.size();
12561258
for (auto& delete_bitmap_tuple : it->second) {
12571259
// {rowset_id, seg_id, start_version}
12581260
if (tablet_id < 0) {
12591261
tablet_id = std::get<0>(delete_bitmap_tuple);
12601262
}
12611263
auto start_bmk = std::get<1>(delete_bitmap_tuple);
12621264
auto end_bmk = std::get<2>(delete_bitmap_tuple);
1265+
LOG(INFO) << "sout: remove stale dm, tablet_id=" << tablet_id
1266+
<< ", rowset=" << std::get<0>(start_bmk).to_string()
1267+
<< ", seg_id=" << std::get<1>(start_bmk)
1268+
<< ", start_version=" << std::get<2>(start_bmk)
1269+
<< ", end_version=" << std::get<2>(end_bmk);
12631270
// the key range of to be removed is [start_bmk,end_bmk),
12641271
// due to the different definitions of the right boundary,
12651272
// so use end_bmk as right boundary when removing local delete bitmap,

0 commit comments

Comments
 (0)