From 0a809424127df157e27f44e1f64e5169ee6cd815 Mon Sep 17 00:00:00 2001 From: Kumar Aatish Date: Wed, 24 Mar 2021 21:13:21 -0400 Subject: [PATCH] PR review fixes --- cpp/src/io/orc/orc_gpu.h | 7 +++++++ cpp/src/io/orc/writer_impl.cu | 16 +++++----------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/cpp/src/io/orc/orc_gpu.h b/cpp/src/io/orc/orc_gpu.h index f3d889f3667..55df0adf95b 100644 --- a/cpp/src/io/orc/orc_gpu.h +++ b/cpp/src/io/orc/orc_gpu.h @@ -313,6 +313,13 @@ void EncodeStripeDictionaries(StripeDictionary *stripes, detail::device_2dspan enc_streams, rmm::cuda_stream_view stream = rmm::cuda_stream_default); +/** + * @brief Set leaf column element of EncChunk + * + * @param[in] view table device view representing input table + * @param[in,out] chunks encoder chunk device array [column][rowgroup] + * @param[in] stream CUDA stream to use, default `rmm::cuda_stream_default` + */ void set_chunk_columns(const table_device_view &view, detail::device_2dspan chunks, rmm::cuda_stream_view stream); diff --git a/cpp/src/io/orc/writer_impl.cu b/cpp/src/io/orc/writer_impl.cu index dd3330973f2..cb75698fd8d 100644 --- a/cpp/src/io/orc/writer_impl.cu +++ b/cpp/src/io/orc/writer_impl.cu @@ -130,9 +130,7 @@ class orc_column_view { _type_width(_is_string_type ? 0 : cudf::size_of(col.type())), _data_count(col.size()), _null_count(col.null_count()), - _data(col.head() + col.offset() * _type_width), _nulls(col.null_mask()), - _column_offset(col.offset()), _clockscale(to_clockscale(col.type().id())), _type_kind(to_orc_type(col.type().id())) { @@ -184,9 +182,7 @@ class orc_column_view { size_t data_count() const noexcept { return _data_count; } size_t null_count() const noexcept { return _null_count; } bool nullable() const noexcept { return (_nulls != nullptr); } - // void const *data() const noexcept { return _data; } uint32_t const *nulls() const noexcept { return _nulls; } - // size_type column_offset() const noexcept { return _column_offset; } uint8_t clockscale() const noexcept { return _clockscale; } void set_orc_encoding(ColumnEncodingKind e) { _encoding_kind = e; } @@ -200,13 +196,11 @@ class orc_column_view { size_t _str_id = 0; bool _is_string_type = false; - size_t _type_width = 0; - size_t _data_count = 0; - size_t _null_count = 0; - void const *_data = nullptr; - uint32_t const *_nulls = nullptr; - size_type _column_offset = 0; - uint8_t _clockscale = 0; + size_t _type_width = 0; + size_t _data_count = 0; + size_t _null_count = 0; + uint32_t const *_nulls = nullptr; + uint8_t _clockscale = 0; // ORC-related members std::string _name{};