Skip to content

[Chore](query) add _query_ctx_map_delay_delete #59262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BiteTheDDDDt merged 4 commits into from
Jan 4, 2026
Merged

[Chore](query) add _query_ctx_map_delay_delete #59262

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
833cc4a
_query_ctx_map_delay_delete
BiteTheDDDDt Dec 22, 2025
eff9211
update
BiteTheDDDDt Dec 22, 2025
4d6558e
fix ut
BiteTheDDDDt Dec 23, 2025
25336e3
remove release_undone_filters
BiteTheDDDDt Dec 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions be/src/runtime/fragment_mgr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -670,6 +670,7 @@ void FragmentMgr::remove_pipeline_context(std::pair<TUniqueId, int> key) {
}

void FragmentMgr::remove_query_context(const TUniqueId& key) {
_query_ctx_map_delay_delete.erase(key);
#ifndef BE_TEST
_query_ctx_map.erase(key);
#endif
Expand Down Expand Up @@ -768,6 +769,9 @@ Status FragmentMgr::_get_or_create_query_ctx(const TPipelineFragmentParams& para

query_ctx->runtime_filter_mgr()->set_runtime_filter_params(
info.runtime_filter_params);
if (!handler->empty()) {
_query_ctx_map_delay_delete.insert(query_id, query_ctx);
}
}
Copy link
Contributor

@yiguolei yiguolei Dec 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should also deal with the timeout logic if FE not send cancel message to BE. like the code at line 974

if (info.__isset.topn_filter_descs) {
query_ctx->init_runtime_predicates(info.topn_filter_descs);
Expand Down
3 changes: 3 additions & 0 deletions be/src/runtime/fragment_mgr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,9 @@ class FragmentMgr : public RestMonitorIface {

// query id -> QueryContext
ConcurrentContextMap<TUniqueId, std::weak_ptr<QueryContext>, QueryContext> _query_ctx_map;
// keep query ctx do not delete immediately to make rf coordinator merge filter work well after query eos
ConcurrentContextMap<TUniqueId, std::shared_ptr<QueryContext>, QueryContext>
_query_ctx_map_delay_delete;

CountDownLatch _stop_background_threads_latch;
std::shared_ptr<Thread> _cancel_thread;
Expand Down
5 changes: 4 additions & 1 deletion be/src/runtime/query_context.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,10 @@ QueryContext::~QueryContext() {
_merge_controller_handler.reset();

DorisMetrics::instance()->query_ctx_cnt->increment(-1);
ExecEnv::GetInstance()->fragment_mgr()->remove_query_context(this->_query_id);
// fragment_mgr is nullptr in unittest
if (ExecEnv::GetInstance()->fragment_mgr()) {
ExecEnv::GetInstance()->fragment_mgr()->remove_query_context(this->_query_id);
}
// the only one msg shows query's end. any other msg should append to it if need.
LOG_INFO("Query {} deconstructed, mem_tracker: {}", print_id(this->_query_id), mem_tracker_msg);
}
Expand Down
5 changes: 5 additions & 0 deletions be/src/runtime_filter/runtime_filter_mgr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,11 @@ class RuntimeFilterMergeControllerEntity {

void release_undone_filters(QueryContext* query_ctx);

bool empty() {
std::shared_lock<std::shared_mutex> read_lock(_filter_map_mutex);
return _filter_map.empty();
}

private:
Status _init_with_desc(std::shared_ptr<QueryContext> query_ctx,
const TRuntimeFilterDesc* runtime_filter_desc,
Expand Down
Loading