fix empty reduce with list output type and non-list input type

Signed-off-by: sperlingxx <[email protected]>
rapidsai · Mar 15, 2022 · 909ef19 · 909ef19
1 parent 4596244
commit 909ef19
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 0 deletions.
diff --git a/cpp/src/reductions/reductions.cpp b/cpp/src/reductions/reductions.cpp
@@ -134,8 +134,17 @@ std::unique_ptr<scalar> reduce(
   // handcraft the default scalar with input column.
   if (col.size() <= col.null_count()) {
     if (col.type().id() == type_id::EMPTY || col.type() != output_dtype) {
+      // Under some circumstance, the output type will become the List of input type,
+      // such as: collect_list or collect_set. So, we have to handcraft the default scalar.
+      if (output_dtype.id() == type_id::LIST) {
+        auto scalar = make_list_scalar(empty_like(col)->view(), stream, mr);
+        scalar->set_valid_async(false, stream);
+        return scalar;
+      }
+
       return make_default_constructed_scalar(output_dtype, stream, mr);
     }
+
     return make_empty_scalar_like(col, stream, mr);
   }
 

diff --git a/cpp/tests/reductions/collect_ops_tests.cpp b/cpp/tests/reductions/collect_ops_tests.cpp
@@ -325,4 +325,29 @@ TEST_F(CollectTest, CollectStrings)
   CUDF_TEST_EXPECT_COLUMNS_EQUAL(expected7, dynamic_cast<list_scalar*>(ret7.get())->view());
 }
 
+TEST_F(CollectTest, CollectEmptys)
+{
+  using int_col = cudf::test::fixed_width_column_wrapper<int32_t>;
+
+  // test collect empty columns
+  auto empty = int_col{};
+  auto ret   = cudf::reduce(
+    empty, make_collect_list_aggregation<reduce_aggregation>(), data_type{type_id::LIST});
+  CUDF_TEST_EXPECT_COLUMNS_EQUAL(int_col{}, dynamic_cast<list_scalar*>(ret.get())->view());
+
+  ret = cudf::reduce(
+    empty, make_collect_set_aggregation<reduce_aggregation>(), data_type{type_id::LIST});
+  CUDF_TEST_EXPECT_COLUMNS_EQUAL(int_col{}, dynamic_cast<list_scalar*>(ret.get())->view());
+
+  // test collect all null columns
+  auto all_nulls = int_col{{1, 2, 3, 4, 5}, {0, 0, 0, 0, 0}};
+  ret            = cudf::reduce(
+    all_nulls, make_collect_list_aggregation<reduce_aggregation>(), data_type{type_id::LIST});
+  CUDF_TEST_EXPECT_COLUMNS_EQUAL(int_col{}, dynamic_cast<list_scalar*>(ret.get())->view());
+
+  ret = cudf::reduce(
+    all_nulls, make_collect_set_aggregation<reduce_aggregation>(), data_type{type_id::LIST});
+  CUDF_TEST_EXPECT_COLUMNS_EQUAL(int_col{}, dynamic_cast<list_scalar*>(ret.get())->view());
+}
+
 }  // namespace cudf::test