Skip to content

Commit

Permalink
Fix cuco pair issue in hash join (#10195)
Browse files Browse the repository at this point in the history
This PR fixes the `cuCollections` pair issue via NVIDIA/cuCollections#138 thus we don't have to pass rvalues to `cuco::make_pair`.

Authors:
  - Yunsong Wang (https://github.com/PointKernel)

Approvers:
  - Paul Taylor (https://github.com/trxcllnt)
  - Vyas Ramasubramani (https://github.com/vyasr)

URL: #10195
  • Loading branch information
PointKernel authored Feb 3, 2022
1 parent 7d88a87 commit a10d24a
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion cpp/src/join/hash_join.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ class make_pair_function {
{
// Compute the hash value of row `i`
auto row_hash_value = remap_sentinel_hash(_hash(i), _empty_key_sentinel);
return cuco::make_pair<hash_value_type, size_type>(std::move(row_hash_value), std::move(i));
return cuco::make_pair(row_hash_value, i);
}

private:
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/join/mixed_join_semi.cu
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ struct make_pair_function_semi {
{
// The value is irrelevant since we only ever use the hash map to check for
// membership of a particular row index.
return cuco::make_pair<hash_value_type, size_type>(i, 0);
return cuco::make_pair(static_cast<hash_value_type>(i), 0);
}
};

Expand Down
2 changes: 1 addition & 1 deletion cpp/src/join/semi_join.cu
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ struct make_pair_function {
{
// The value is irrelevant since we only ever use the hash map to check for
// membership of a particular row index.
return cuco::make_pair<hash_value_type, size_type>(i, 0);
return cuco::make_pair(static_cast<hash_value_type>(i), 0);
}
};

Expand Down

0 comments on commit a10d24a

Please sign in to comment.