Skip to content

GH-44526: [C++][Acero] Fix crash when thread in asof_join is not running #44584

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
zanmato1984 merged 6 commits into from
Nov 11, 2024
Merged

GH-44526: [C++][Acero] Fix crash when thread in asof_join is not running #44584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a6a9495
Check if process_thread_ is running before attempting to join
mroz45 Oct 30, 2024
e858e4f
Fixed format
mroz45 Oct 30, 2024
8572038
Test with invalid plan
mroz45 Oct 31, 2024
bf5b9e5
Lint
mroz45 Nov 6, 2024
c541a8a
Update cpp/src/arrow/acero/asof_join_node_test.cc
mroz45 Nov 6, 2024
00dabd6
Update asof_join_node_test.cc
zanmato1984 Nov 9, 2024
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: 3 additions & 1 deletion cpp/src/arrow/acero/asof_join_node.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1136,7 +1136,9 @@ class AsofJoinNode : public ExecNode {
virtual ~AsofJoinNode() {
#ifdef ARROW_ENABLE_THREADING
PushProcess(false);
process_thread_.join();
if (process_thread_.joinable()) {
process_thread_.join();
}
#endif
}

Expand Down
31 changes: 31 additions & 0 deletions cpp/src/arrow/acero/asof_join_node_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1732,5 +1732,36 @@ TEST(AsofJoinTest, RhsEmptinessRaceEmptyBy) {
AssertExecBatchesEqualIgnoringOrder(result.schema, {exp_batch}, result.batches);
}

// Reproduction of GH-44526: Provoke destruction of not started asofjoin node by providing
// a sink that fails on creation
TEST(AsofJoinTest, DestroyNonStartedAsofJoinNode) {
auto left_batch = ExecBatchFromJSON({int64()}, R"([[1], [2], [3]])");
auto right_batch =
ExecBatchFromJSON({utf8(), int64()}, R"([["Z", 2], ["B", 3], ["A", 4]])");

Declaration left{"exec_batch_source",
ExecBatchSourceNodeOptions(schema({field("on", int64())}),
{std::move(left_batch)})};
Declaration right{
"exec_batch_source",
ExecBatchSourceNodeOptions(schema({field("colVals", utf8()), field("on", int64())}),
{std::move(right_batch)})};
AsofJoinNodeOptions asof_join_opts({{{"on"}, {}}, {{"on"}, {}}}, 1);
Declaration asof_join{
"asofjoin", {std::move(left), std::move(right)}, std::move(asof_join_opts)};

// Setting invalid arguments, such as nullptr in generator or schema in SinkNodeOptions,
// causes the execution plan to terminate before the asofjoin node is started.
arrow::acero::SinkNodeOptions sink_node_options{/*generator=*/nullptr,
/*schema=*/nullptr};
auto sink = Declaration::Sequence({asof_join, {"sink", sink_node_options}});

EXPECT_RAISES_WITH_MESSAGE_THAT(
Invalid,
::testing::HasSubstr(
"`generator` is a required SinkNode option and cannot be null"),
DeclarationToStatus(std::move(sink)));
}

} // namespace acero
} // namespace arrow