This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 09daf0684f6 [fix](cloud-mow)Fix some implicit conversion loses when
complie mow code (#44410)
09daf0684f6 is described below
commit 09daf0684f69758a2b49c17464593aa0e74bd80c
Author: huanghaibin <[email protected]>
AuthorDate: Tue Nov 26 23:46:31 2024 +0800
[fix](cloud-mow)Fix some implicit conversion loses when complie mow code
(#44410)
Related PR: #40204
Problem Summary:
There is some implicit conversion loses like uint64_t to uint32_t on mow
code, this pr fix it.
---
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 7391449b73f..91611d20c62 100644
--- a/be/src/cloud/cloud_engine_calc_delete_bitmap_task.cpp
+++ b/be/src/cloud/cloud_engine_calc_delete_bitmap_task.cpp
@@ -273,7 +273,7 @@ Status CloudTabletCalcDeleteBitmapTask::_handle_rowset(
.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 267c204c0e6..ea86f3b40ff 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 9a27b95dbcd..0570aff349c 100644
--- a/be/src/olap/tablet_meta.cpp
+++ b/be/src/olap/tablet_meta.cpp
@@ -668,7 +668,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 4f374832925..974b3091a73 100644
--- a/cloud/src/meta-service/meta_service.cpp
+++ b/cloud/src/meta-service/meta_service.cpp
@@ -1748,7 +1748,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]
