From 8e6c6a9c4d7f98bbdb42ac52a108959cfbaec2f2 Mon Sep 17 00:00:00 2001 From: tushicheng <18829573815@163.com> Date: Tue, 25 Jun 2024 04:46:24 +0000 Subject: [PATCH] vostest pass --- deps/oblib/src/lib/roaringbitmap/ob_rb_utils.cpp | 4 ++-- src/sql/engine/px/datahub/components/ob_dh_range_dist_wf.cpp | 2 +- src/sql/engine/window_function/ob_window_function_vec_op.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deps/oblib/src/lib/roaringbitmap/ob_rb_utils.cpp b/deps/oblib/src/lib/roaringbitmap/ob_rb_utils.cpp index 71b88a510..de55cb180 100644 --- a/deps/oblib/src/lib/roaringbitmap/ob_rb_utils.cpp +++ b/deps/oblib/src/lib/roaringbitmap/ob_rb_utils.cpp @@ -316,7 +316,7 @@ int ObRbUtils::rb_to_string(ObIAllocator &allocator, ObString &rb_bin, ObString offset += RB_VALUE_COUNT_SIZE; if (value_count > 0) { uint32_t *value_ptr = reinterpret_cast(rb_bin.ptr() + offset); - std::sort(value_ptr, value_ptr + value_count); + lib::ob_sort(value_ptr, value_ptr + value_count); for (int i = 0; OB_SUCC(ret) && i < value_count; i++) { uint32_t value_32 = *reinterpret_cast(rb_bin.ptr() + offset); offset += sizeof(uint32_t); @@ -337,7 +337,7 @@ int ObRbUtils::rb_to_string(ObIAllocator &allocator, ObString &rb_bin, ObString offset += RB_VALUE_COUNT_SIZE; if (value_count > 0) { uint64_t *value_ptr = reinterpret_cast(rb_bin.ptr() + offset); - std::sort(value_ptr, value_ptr + value_count); + lib::ob_sort(value_ptr, value_ptr + value_count); for (int i = 0; OB_SUCC(ret) && i < value_count; i++) { uint64_t value_64 = *reinterpret_cast(rb_bin.ptr() + offset); offset += sizeof(uint64_t); diff --git a/src/sql/engine/px/datahub/components/ob_dh_range_dist_wf.cpp b/src/sql/engine/px/datahub/components/ob_dh_range_dist_wf.cpp index c28738db2..70a5884cf 100644 --- a/src/sql/engine/px/datahub/components/ob_dh_range_dist_wf.cpp +++ b/src/sql/engine/px/datahub/components/ob_dh_range_dist_wf.cpp @@ -566,7 +566,7 @@ int RDWinFuncPXPieceMsgCtx::send_whole_msg(common::ObIArray &sqcs if (OB_FAIL(wf->rd_generate_patch(*this, eval_ctx))) { LOG_WARN("generate patch failed", K(ret)); } else { - std::sort(infos_.begin(), infos_.end(), __part_info_cmp_op()); + lib::ob_sort(infos_.begin(), infos_.end(), __part_info_cmp_op()); } RDWinFuncPXWholeMsg *responses = nullptr; if (OB_SUCC(ret)) { diff --git a/src/sql/engine/window_function/ob_window_function_vec_op.cpp b/src/sql/engine/window_function/ob_window_function_vec_op.cpp index 90e88134c..b0f765cc5 100644 --- a/src/sql/engine/window_function/ob_window_function_vec_op.cpp +++ b/src/sql/engine/window_function/ob_window_function_vec_op.cpp @@ -3677,7 +3677,7 @@ private: int ObWindowFunctionVecSpec::rd_generate_patch(RDWinFuncPXPieceMsgCtx &msg_ctx, ObEvalCtx &eval_ctx) const { int ret = OB_SUCCESS; - std::sort(msg_ctx.infos_.begin(), msg_ctx.infos_.end(), __pby_oby_sort_op(*this)); + lib::ob_sort(msg_ctx.infos_.begin(), msg_ctx.infos_.end(), __pby_oby_sort_op(*this)); #ifndef NDEBUG for (int i = 0; i < msg_ctx.infos_.count(); i++) { RDWinFuncPXPartialInfo *info = msg_ctx.infos_.at(i);