felipecrv commented on code in PR #34408:
URL: https://github.com/apache/arrow/pull/34408#discussion_r1126517948
##########
cpp/src/arrow/array/array_test.cc:
##########
@@ -482,35 +524,45 @@ void AssertAppendScalar(MemoryPool* pool, const
std::shared_ptr<Scalar>& scalar)
std::unique_ptr<arrow::ArrayBuilder> builder;
auto null_scalar = MakeNullScalar(scalar->type);
ASSERT_OK(MakeBuilderExactIndex(pool, scalar->type, &builder));
- ASSERT_OK(builder->AppendScalar(*scalar));
- ASSERT_OK(builder->AppendScalar(*scalar));
- ASSERT_OK(builder->AppendScalar(*null_scalar));
- ASSERT_OK(builder->AppendScalars({scalar, null_scalar}));
- ASSERT_OK(builder->AppendScalar(*scalar, /*n_repeats=*/2));
- ASSERT_OK(builder->AppendScalar(*null_scalar, /*n_repeats=*/2));
+ ASSERT_OK(builder->AppendScalar(*scalar)); // [0] = scalar
+ ASSERT_OK(builder->AppendScalar(*scalar)); // [1] = scalar
+ ASSERT_OK(builder->AppendScalar(*null_scalar)); // [2] = NULL
+ ASSERT_OK(builder->AppendScalars({scalar, null_scalar})); // [3, 4] =
{scalar, NULL}
+ ASSERT_OK(
+ builder->AppendScalar(*scalar, /*n_repeats=*/2)); // [5, 6] = {scalar,
scalar}
+ ASSERT_OK(
+ builder->AppendScalar(*null_scalar, /*n_repeats=*/2)); // [7, 8] =
{NULL, NULL}
std::shared_ptr<Array> out;
FinishAndCheckPadding(builder.get(), &out);
ASSERT_OK(out->ValidateFull());
AssertTypeEqual(scalar->type, out->type());
ASSERT_EQ(out->length(), 9);
- const bool can_check_nulls = internal::HasValidityBitmap(out->type()->id());
+ auto out_type_id = out->type()->id();
+ const bool has_validity = internal::HasValidityBitmap(out_type_id);
// For a dictionary builder, the output dictionary won't necessarily be the
same
- const bool can_check_values = !is_dictionary(out->type()->id());
+ const bool can_check_values = !is_dictionary(out_type_id);
- if (can_check_nulls) {
+ if (has_validity) {
ASSERT_EQ(out->null_count(), 4);
+ } else {
+ ASSERT_EQ(out->null_count(), 0);
+ }
+ if (scalar->is_valid) {
+ ASSERT_EQ(out->ComputeLogicalNullCount(), 4);
+ } else {
+ ASSERT_EQ(out->ComputeLogicalNullCount(), 9);
}
for (const auto index : {0, 1, 3, 5, 6}) {
- ASSERT_FALSE(out->IsNull(index));
+ ASSERT_FALSE(out->IsNull(index) && scalar->is_valid);
Review Comment:
Changed locally. Pushing soon.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
