This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new 5ed069e7a63 branch-3.0: [fix](cloud-mow)Fix some implicit conversion
loses when complie mow code #44410 (#44644)
5ed069e7a63 is described below
commit 5ed069e7a63dc06e8aa8324db727998f958a0f0d
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Tue Dec 3 21:54:48 2024 +0800
branch-3.0: [fix](cloud-mow)Fix some implicit conversion loses when complie
mow code #44410 (#44644)
Cherry-picked from #44410
Co-authored-by: huanghaibin <[email protected]>
---
be/src/cloud/cloud_engine_calc_delete_bitmap_task.cpp | 2 +-
be/src/cloud/cloud_tablet.cpp | 4 ++--
be/src/olap/tablet_meta.cpp | 2 +-
cloud/src/meta-service/meta_service.cpp | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/be/src/cloud/cloud_engine_calc_delete_bitmap_task.cpp
b/be/src/cloud/cloud_engine_calc_delete_bitmap_task.cpp
index 6abc3958650..594eeab3a5e 100644
--- a/be/src/cloud/cloud_engine_calc_delete_bitmap_task.cpp
+++ b/be/src/cloud/cloud_engine_calc_delete_bitmap_task.cpp
@@ -218,7 +218,7 @@ Status CloudTabletCalcDeleteBitmapTask::handle() const {
.base_compaction_cnt = _ms_base_compaction_cnt,
.cumulative_compaction_cnt =
_ms_cumulative_compaction_cnt,
.cumulative_point = _ms_cumulative_point};
- auto update_delete_bitmap_time_us = 0;
+ int64_t update_delete_bitmap_time_us = 0;
if (txn_info.publish_status && (*(txn_info.publish_status) ==
PublishStatus::SUCCEED) &&
_version == previous_publish_info.publish_version &&
_ms_base_compaction_cnt == previous_publish_info.base_compaction_cnt &&
diff --git a/be/src/cloud/cloud_tablet.cpp b/be/src/cloud/cloud_tablet.cpp
index ebe06ac558f..44ba92c5bea 100644
--- a/be/src/cloud/cloud_tablet.cpp
+++ b/be/src/cloud/cloud_tablet.cpp
@@ -397,8 +397,8 @@ int CloudTablet::delete_expired_stale_rowsets() {
}
for (int64_t path_id : path_ids) {
- int start_version = -1;
- int end_version = -1;
+ int64_t start_version = -1;
+ int64_t end_version = -1;
// delete stale versions in version graph
auto version_path =
_timestamped_version_tracker.fetch_and_delete_path_by_id(path_id);
for (auto& v_ts : version_path->timestamped_versions()) {
diff --git a/be/src/olap/tablet_meta.cpp b/be/src/olap/tablet_meta.cpp
index 0ebbaf0a65b..cb95c4fb6e0 100644
--- a/be/src/olap/tablet_meta.cpp
+++ b/be/src/olap/tablet_meta.cpp
@@ -664,7 +664,7 @@ void TabletMeta::init_from_pb(const TabletMetaPB&
tablet_meta_pb) {
RowsetId rst_id;
rst_id.init(tablet_meta_pb.delete_bitmap().rowset_ids(i));
auto seg_id = tablet_meta_pb.delete_bitmap().segment_ids(i);
- uint32_t ver = tablet_meta_pb.delete_bitmap().versions(i);
+ auto ver = tablet_meta_pb.delete_bitmap().versions(i);
auto bitmap =
tablet_meta_pb.delete_bitmap().segment_delete_bitmaps(i).data();
delete_bitmap().delete_bitmap[{rst_id, seg_id, ver}] =
roaring::Roaring::read(bitmap);
}
diff --git a/cloud/src/meta-service/meta_service.cpp
b/cloud/src/meta-service/meta_service.cpp
index 87afc8ed7ce..91a9dc0b554 100644
--- a/cloud/src/meta-service/meta_service.cpp
+++ b/cloud/src/meta-service/meta_service.cpp
@@ -1750,7 +1750,7 @@ void
MetaServiceImpl::update_delete_bitmap(google::protobuf::RpcController* cont
}
RPC_RATE_LIMIT(update_delete_bitmap)
- uint32_t fdb_txn_size = 0;
+ uint64_t fdb_txn_size = 0;
auto table_id = request->table_id();
auto tablet_id = request->tablet_id();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
