Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions cpp/src/parquet/metadata.cc
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,20 @@ class ColumnChunkMetaData::ColumnChunkMetaDataImpl {
possible_encoded_stats_ = nullptr;
possible_geo_stats_ = nullptr;
InitKeyValueMetadata();

// A column with max_definition_level == 0 cannot contain null values, so
// a non-zero null_count in its statistics is contradictory. Drop the bad
// value so the file remains readable.
if (descr_->max_definition_level() == 0 && column_metadata_->__isset.statistics &&
column_metadata_->statistics.__isset.null_count &&
column_metadata_->statistics.null_count > 0) {
if (column_metadata_ != &decrypted_metadata_) {
decrypted_metadata_ = *column_metadata_;
column_metadata_ = &decrypted_metadata_;
}
decrypted_metadata_.statistics.null_count = 0;
decrypted_metadata_.statistics.__isset.null_count = false;
}
}

bool Equals(const ColumnChunkMetaDataImpl& other) const {
Expand Down
39 changes: 39 additions & 0 deletions cpp/src/parquet/metadata_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -427,6 +427,45 @@ TEST(Metadata, TestReadPageIndex) {
}
}

// A column with max_definition_level == 0 cannot encode nulls, so a positive
// null_count is contradictory. The reader should drop the bad null_count and
// still load the metadata.
TEST(Metadata, SanitizesRequiredColumnWithNonZeroNullCount) {
schema::NodeVector fields;
fields.push_back(schema::Int32("required_col", Repetition::REQUIRED));
auto schema_node = std::static_pointer_cast<schema::GroupNode>(
schema::GroupNode::Make("schema", Repetition::REQUIRED, fields));

SchemaDescriptor schema_descr;
schema_descr.Init(schema_node);

format::ColumnChunk column_chunk;
format::ColumnMetaData& column_metadata = column_chunk.meta_data;
column_chunk.__isset.meta_data = true;

column_metadata.type = format::Type::INT32;
column_metadata.codec = format::CompressionCodec::UNCOMPRESSED;
column_metadata.num_values = 1000;
column_metadata.total_uncompressed_size = 4000;
column_metadata.total_compressed_size = 4000;
column_metadata.data_page_offset = 4;
column_metadata.path_in_schema.push_back("required_col");

column_metadata.statistics.null_count = 105;
column_metadata.statistics.__isset.null_count = true;
column_metadata.__isset.statistics = true;

ApplicationVersion writer_version("parquet-cpp-arrow version 1.0.0");
std::unique_ptr<ColumnChunkMetaData> col_meta;
ASSERT_NO_THROW(
col_meta = ColumnChunkMetaData::Make(&column_chunk, schema_descr.Column(0),
default_reader_properties(), &writer_version));

auto stats = col_meta->statistics();
ASSERT_NE(stats, nullptr);
EXPECT_FALSE(stats->HasNullCount());
}

TEST(Metadata, TestSortingColumns) {
schema::NodeVector fields;
fields.push_back(schema::Int32("sort_col", Repetition::REQUIRED));
Expand Down
Loading