Skip to content

Commit

Permalink
Another fix for offsets_end() iterator in lists_column_view (rapidsai…
Browse files Browse the repository at this point in the history
…#7575)

This is another fix for `offsets_end()` iterator in lists_column_view. The last fix (rapidsai#7551) was still not correct---that iterator should not be computed using the size of the `offsets()` child column, which is also the offsets of the original (non-sliced) column. Instead, it should be computed using the `size()` of the current column.

Interestingly, my previous fix passed all the unit tests, since thrust does not throw anything (like access violation) when the input range is larger than the output range.

Authors:
  - Nghia Truong (@ttnghia)

Approvers:
  - Jake Hemstad (@jrhemstad)
  - David (@davidwendt)

URL: rapidsai#7575
  • Loading branch information
ttnghia authored and hyperbolic2346 committed Mar 23, 2021
1 parent 5752ad3 commit e9e70c1
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions cpp/include/cudf/lists/lists_column_view.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,16 @@ class lists_column_view : private column_view {
}

/**
* @brief Return one past the last offset
* @brief Return pointer to the position that is one past the last offset
*
* This function return the position that is one past the last offset of the lists column.
* Since the current lists column may be a sliced column, this offsets_end() iterator should not
* be computed using the size of the offsets() child column, which is also the offsets of the
* entire original (non-sliced) lists column.
*
* @return int32_t const* Pointer to one past the last offset
*/
offset_iterator offsets_end() const noexcept { return offsets_begin() + offsets().size(); }
offset_iterator offsets_end() const noexcept { return offsets_begin() + size() + 1; }
};
/** @} */ // end of group
} // namespace cudf

0 comments on commit e9e70c1

Please sign in to comment.