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

Jump to bottom

Fix the bounce buffer size in ORC writer #14947

Merged
merged 4 commits into from
Feb 7, 2024
Merged

Fix the bounce buffer size in ORC writer #14947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
527784e
fix
vuule Feb 1, 2024
7d6b882
test
vuule Feb 1, 2024
4373413
remove debug code
vuule Feb 1, 2024
6189c79
simplification
vuule Feb 1, 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
47 changes: 25 additions & 22 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 @@ -2346,29 +2346,20 @@ auto convert_table_to_orc_data(table_view const& input,
auto const padded_block_header_size =
util::round_up_unsafe<size_t>(block_header_size, compressed_block_align);

auto bounce_buffer = [&]() {
size_t max_stream_size = 0;
bool all_device_write = true;

for (auto& ss : strm_descs.host_view().flat_view()) {
if (!out_sink.is_device_write_preferred(ss.stream_size)) { all_device_write = false; }
size_t stream_size = ss.stream_size;
if (compression_kind != NONE) {
ss.first_block = num_compressed_blocks;
ss.bfr_offset = compressed_bfr_size;

auto num_blocks =
std::max<uint32_t>((stream_size + compression_blocksize - 1) / compression_blocksize, 1);
stream_size += num_blocks * block_header_size;
num_compressed_blocks += num_blocks;
compressed_bfr_size +=
(padded_block_header_size + padded_max_compressed_block_size) * num_blocks;
}
max_stream_size = std::max(max_stream_size, stream_size);
for (auto& ss : strm_descs.host_view().flat_view()) {
size_t stream_size = ss.stream_size;
if (compression_kind != NONE) {
ss.first_block = num_compressed_blocks;
ss.bfr_offset = compressed_bfr_size;

auto num_blocks =
std::max<uint32_t>((stream_size + compression_blocksize - 1) / compression_blocksize, 1);
stream_size += num_blocks * block_header_size;
num_compressed_blocks += num_blocks;
compressed_bfr_size +=
(padded_block_header_size + padded_max_compressed_block_size) * num_blocks;
}

return cudf::detail::pinned_host_vector<uint8_t>(all_device_write ? 0 : max_stream_size);
}();
}

// Compress the data streams
rmm::device_uvector<uint8_t> compressed_data(compressed_bfr_size, stream);
Expand Down Expand Up @@ -2399,6 +2390,18 @@ auto convert_table_to_orc_data(table_view const& input,
comp_results.device_to_host_sync(stream);
}

auto const max_out_stream_size = [&]() {
uint32_t max_stream_size = 0;
for (auto const& ss : strm_descs.host_view().flat_view()) {
if (!out_sink.is_device_write_preferred(ss.stream_size)) {
max_stream_size = std::max(max_stream_size, ss.stream_size);
}
}
return max_stream_size;
}();

cudf::detail::pinned_host_vector<uint8_t> bounce_buffer(max_out_stream_size);

auto intermediate_stats = gather_statistic_blobs(stats_freq, orc_table, segmentation, stream);

return std::tuple{std::move(enc_data),
Expand Down
16 changes: 16 additions & 0 deletions cpp/tests/io/orc_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2055,4 +2055,20 @@ TEST_F(OrcStatisticsTest, Empty)
EXPECT_EQ(ts6.count[0], 0);
}

TEST_F(OrcWriterTest, BounceBufferBug)
{
auto sequence = cudf::detail::make_counting_transform_iterator(0, [](auto i) { return i % 100; });

constexpr auto num_rows = 150000;
column_wrapper<int8_t, typename decltype(sequence)::value_type> col(sequence,
sequence + num_rows);
table_view expected({col});

auto filepath = temp_env->get_temp_filepath("BounceBufferBug.orc");
cudf::io::orc_writer_options out_opts =
cudf::io::orc_writer_options::builder(cudf::io::sink_info{filepath}, expected)
.compression(cudf::io::compression_type::ZSTD);
cudf::io::write_orc(out_opts);
}

CUDF_TEST_PROGRAM_MAIN()
Loading