Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GH-39456: [Go][Parquet] Arrow DATE64 Type Coerced to Parquet DATE Logical Type #39460

Merged
merged 2 commits into from
Jan 9, 2024
Merged

GH-39456: [Go][Parquet] Arrow DATE64 Type Coerced to Parquet DATE Logical Type #39460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f856cc4
[Go][Parquet] Arrow DATE64 type is coerced into Parquet TIMESTAMP[ms]…
Jan 5, 2024
c1207da
Clearer variable names in test
Jan 5, 2024
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
84 changes: 84 additions & 0 deletions go/parquet/pqarrow/encode_arrow_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,52 @@ func makeDateTimeTypesTable(mem memory.Allocator, expected bool, addFieldMeta bo
return array.NewTable(arrsc, cols, int64(len(isValid)))
}

func makeDateTypeTable(mem memory.Allocator, expected bool, partialDays bool) arrow.Table {
const (
millisPerHour int64 = 1000 * 60 * 60
millisPerDay int64 = millisPerHour * 24
)
isValid := []bool{true, true, true, false, true, true}

var field arrow.Field
if expected {
field = arrow.Field{Name: "date", Type: arrow.FixedWidthTypes.Date32, Nullable: true}
} else {
field = arrow.Field{Name: "date", Type: arrow.FixedWidthTypes.Date64, Nullable: true}
}

field.Metadata = arrow.NewMetadata([]string{"PARQUET:field_id"}, []string{"1"})

arrsc := arrow.NewSchema([]arrow.Field{field}, nil)

d32Values := []arrow.Date32{1489269000, 1489270000, 1489271000, 1489272000, 1489272000, 1489273000}

d64Values := make([]arrow.Date64, len(d32Values))
for i := range d64Values {
// Calculate number of milliseconds at date boundary
d64Values[i] = arrow.Date64(int64(d32Values[i]) * millisPerDay)
if partialDays {
// Offset 1 or more hours past the date boundary
hoursIntoDay := int64(i) * millisPerHour
d64Values[i] += arrow.Date64(hoursIntoDay)
}
}

bldr := array.NewRecordBuilder(mem, arrsc)
defer bldr.Release()

if expected {
bldr.Field(0).(*array.Date32Builder).AppendValues(d32Values, isValid)
} else {
bldr.Field(0).(*array.Date64Builder).AppendValues(d64Values, isValid)
}

rec := bldr.NewRecord()
defer rec.Release()

return array.NewTableFromRecords(arrsc, []arrow.Record{rec})
}

func TestWriteArrowCols(t *testing.T) {
mem := memory.NewCheckedAllocator(memory.DefaultAllocator)
defer mem.AssertSize(t, 0)
Expand Down Expand Up @@ -831,6 +877,44 @@ func (ps *ParquetIOTestSuite) TestDateTimeTypesWithInt96ReadWriteTable() {
}
}

func (ps *ParquetIOTestSuite) TestDate64ReadWriteTable() {
mem := memory.NewCheckedAllocator(memory.DefaultAllocator)
defer mem.AssertSize(ps.T(), 0)

date64InputTable := makeDateTypeTable(mem, false, false)
defer date64InputTable.Release()
buf := writeTableToBuffer(ps.T(), mem, date64InputTable, date64InputTable.NumRows(), pqarrow.NewArrowWriterProperties(pqarrow.WithAllocator(mem)))
defer buf.Release()

reader := ps.createReader(mem, buf.Bytes())
roundTripOutputTable := ps.readTable(reader)
defer roundTripOutputTable.Release()

date32ExpectedOutputTable := makeDateTypeTable(mem, true, false)
defer date32ExpectedOutputTable.Release()

ps.Truef(array.TableEqual(date32ExpectedOutputTable, roundTripOutputTable), "expected table: %s\ngot table: %s", date32ExpectedOutputTable, roundTripOutputTable)
}

func (ps *ParquetIOTestSuite) TestDate64ReadWriteTableWithPartialDays() {
mem := memory.NewCheckedAllocator(memory.DefaultAllocator)
defer mem.AssertSize(ps.T(), 0)

date64InputTableNotAlignedToDateBoundary := makeDateTypeTable(mem, false, true)
defer date64InputTableNotAlignedToDateBoundary.Release()
buf := writeTableToBuffer(ps.T(), mem, date64InputTableNotAlignedToDateBoundary, date64InputTableNotAlignedToDateBoundary.NumRows(), pqarrow.NewArrowWriterProperties(pqarrow.WithAllocator(mem)))
defer buf.Release()

reader := ps.createReader(mem, buf.Bytes())
roundTripOutputTable := ps.readTable(reader)
defer roundTripOutputTable.Release()

date32ExpectedOutputTable := makeDateTypeTable(mem, true, true)
defer date32ExpectedOutputTable.Release()

ps.Truef(array.TableEqual(date32ExpectedOutputTable, roundTripOutputTable), "expected table: %s\ngot table: %s", date32ExpectedOutputTable, roundTripOutputTable)
}

func (ps *ParquetIOTestSuite) TestLargeBinaryReadWriteTable() {
mem := memory.NewCheckedAllocator(memory.DefaultAllocator)
defer mem.AssertSize(ps.T(), 0)
Expand Down
4 changes: 2 additions & 2 deletions go/parquet/pqarrow/schema.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,8 +326,8 @@ func fieldToNode(name string, field arrow.Field, props *parquet.WriterProperties
typ = parquet.Types.Int32
logicalType = schema.DateLogicalType{}
case arrow.DATE64:
typ = parquet.Types.Int64
logicalType = schema.NewTimestampLogicalType(true, schema.TimeUnitMillis)
typ = parquet.Types.Int32
logicalType = schema.DateLogicalType{}
case arrow.TIMESTAMP:
typ, logicalType, err = getTimestampMeta(field.Type.(*arrow.TimestampType), props, arrprops)
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion go/parquet/pqarrow/schema_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ func TestConvertArrowFlatPrimitives(t *testing.T) {
arrowFields = append(arrowFields, arrow.Field{Name: "date", Type: arrow.FixedWidthTypes.Date32, Nullable: false})

parquetFields = append(parquetFields, schema.Must(schema.NewPrimitiveNodeLogical("date64", parquet.Repetitions.Required,
schema.NewTimestampLogicalType(true, schema.TimeUnitMillis), parquet.Types.Int64, 0, -1)))
schema.DateLogicalType{}, parquet.Types.Int32, 0, -1)))
arrowFields = append(arrowFields, arrow.Field{Name: "date64", Type: arrow.FixedWidthTypes.Date64, Nullable: false})

parquetFields = append(parquetFields, schema.Must(schema.NewPrimitiveNodeLogical("time32", parquet.Repetitions.Required,
Expand Down