Skip to content

[bugfix](arrowflight) should call done run in on_xxx method to make work in async mode #60282

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
HappenLee merged 2 commits into from
Jan 29, 2026
Merged

[bugfix](arrowflight) should call done run in on_xxx method to make work in async mode #60282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fef41a8
[bugfix](arrowflight) should call done run in on_xxx method to make w…
yiguolei Jan 27, 2026
562439a
f
yiguolei Jan 28, 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
3 changes: 1 addition & 2 deletions be/src/service/internal_service.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -671,8 +671,7 @@ void PInternalService::fetch_arrow_data(google::protobuf::RpcController* control
PFetchArrowDataResult* result,
google::protobuf::Closure* done) {
bool ret = _arrow_flight_work_pool.try_offer([request, result, done]() {
brpc::ClosureGuard closure_guard(done);
auto ctx = vectorized::GetArrowResultBatchCtx::create_shared(result);
auto ctx = vectorized::GetArrowResultBatchCtx::create_shared(result, done);
TUniqueId unique_id = UniqueId(request->finst_id()).to_thrift(); // query_id or instance_id
std::shared_ptr<vectorized::ArrowFlightResultBlockBuffer> arrow_buffer;
auto st = ExecEnv::GetInstance()->result_mgr()->find_buffer(unique_id, arrow_buffer);
Expand Down
4 changes: 4 additions & 0 deletions be/src/vec/sink/varrow_flight_result_writer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,15 @@ namespace doris::vectorized {
void GetArrowResultBatchCtx::on_failure(const Status& status) {
DCHECK(!status.ok()) << "status is ok, errmsg=" << status;
status.to_protobuf(_result->mutable_status());
_done->Run();
}

void GetArrowResultBatchCtx::on_close(int64_t packet_seq, int64_t /* returned_rows */) {
Status status;
status.to_protobuf(_result->mutable_status());
_result->set_packet_seq(packet_seq);
_result->set_eos(true);
_done->Run();
}

Status GetArrowResultBatchCtx::on_data(const std::shared_ptr<vectorized::Block>& block,
Expand Down Expand Up @@ -72,6 +74,8 @@ Status GetArrowResultBatchCtx::on_data(const std::shared_ptr<vectorized::Block>&
_result->clear_block();
}
st.to_protobuf(_result->mutable_status());

_done->Run();
return Status::OK();
}

Expand Down
4 changes: 3 additions & 1 deletion be/src/vec/sink/varrow_flight_result_writer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ class GetArrowResultBatchCtx {
public:
using ResultType = vectorized::Block;
ENABLE_FACTORY_CREATOR(GetArrowResultBatchCtx)
GetArrowResultBatchCtx(PFetchArrowDataResult* result) : _result(result) {}
GetArrowResultBatchCtx(PFetchArrowDataResult* result, google::protobuf::Closure* done)
: _result(result), _done(done) {}
#ifdef BE_TEST
GetArrowResultBatchCtx() = default;
#endif
Expand All @@ -53,6 +54,7 @@ class GetArrowResultBatchCtx {
int32_t _max_msg_size = std::numeric_limits<int32_t>::max();
#endif
PFetchArrowDataResult* _result = nullptr;
google::protobuf::Closure* _done = nullptr;
};

class ArrowFlightResultBlockBuffer final : public ResultBlockBuffer<GetArrowResultBatchCtx> {
Expand Down
29 changes: 23 additions & 6 deletions be/test/vec/sink/arrow_result_block_buffer_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,14 @@

namespace doris::vectorized {

class MockClosure : public google::protobuf::Closure {
public:
MockClosure() {}
MockClosure(std::function<void()> cb) : _cb(cb) {}
void Run() override { _cb(); }

std::function<void()> _cb;
};
class ArrowResultBlockBufferTest : public ::testing::Test {
public:
ArrowResultBlockBufferTest() = default;
Expand All @@ -44,8 +52,9 @@ class MockGetArrowResultBatchCtx : public GetArrowResultBatchCtx {
public:
ENABLE_FACTORY_CREATOR(MockGetArrowResultBatchCtx)
MockGetArrowResultBatchCtx(std::function<void()> fail_cb, std::function<void()> close_cb,
std::function<void()> data_cb, PFetchArrowDataResult* result)
: GetArrowResultBatchCtx(result),
std::function<void()> data_cb, PFetchArrowDataResult* result,
google::protobuf::Closure* done)
: GetArrowResultBatchCtx(result, done),
_fail_cb(fail_cb),
_close_cb(close_cb),
_data_cb(data_cb) {}
Expand Down Expand Up @@ -78,9 +87,11 @@ TEST_F(ArrowResultBlockBufferTest, TestArrowResultBlockBuffer) {
ArrowFlightResultBlockBuffer buffer(TUniqueId(), &state, schema, buffer_size);
buffer.set_dependency(ins_id, dep);
PFetchArrowDataResult presult;

MockClosure done([&]() -> void { std::cout << "cb" << std::endl; });
std::shared_ptr<GetArrowResultBatchCtx> ctx = MockGetArrowResultBatchCtx::create_shared(
[&]() -> void { fail = true; }, [&]() -> void { close = true; },
[&]() -> void { data = true; }, &presult);
[&]() -> void { data = true; }, &presult, &done);

{
auto num_rows = 2;
Expand Down Expand Up @@ -201,9 +212,11 @@ TEST_F(ArrowResultBlockBufferTest, TestCancelArrowResultBlockBuffer) {
ArrowFlightResultBlockBuffer buffer(TUniqueId(), &state, schema, buffer_size);
buffer.set_dependency(ins_id, dep);
PFetchArrowDataResult presult;

MockClosure done([&]() -> void { std::cout << "cb" << std::endl; });
std::shared_ptr<GetArrowResultBatchCtx> ctx = MockGetArrowResultBatchCtx::create_shared(
[&]() -> void { fail = true; }, [&]() -> void { close = true; },
[&]() -> void { data = true; }, &presult);
[&]() -> void { data = true; }, &presult, &done);

{
EXPECT_TRUE(buffer.get_batch(ctx).ok());
Expand Down Expand Up @@ -273,9 +286,11 @@ TEST_F(ArrowResultBlockBufferTest, TestErrorClose) {
ArrowFlightResultBlockBuffer buffer(TUniqueId(), &state, schema, buffer_size);
buffer.set_dependency(ins_id, dep);
PFetchArrowDataResult presult;

MockClosure done([&]() -> void { std::cout << "cb" << std::endl; });
std::shared_ptr<GetArrowResultBatchCtx> ctx = MockGetArrowResultBatchCtx::create_shared(
[&]() -> void { fail = true; }, [&]() -> void { close = true; },
[&]() -> void { data = true; }, &presult);
[&]() -> void { data = true; }, &presult, &done);

{
EXPECT_TRUE(buffer.get_batch(ctx).ok());
Expand Down Expand Up @@ -330,9 +345,11 @@ TEST_F(ArrowResultBlockBufferTest, TestArrowResultSerializeFailure) {
ArrowFlightResultBlockBuffer buffer(TUniqueId(), &state, schema, buffer_size);
buffer.set_dependency(ins_id, dep);
PFetchArrowDataResult presult;

MockClosure done([&]() -> void { std::cout << "cb" << std::endl; });
std::shared_ptr<GetArrowResultBatchCtx> ctx = MockGetArrowResultBatchCtx::create_shared(
[&]() -> void { fail = true; }, [&]() -> void { close = true; },
[&]() -> void { data = true; }, &presult);
[&]() -> void { data = true; }, &presult, &done);

{
auto num_rows = 2;
Expand Down
6 changes: 4 additions & 2 deletions be/test/vec/sink/get_result_batch_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ class GetResultBatchCtxTest : public ::testing::Test {

class MockClosure : public google::protobuf::Closure {
public:
MockClosure() {}
MockClosure(std::function<void()> cb) : _cb(cb) {}
void Run() override { _cb(); }

private:
std::function<void()> _cb;
};

Expand Down Expand Up @@ -126,7 +126,9 @@ TEST_F(GetResultBatchCtxTest, TestGetResultBatchCtx) {

TEST_F(GetResultBatchCtxTest, TestGetArrowResultBatchCtx) {
PFetchArrowDataResult result;
auto ctx = GetArrowResultBatchCtx::create_shared(&result);
MockClosure closure;
closure._cb = [&]() { std::cout << "cb" << std::endl; };
auto ctx = GetArrowResultBatchCtx::create_shared(&result, &closure);

{
// on_failure
Expand Down
Loading