Skip to content
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

Remove unused variable and fix memory issue in ORC writer #12984

Merged
merged 6 commits into from
Mar 23, 2023
Merged

Remove unused variable and fix memory issue in ORC writer #12984

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b43de26
Fix unused variables
ttnghia Mar 21, 2023
001e113
Revert "Fix unused variables"
ttnghia Mar 22, 2023
8dfa60a
Fix dangling pointer
ttnghia Mar 22, 2023
59d1c8b
Make variable const
ttnghia Mar 22, 2023
bae96ae
Reverse ConfigureCUDA.cmake
ttnghia Mar 22, 2023
d505fd9
Merge branch 'branch-23.04' into fix_orc_writer
ttnghia Mar 22, 2023
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
29 changes: 16 additions & 13 deletions cpp/src/io/orc/writer_impl.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,8 +594,6 @@ void build_dictionaries(orc_table_view& orc_table,
bool enable_dictionary,
rmm::cuda_stream_view stream)
{
const auto num_rowgroups = dict.size().first;

for (size_t dict_idx = 0; dict_idx < orc_table.num_string_columns(); ++dict_idx) {
auto& str_column = orc_table.string_column(dict_idx);
str_column.attach_stripe_dict(stripe_dict.base_host_ptr(), stripe_dict.base_device_ptr());
Expand Down Expand Up @@ -2206,6 +2204,7 @@ std::tuple<orc_streams,
hostdevice_2dvector<gpu::StripeStream>,
encoded_data,
file_segmentation,
hostdevice_2dvector<gpu::StripeDictionary>,
std::vector<StripeInformation>,
orc_table_view,
rmm::device_buffer,
Expand All @@ -2227,7 +2226,8 @@ convert_table_to_orc_data(table_view const& input,

auto orc_table = make_orc_table_view(input, *input_tview, table_meta, stream);

auto const pd_masks = init_pushdown_null_masks(orc_table, stream);
// This is unused but it holds memory buffers for later access thus needs to be kept alive.
[[maybe_unused]] auto const pd_masks = init_pushdown_null_masks(orc_table, stream);

auto rowgroup_bounds = calculate_rowgroup_bounds(orc_table, row_index_stride, stream);

Expand Down Expand Up @@ -2297,6 +2297,7 @@ convert_table_to_orc_data(table_view const& input,
std::move(strm_descs),
std::move(enc_data),
std::move(segmentation),
std::move(stripe_dict),
std::move(stripes),
std::move(orc_table),
rmm::device_buffer{}, // compressed_data
Expand Down Expand Up @@ -2382,6 +2383,7 @@ convert_table_to_orc_data(table_view const& input,
std::move(strm_descs),
std::move(enc_data),
std::move(segmentation),
std::move(stripe_dict),
std::move(stripes),
std::move(orc_table),
std::move(compressed_data),
Expand Down Expand Up @@ -2454,16 +2456,17 @@ void writer::impl::write(table_view const& input)
// is still intact.
// Note that `out_sink_` is intentionally passed by const reference to prevent accidentally
// writing anything to it.
auto [streams,
comp_results,
strm_descs,
enc_data,
segmentation,
stripes,
orc_table,
compressed_data,
intermediate_stats,
stream_output] = [&] {
[[maybe_unused]] auto [streams,
comp_results,
strm_descs,
enc_data,
segmentation,
stripe_dict, /* unused, but its data will be accessed via pointer later */
stripes,
orc_table,
compressed_data,
intermediate_stats,
stream_output] = [&] {
try {
return convert_table_to_orc_data(input,
*table_meta,
Expand Down