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 c8b1ed87c3e branch-3.0: [fix](load) resolve UBSan error when printing
unique IDs #52042 (#52261)
c8b1ed87c3e is described below
commit c8b1ed87c3e8c5284a085deb96644b2c16e8a6c6
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Thu Jun 26 10:29:50 2025 +0800
branch-3.0: [fix](load) resolve UBSan error when printing unique IDs #52042
(#52261)
Cherry-picked from #52042
Co-authored-by: Kaijie Chen <[email protected]>
---
be/src/runtime/load_stream.cpp | 2 +-
be/src/util/uid_util.cpp | 4 ++++
be/src/util/uid_util.h | 1 +
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/be/src/runtime/load_stream.cpp b/be/src/runtime/load_stream.cpp
index 0bd045d46c1..eb28daaa86f 100644
--- a/be/src/runtime/load_stream.cpp
+++ b/be/src/runtime/load_stream.cpp
@@ -72,7 +72,7 @@ TabletStream::TabletStream(PUniqueId load_id, int64_t id,
int64_t txn_id,
}
inline std::ostream& operator<<(std::ostream& ostr, const TabletStream&
tablet_stream) {
- ostr << "load_id=" << tablet_stream._load_id << ", txn_id=" <<
tablet_stream._txn_id
+ ostr << "load_id=" << print_id(tablet_stream._load_id) << ", txn_id=" <<
tablet_stream._txn_id
<< ", tablet_id=" << tablet_stream._id << ", status=" <<
tablet_stream._status.status();
return ostr;
}
diff --git a/be/src/util/uid_util.cpp b/be/src/util/uid_util.cpp
index 0f93f437ab6..fb767f09bd7 100644
--- a/be/src/util/uid_util.cpp
+++ b/be/src/util/uid_util.cpp
@@ -44,6 +44,10 @@ std::ostream& operator<<(std::ostream& os, const UniqueId&
uid) {
return os;
}
+std::string print_id(const UniqueId& id) {
+ return id.to_string();
+}
+
std::string print_id(const TUniqueId& id) {
return fmt::format(FMT_COMPILE("{:x}-{:x}"), static_cast<uint64_t>(id.hi),
static_cast<uint64_t>(id.lo));
diff --git a/be/src/util/uid_util.h b/be/src/util/uid_util.h
index 5c0b5fb72fb..7f300c561b0 100644
--- a/be/src/util/uid_util.h
+++ b/be/src/util/uid_util.h
@@ -168,6 +168,7 @@ inline TUniqueId generate_uuid() {
std::ostream& operator<<(std::ostream& os, const UniqueId& uid);
+std::string print_id(const UniqueId& id);
std::string print_id(const TUniqueId& id);
std::string print_id(const PUniqueId& id);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
