@@ -1394,6 +1394,7 @@ class TypedColumnWriterImpl : public ColumnWriterImpl,
13941394 MaybeCalculateValidityBits (AddIfNotNull (def_levels, offset), batch_size,
13951395 &batch_num_values, &batch_num_spaced_values,
13961396 &null_count);
1397+ const int64_t total_null_count = batch_size - batch_num_values;
13971398
13981399 WriteLevelsSpaced (batch_size, AddIfNotNull (def_levels, offset),
13991400 AddIfNotNull (rep_levels, offset));
@@ -1407,8 +1408,8 @@ class TypedColumnWriterImpl : public ColumnWriterImpl,
14071408 valid_bits_offset + value_offset, /* num_levels=*/ batch_size,
14081409 null_count);
14091410 }
1410- CommitWriteAndCheckPageLimit (batch_size, batch_num_spaced_values, null_count,
1411- check_page);
1411+ CommitWriteAndCheckPageLimit (batch_size, batch_num_spaced_values,
1412+ total_null_count, check_page);
14121413 value_offset += batch_num_spaced_values;
14131414
14141415 // Dictionary size checked separately from data page size since we
@@ -1750,7 +1751,8 @@ class TypedColumnWriterImpl : public ColumnWriterImpl,
17501751 internal::DefLevelsToBitmap (def_levels, batch_size, level_info_, &io);
17511752 *out_values_to_write = io.values_read - io.null_count ;
17521753 *out_spaced_values_to_write = io.values_read ;
1753- *null_count = io.null_count ;
1754+ // io.null_count excludes nulls from repeated ancestors.
1755+ *null_count = batch_size - *out_values_to_write;
17541756 }
17551757
17561758 Result<std::shared_ptr<Array>> MaybeReplaceValidity (std::shared_ptr<Array> array,
@@ -2038,6 +2040,7 @@ Status TypedColumnWriterImpl<ParquetType>::WriteArrowDictionary(
20382040 // had so we need to recompute it from def levels.
20392041 MaybeCalculateValidityBits (AddIfNotNull (def_levels, offset), batch_size,
20402042 &batch_num_values, &batch_num_spaced_values, &null_count);
2043+ const int64_t total_null_count = batch_size - batch_num_values;
20412044 WriteLevelsSpaced (batch_size, AddIfNotNull (def_levels, offset),
20422045 AddIfNotNull (rep_levels, offset));
20432046 std::shared_ptr<Array> writeable_indices =
@@ -2051,7 +2054,8 @@ Status TypedColumnWriterImpl<ParquetType>::WriteArrowDictionary(
20512054 dict_encoder->PutIndices (*writeable_indices);
20522055 // Update unencoded byte array data size to size statistics
20532056 UpdateUnencodedDataBytes ();
2054- CommitWriteAndCheckPageLimit (batch_size, batch_num_values, null_count, check_page);
2057+ CommitWriteAndCheckPageLimit (batch_size, batch_num_values, total_null_count,
2058+ check_page);
20552059 value_offset += batch_num_spaced_values;
20562060 };
20572061
0 commit comments