Skip to content

Commit

Permalink
PR review fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
kaatish committed Mar 25, 2021
1 parent 7ae3587 commit 0a80942
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 11 deletions.
7 changes: 7 additions & 0 deletions cpp/src/io/orc/orc_gpu.h
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,13 @@ void EncodeStripeDictionaries(StripeDictionary *stripes,
detail::device_2dspan<encoder_chunk_streams> 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<EncChunk> chunks,
rmm::cuda_stream_view stream);
Expand Down
16 changes: 5 additions & 11 deletions cpp/src/io/orc/writer_impl.cu
Original file line number Diff line number Diff line change
Expand Up @@ -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<uint8_t>() + col.offset() * _type_width),
_nulls(col.null_mask()),
_column_offset(col.offset()),
_clockscale(to_clockscale<uint8_t>(col.type().id())),
_type_kind(to_orc_type(col.type().id()))
{
Expand Down Expand Up @@ -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; }
Expand All @@ -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{};
Expand Down

0 comments on commit 0a80942

Please sign in to comment.