From 549bacef2811e09138ea0563c8239a8c029c0812 Mon Sep 17 00:00:00 2001 From: Nghia Truong Date: Tue, 9 Jan 2024 21:41:37 -0800 Subject: [PATCH] Rename variable --- cpp/src/io/orc/reader_impl_preprocess.cu | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cpp/src/io/orc/reader_impl_preprocess.cu b/cpp/src/io/orc/reader_impl_preprocess.cu index 690dbcbd19a..179afa12bd5 100644 --- a/cpp/src/io/orc/reader_impl_preprocess.cu +++ b/cpp/src/io/orc/reader_impl_preprocess.cu @@ -588,7 +588,7 @@ void aggregate_child_meta(std::size_t level, cudf::io::orc::detail::column_hierarchy const& selected_columns, cudf::detail::host_2dspan chunks, cudf::detail::host_2dspan row_groups, - host_span list_col, + host_span nested_cols, host_span out_buffers, reader_column_meta& col_meta) { @@ -618,7 +618,7 @@ void aggregate_child_meta(std::size_t level, int index = 0; // number of child column processed // For each parent column, update its child column meta for each stripe. - std::for_each(list_col.begin(), list_col.end(), [&](auto const p_col) { + std::for_each(nested_cols.begin(), nested_cols.end(), [&](auto const p_col) { auto const parent_col_idx = col_meta.orc_col_map[level][p_col.id]; auto start_row = 0; auto processed_row_groups = 0; @@ -750,7 +750,7 @@ void reader::impl::prepare_data(uint64_t skip_rows, auto& columns_level = _selected_columns.levels[level]; // Association between each ORC column and its cudf::column col_meta.orc_col_map.emplace_back(_metadata.get_num_cols(), -1); - std::vector nested_col; + std::vector nested_cols; // Get a list of column data types std::vector column_types; @@ -775,7 +775,7 @@ void reader::impl::prepare_data(uint64_t skip_rows, // Map each ORC column to its column col_meta.orc_col_map[level][col.id] = column_types.size() - 1; if (col_type == type_id::LIST or col_type == type_id::STRUCT) { - nested_col.emplace_back(col); + nested_cols.emplace_back(col); } } @@ -1022,13 +1022,13 @@ void reader::impl::prepare_data(uint64_t skip_rows, _stream, _mr); - if (nested_col.size()) { + if (nested_cols.size()) { // Extract information to process nested child columns scan_null_counts(chunks, null_count_prefix_sums[level], _stream); row_groups.device_to_host_sync(_stream); aggregate_child_meta( - level, _selected_columns, chunks, row_groups, nested_col, _out_buffers[level], col_meta); + level, _selected_columns, chunks, row_groups, nested_cols, _out_buffers[level], col_meta); // ORC stores number of elements at each row, so we need to generate offsets from that std::vector buff_data;