Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
Signed-off-by: sperlingxx <[email protected]>
  • Loading branch information
sperlingxx committed May 25, 2021
1 parent 747f0f9 commit 5b5f452
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
3 changes: 1 addition & 2 deletions cpp/src/rolling/rolling_collect_list.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ std::unique_ptr<column> rolling_collect_list(column_view const& input,
PrecedingIter preceding_begin_raw,
FollowingIter following_begin_raw,
size_type min_periods,
rolling_aggregation const& agg,
null_policy null_handling,
rmm::cuda_stream_view stream,
rmm::mr::device_memory_resource* mr)
{
Expand Down Expand Up @@ -321,7 +321,6 @@ std::unique_ptr<column> rolling_collect_list(column_view const& input,

// If gather_map collects null elements, and null_policy == EXCLUDE,
// those elements must be filtered out, and offsets recomputed.
auto null_handling = dynamic_cast<collect_list_aggregation const&>(agg)._null_handling;
if (null_handling == null_policy::EXCLUDE && input.has_nulls()) {
auto num_child_nulls = count_child_nulls(input, gather_map, stream);
if (num_child_nulls != 0) {
Expand Down
6 changes: 3 additions & 3 deletions cpp/src/rolling/rolling_detail.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -687,7 +687,7 @@ class rolling_aggregation_postprocessor final : public cudf::detail::aggregation
preceding_window_begin,
following_window_begin,
min_periods,
agg,
agg._null_handling,
stream,
mr);
}
Expand All @@ -700,7 +700,7 @@ class rolling_aggregation_postprocessor final : public cudf::detail::aggregation
preceding_window_begin,
following_window_begin,
min_periods,
agg,
agg._null_handling,
stream,
mr);

Expand Down Expand Up @@ -953,7 +953,7 @@ struct dispatch_rolling {
{
// do any preprocessing of aggregations (eg, MIN -> ARGMIN, COLLECT_LIST -> nothing)
rolling_aggregation_preprocessor preprocessor;
auto preprocessed_aggs = agg.get_simple_aggregations(input.type(), preprocessor);
auto preprocessed_aggs = agg.get_simple_aggregations( input.type(), preprocessor);
CUDF_EXPECTS(preprocessed_aggs.size() <= 1,
"Encountered a non-trivial rolling aggregation result");

Expand Down

0 comments on commit 5b5f452

Please sign in to comment.