This is an automated email from the ASF dual-hosted git repository. stigahuang pushed a commit to branch branch-4.4.1 in repository https://gitbox.apache.org/repos/asf/impala.git
commit a24b98bd6dbe3e80f67ec9bfe1eeb193d759ac89 Author: Michael Smith <[email protected]> AuthorDate: Fri Aug 2 15:31:06 2024 -0700 IMPALA-13252: Always use PrintId for TUniqueId Thrift types provide their own overload of operator<<. In GCC, the overload added in debug-util.h is preferred, but in Clang the first overload (from Thrift generated code) is preferred. I don't see a good way to augment the Thrift definition to use PrintId, so this patch reverts the overload in debug-util.h and uses PrintId explicitly. Change-Id: Ic536c12ed67d9d473c7ac7f1e05ebc537ff485d4 Reviewed-on: http://gerrit.cloudera.org:8080/21639 Tested-by: Impala Public Jenkins <[email protected]> Reviewed-by: Yida Wu <[email protected]> Reviewed-by: Michael Smith <[email protected]> --- be/src/runtime/coordinator.cc | 2 +- be/src/util/debug-util.h | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/be/src/runtime/coordinator.cc b/be/src/runtime/coordinator.cc index a1572ee6c..d6265839c 100644 --- a/be/src/runtime/coordinator.cc +++ b/be/src/runtime/coordinator.cc @@ -1537,7 +1537,7 @@ void Coordinator::UpdateFilter(const UpdateFilterParamsPB& params, RpcContext* c std::unordered_set<int> target_fragment_idxs; if (!IsExecuting()) { LOG(INFO) << "Filter update received for non-executing query with id: " - << query_id(); + << PrintId(query_id()); return; } auto it = filter_routing_table_->id_to_filter.find(params.filter_id()); diff --git a/be/src/util/debug-util.h b/be/src/util/debug-util.h index fcec0e7dc..4d7255e45 100644 --- a/be/src/util/debug-util.h +++ b/be/src/util/debug-util.h @@ -74,10 +74,6 @@ constexpr int TUniqueIdBufferSize = 33; void PrintIdCompromised(const TUniqueId& id, char out[TUniqueIdBufferSize], const char separator = ':'); -inline ostream& operator<<(ostream& os, const TUniqueId& id) { - return os << PrintId(id); -} - inline ostream& operator<<(ostream& os, const UniqueIdPB& id) { return os << PrintId(id); }
