Skip to content
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

[refactor](local exchange) Simplify block wrapper #47620

Merged
merged 3 commits into from
Feb 8, 2025
Merged

[refactor](local exchange) Simplify block wrapper #47620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cfb6f1c
[refactor](local exchange) Simplify block wrapper
Gabriel39 Feb 8, 2025
8531dca
update
Gabriel39 Feb 8, 2025
4d8043f
update
Gabriel39 Feb 8, 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
12 changes: 4 additions & 8 deletions be/src/pipeline/dependency.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -754,19 +754,15 @@ struct LocalExchangeSharedState : public BasicSharedState {
dep->set_ready();
}

void add_mem_usage(int channel_id, size_t delta, bool update_total_mem_usage = true) {
mem_counters[channel_id]->update(delta);
if (update_total_mem_usage) {
add_total_mem_usage(delta, channel_id);
}
}
void add_mem_usage(int channel_id, size_t delta) { mem_counters[channel_id]->update(delta); }

void sub_mem_usage(int channel_id, size_t delta) {
mem_counters[channel_id]->update(-(int64_t)delta);
}

virtual void add_total_mem_usage(size_t delta, int channel_id) {
if (mem_usage.fetch_add(delta) + delta > config::local_exchange_buffer_mem_limit) {
if (cast_set<int64_t>(mem_usage.fetch_add(delta) + delta) >
config::local_exchange_buffer_mem_limit) {
sink_deps.front()->block();
}
}
Expand All @@ -775,7 +771,7 @@ struct LocalExchangeSharedState : public BasicSharedState {
auto prev_usage = mem_usage.fetch_sub(delta);
DCHECK_GE(prev_usage - delta, 0) << "prev_usage: " << prev_usage << " delta: " << delta
<< " channel_id: " << channel_id;
if (prev_usage - delta <= config::local_exchange_buffer_mem_limit) {
if (cast_set<int64_t>(prev_usage - delta) <= config::local_exchange_buffer_mem_limit) {
sink_deps.front()->set_ready();
}
}
Expand Down
Loading
Loading