Skip to content

[Chore](shuffle) fix large number of GetBlockFailed #59690

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

Open
BiteTheDDDDt wants to merge 4 commits into
base: master
Choose a base branch
from
+17 −9
Open

[Chore](shuffle) fix large number of GetBlockFailed #59690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d6fe6d0
fix GetBlockFailed
BiteTheDDDDt Jan 4, 2026
ddaf43b
fix
BiteTheDDDDt Jan 14, 2026
196ba4c
fix
BiteTheDDDDt Jan 15, 2026
79e3224
format
BiteTheDDDDt Jan 15, 2026
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
7 changes: 7 additions & 0 deletions be/src/pipeline/local_exchange/local_exchanger.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,13 @@ bool Exchanger<BlockType>::_dequeue_data(LocalExchangeSourceLocalState* local_st
local_state->_shared_state->sub_mem_usage(channel_id, block->_allocated_bytes);
data_block->swap(block->_data_block);
}

std::unique_lock l(*_m[channel_id]);
// data_queue locked so that the size_approx is consistent with the actual queue size
if (_data_queue[channel_id].data_queue.size_approx() == 0) {
local_state->_dependency->block();
}

return true;
} else if (all_finished) {
*eos = true;
Expand Down
19 changes: 10 additions & 9 deletions be/test/pipeline/local_exchanger_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@ TEST_F(LocalExchangerTest, PassthroughExchanger) {
Status::OK());
EXPECT_EQ(block.rows(), j == num_blocks ? 0 : 10);
EXPECT_EQ(eos, false);
EXPECT_EQ(_local_states[i]->_dependency->ready(), j != num_blocks);
EXPECT_EQ(_local_states[i]->_dependency->ready(), j < num_blocks - 1);
}
}
EXPECT_EQ(shared_state->mem_usage, 0);
Expand Down Expand Up @@ -453,7 +453,7 @@ TEST_F(LocalExchangerTest, PassthroughExchanger) {
Status::OK());
EXPECT_EQ(block.rows(), j == 1 ? 0 : 10);
EXPECT_FALSE(eos);
EXPECT_EQ(_local_states[i]->_dependency->ready(), j != 1);
EXPECT_EQ(_local_states[i]->_dependency->ready(), false);
}
}
}
Expand Down Expand Up @@ -617,7 +617,8 @@ TEST_F(LocalExchangerTest, PassToOneExchanger) {
EXPECT_EQ(block.rows(), i == 0 && j < num_blocks * num_sink ? 10 : 0);
EXPECT_EQ(eos, i != 0);
if (i == 0) {
EXPECT_EQ(_local_states[i]->_dependency->ready(), j != num_blocks * num_sink);
EXPECT_EQ(_local_states[i]->_dependency->ready(),
j < num_blocks * num_sink - 1);
}
}
}
Expand Down Expand Up @@ -655,7 +656,7 @@ TEST_F(LocalExchangerTest, PassToOneExchanger) {
Status::OK());
EXPECT_EQ(block.rows(), j == 1 ? 0 : 10);
EXPECT_FALSE(eos);
EXPECT_EQ(_local_states[i]->_dependency->ready(), j != 1);
EXPECT_EQ(_local_states[i]->_dependency->ready(), false);
}
}
}
Expand Down Expand Up @@ -801,7 +802,7 @@ TEST_F(LocalExchangerTest, BroadcastExchanger) {

// Dequeue from data queue and accumulate rows if rows is smaller than batch_size.
for (size_t i = 0; i < num_sources; i++) {
for (size_t j = 0; j <= num_blocks * num_sources; j++) {
for (size_t j = 0; j < num_blocks * num_sources; j++) {
bool eos = false;
vectorized::Block block;
EXPECT_EQ(
Expand All @@ -812,7 +813,7 @@ TEST_F(LocalExchangerTest, BroadcastExchanger) {
Status::OK());
EXPECT_EQ(block.rows(), j == num_blocks * num_sources ? 0 : 10);
EXPECT_FALSE(eos);
EXPECT_EQ(_local_states[i]->_dependency->ready(), j != num_blocks * num_sources);
EXPECT_EQ(_local_states[i]->_dependency->ready(), j < num_blocks * num_sources - 1);
}
}
EXPECT_EQ(shared_state->mem_usage, 0);
Expand Down Expand Up @@ -849,7 +850,7 @@ TEST_F(LocalExchangerTest, BroadcastExchanger) {
Status::OK());
EXPECT_EQ(block.rows(), j == num_sources ? 0 : 10);
EXPECT_FALSE(eos);
EXPECT_EQ(_local_states[i]->_dependency->ready(), j != num_sources);
EXPECT_EQ(_local_states[i]->_dependency->ready(), j < num_sources - 1);
}
}
}
Expand Down Expand Up @@ -1017,7 +1018,7 @@ TEST_F(LocalExchangerTest, AdaptivePassthroughExchanger) {
: (j == 2 * num_blocks - 1 ? 0 : num_rows_per_block))
<< j;
EXPECT_EQ(eos, false);
EXPECT_EQ(_local_states[i]->_dependency->ready(), j != 2 * num_blocks - 1) << j;
EXPECT_EQ(_local_states[i]->_dependency->ready(), j < 2 * num_blocks - 2) << j;
}
}
EXPECT_EQ(shared_state->mem_usage, 0);
Expand Down Expand Up @@ -1054,7 +1055,7 @@ TEST_F(LocalExchangerTest, AdaptivePassthroughExchanger) {
Status::OK());
EXPECT_EQ(block.rows(), j == 1 ? 0 : num_rows_per_block);
EXPECT_FALSE(eos);
EXPECT_EQ(_local_states[i]->_dependency->ready(), j != 1);
EXPECT_EQ(_local_states[i]->_dependency->ready(), false);
}
}
}
Expand Down
Loading