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 f27be7aa13f branch-3.0: [fix](fragment) Remove unused instance ID
#49059 (#49076)
f27be7aa13f is described below
commit f27be7aa13f13d888f3b33d829d188ffb4ef0f01
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Tue Mar 25 09:55:22 2025 +0800
branch-3.0: [fix](fragment) Remove unused instance ID #49059 (#49076)
Cherry-picked from #49059
Co-authored-by: Gabriel <liwenqi...@selectdb.com>
---
be/src/runtime/fragment_mgr.cpp | 9 ---------
be/src/runtime/query_context.h | 2 --
2 files changed, 11 deletions(-)
diff --git a/be/src/runtime/fragment_mgr.cpp b/be/src/runtime/fragment_mgr.cpp
index 561ad930ffd..ce37faf91eb 100644
--- a/be/src/runtime/fragment_mgr.cpp
+++ b/be/src/runtime/fragment_mgr.cpp
@@ -862,11 +862,6 @@ Status FragmentMgr::exec_plan_fragment(const
TPipelineFragmentParams& params,
}
{
- for (const auto& local_param : params.local_params) {
- const TUniqueId& fragment_instance_id =
local_param.fragment_instance_id;
- query_ctx->fragment_instance_ids.push_back(fragment_instance_id);
- }
-
int64 now = duration_cast<std::chrono::milliseconds>(
std::chrono::system_clock::now().time_since_epoch())
.count();
@@ -907,13 +902,9 @@ void FragmentMgr::_set_scan_concurrency(const Param&
params, QueryContext* query
void FragmentMgr::cancel_query(const TUniqueId query_id, const Status reason) {
std::shared_ptr<QueryContext> query_ctx = nullptr;
- std::vector<TUniqueId> all_instance_ids;
{
if (auto q_ctx = get_query_ctx(query_id)) {
query_ctx = q_ctx;
- // Copy instanceids to avoid concurrent modification.
- // And to reduce the scope of lock.
- all_instance_ids = query_ctx->fragment_instance_ids;
} else {
LOG(WARNING) << "Query " << print_id(query_id)
<< " does not exists, failed to cancel it";
diff --git a/be/src/runtime/query_context.h b/be/src/runtime/query_context.h
index 9370ca13798..f7d5a515c52 100644
--- a/be/src/runtime/query_context.h
+++ b/be/src/runtime/query_context.h
@@ -234,8 +234,6 @@ public:
// MemTracker that is shared by all fragment instances running on this
host.
std::shared_ptr<MemTrackerLimiter> query_mem_tracker;
- std::vector<TUniqueId> fragment_instance_ids;
-
// plan node id -> TFileScanRangeParams
// only for file scan node
std::map<int, TFileScanRangeParams> file_scan_range_params_map;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
