Skip to content

ARROW-14908: [C++][R] Dataset hash join segfaults on Windows #12339

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

Closed
wjones127 wants to merge 8 commits into from
Closed

ARROW-14908: [C++][R] Dataset hash join segfaults on Windows #12339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6de51fd
Add failing test
wjones127 Feb 4, 2022
507050b
Add failing DCHECK
wjones127 Feb 9, 2022
763d1d7
Create test that should fail across platforms
wjones127 Feb 9, 2022
a61b7a4
Add one to thread count
wjones127 Feb 11, 2022
0418acf
Fix formatting
wjones127 Feb 11, 2022
8da2b1c
Apply suggestions from code review
wjones127 Feb 11, 2022
3ce1e7f
Use withr to change options
wjones127 Feb 11, 2022
20c38d6
Apply suggestions from code review
wjones127 Feb 14, 2022
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: 2 additions & 1 deletion cpp/src/arrow/compute/exec/hash_join.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ class HashJoinBasicImpl : public HashJoinImpl {
filter_ = std::move(filter);
output_batch_callback_ = std::move(output_batch_callback);
finished_callback_ = std::move(finished_callback);
local_states_.resize(num_threads);
local_states_.resize(num_threads + 1); // +1 for calling thread + worker threads
for (size_t i = 0; i < local_states_.size(); ++i) {
local_states_[i].is_initialized = false;
local_states_[i].is_has_match_initialized = false;
Expand Down Expand Up @@ -151,6 +151,7 @@ class HashJoinBasicImpl : public HashJoinImpl {
}

void InitLocalStateIfNeeded(size_t thread_index) {
DCHECK_LT(thread_index, local_states_.size());
ThreadLocalState& local_state = local_states_[thread_index];
if (!local_state.is_initialized) {
InitEncoder(0, HashJoinProjection::KEY, &local_state.exec_batch_keys);
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/arrow/compute/exec/hash_join_dict.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,7 +566,7 @@ Status HashJoinDictBuildMulti::PostDecode(
}

void HashJoinDictProbeMulti::Init(size_t num_threads) {
local_states_.resize(num_threads);
local_states_.resize(num_threads + 1); // +1 for calling thread + worker threads
for (size_t i = 0; i < local_states_.size(); ++i) {
local_states_[i].is_initialized = false;
}
Expand Down
20 changes: 20 additions & 0 deletions r/tests/testthat/test-dplyr-join.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,3 +249,23 @@ test_that("arrow dplyr query correctly filters then joins", {
)
)
})


test_that("arrow dplyr query can join with tibble", {
# ARROW-14908
dir_out <- tempdir()
write_dataset(iris, file.path(dir_out, "iris"))
species_codes <- data.frame(
Species = c("setosa", "versicolor", "virginica"),
code = c("SET", "VER", "VIR")
)

withr::with_options(
list(arrow.use_threads = FALSE),
{
iris <- open_dataset(file.path(dir_out, "iris"))
res <- left_join(iris, species_codes) %>% collect() # We should not segfault here.
expect_equal(nrow(res), 150)
}
)
})