This is an automated email from the ASF dual-hosted git repository.
gabriellee 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 10fbaf0c83d [fix](beut) fix "unknown file C++ exception with
description "bad_weak_ptr" thrown" in DataStreamRecvrTest (#48319)
10fbaf0c83d is described below
commit 10fbaf0c83d5b137640e2e1b8cc494accab6211d
Author: Mryange <yanxuech...@selectdb.com>
AuthorDate: Wed Feb 26 10:03:09 2025 +0800
[fix](beut) fix "unknown file C++ exception with description "bad_weak_ptr"
thrown" in DataStreamRecvrTest (#48319)
There are conflicts between the following two PRs.
One PR uses unique_ptr to construct query_ctx, while the other PR uses
shared_from_this
https://github.com/apache/doris/pull/48188
https://github.com/apache/doris/pull/47462
---
be/test/testutil/mock/mock_runtime_state.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/be/test/testutil/mock/mock_runtime_state.h
b/be/test/testutil/mock/mock_runtime_state.h
index b62a29c45eb..65cac30235b 100644
--- a/be/test/testutil/mock/mock_runtime_state.h
+++ b/be/test/testutil/mock/mock_runtime_state.h
@@ -42,7 +42,7 @@ public:
int batsh_size = 4096;
bool _enable_shared_exchange_sink_buffer = true;
std::shared_ptr<MockContext> _mock_context =
std::make_shared<MockContext>();
- std::unique_ptr<MockQueryContext> _query_ctx_uptr =
std::make_unique<MockQueryContext>();
+ std::shared_ptr<MockQueryContext> _query_ctx_uptr =
std::make_shared<MockQueryContext>();
};
} // namespace doris
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
