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
37 changes: 37 additions & 0 deletions parquet/metadata/statistics_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -603,3 +603,40 @@ func TestBooleanStatisticsUpdateFromBitmapSpaced(t *testing.T) {
assert.Equal(t, int64(8), stats.NullCount())
})
}

func TestNewStatisticsDistinctCountUnset(t *testing.T) {
// Issue #806: factories must not pre-set hasDistinctCount, otherwise
// Encode() emits distinct_count=0 for every column instead of leaving the
// optional Thrift field absent. IncDistinct() is responsible for marking
// it set when an actual distinct count is computed.
mk := func(n *schema.PrimitiveNode) metadata.TypedStatistics {
col := schema.NewColumn(n, 0, 0)
return metadata.NewStatistics(col, memory.DefaultAllocator)
}
cases := []struct {
name string
s metadata.TypedStatistics
}{
{"Int32", mk(schema.NewInt32Node("i32", parquet.Repetitions.Required, -1))},
{"Int64", mk(schema.NewInt64Node("i64", parquet.Repetitions.Required, -1))},
{"Float32", mk(schema.NewFloat32Node("f32", parquet.Repetitions.Required, -1))},
{"Float64", mk(schema.NewFloat64Node("f64", parquet.Repetitions.Required, -1))},
{"Boolean", mk(schema.NewBooleanNode("b", parquet.Repetitions.Required, -1))},
{"ByteArray", mk(schema.NewByteArrayNode("ba", parquet.Repetitions.Required, -1))},
}
for _, c := range cases {
t.Run(c.name, func(t *testing.T) {
assert.False(t, c.s.HasDistinctCount(), "fresh stats must not advertise a distinct count")
enc, err := c.s.Encode()
require.NoError(t, err)
assert.False(t, enc.HasDistinctCount, "encoded stats must leave distinct_count unset until IncDistinct is called")

c.s.IncDistinct(3)
assert.True(t, c.s.HasDistinctCount())
enc, err = c.s.Encode()
require.NoError(t, err)
assert.True(t, enc.HasDistinctCount)
assert.Equal(t, int64(3), enc.DistinctCount)
})
}
}
99 changes: 45 additions & 54 deletions parquet/metadata/statistics_types.gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion parquet/metadata/statistics_types.gen.go.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ func New{{.Name}}Statistics(descr *schema.Column, mem memory.Allocator) *{{.Name
statistics: statistics{
descr: descr,
hasNullCount: true,
hasDistinctCount: true,
order: descr.SortOrder(),
encoder: encoding.NewEncoder(descr.PhysicalType(), parquet.Encodings.Plain, false, descr, mem),
mem: mem,
Expand Down
8 changes: 4 additions & 4 deletions parquet/pqarrow/file_writer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,8 @@ func TestFileWriterTotalBytes(t *testing.T) {
require.NoError(t, writer.Close())

// Verify total bytes & compressed bytes are correct
assert.Equal(t, int64(340), writer.TotalCompressedBytes())
assert.Equal(t, int64(799), writer.TotalBytesWritten())
assert.Equal(t, int64(332), writer.TotalCompressedBytes())
assert.Equal(t, int64(783), writer.TotalBytesWritten())
}

func TestFileWriterTotalBytesBuffered(t *testing.T) {
Expand Down Expand Up @@ -205,8 +205,8 @@ func TestFileWriterTotalBytesBuffered(t *testing.T) {
require.NoError(t, writer.Close())

// Verify total bytes & compressed bytes are correct
assert.Equal(t, int64(494), writer.TotalCompressedBytes())
assert.Equal(t, int64(1139), writer.TotalBytesWritten())
assert.Equal(t, int64(482), writer.TotalCompressedBytes())
assert.Equal(t, int64(1115), writer.TotalBytesWritten())
}

func TestWriteOnClosedFileWriter(t *testing.T) {
Expand Down
Loading