mirror of
https://github.com/minio/minio.git
synced 2025-11-20 01:50:24 -05:00
Rebase minio/parquet-go and fix null handling. (#7067)
This commit is contained in:
4
vendor/github.com/minio/parquet-go/column.go
generated
vendored
4
vendor/github.com/minio/parquet-go/column.go
generated
vendored
@@ -71,7 +71,9 @@ func getColumns(
|
||||
valueType: meta.GetType(),
|
||||
}
|
||||
|
||||
nameIndexMap[columnName] = colIndex
|
||||
// First element of []*parquet.SchemaElement from parquet file metadata is 'schema'
|
||||
// which is always skipped, hence colIndex + 1 is valid.
|
||||
nameIndexMap[columnName] = colIndex + 1
|
||||
}
|
||||
|
||||
for name := range nameColumnMap {
|
||||
|
||||
11
vendor/github.com/minio/parquet-go/decode.go
generated
vendored
11
vendor/github.com/minio/parquet-go/decode.go
generated
vendored
@@ -194,6 +194,8 @@ func readDoubles(reader *bytes.Reader, count uint64) (result []float64, err erro
|
||||
|
||||
func readByteArrays(reader *bytes.Reader, count uint64) (result [][]byte, err error) {
|
||||
buf := make([]byte, 4)
|
||||
var length uint32
|
||||
var data []byte
|
||||
|
||||
var i uint64
|
||||
for i = 0; i < count; i++ {
|
||||
@@ -201,9 +203,12 @@ func readByteArrays(reader *bytes.Reader, count uint64) (result [][]byte, err er
|
||||
return nil, err
|
||||
}
|
||||
|
||||
data := make([]byte, bytesToUint32(buf))
|
||||
if _, err = reader.Read(data); err != nil {
|
||||
return nil, err
|
||||
length = bytesToUint32(buf)
|
||||
data = make([]byte, length)
|
||||
if length > 0 {
|
||||
if _, err = reader.Read(data); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
|
||||
result = append(result, data)
|
||||
|
||||
6
vendor/vendor.json
vendored
6
vendor/vendor.json
vendored
@@ -698,10 +698,10 @@
|
||||
"revisionTime": "2018-11-15T04:56:45Z"
|
||||
},
|
||||
{
|
||||
"checksumSHA1": "LQSZ9jpJwWrfqKGiBnw+qjRtwRE=",
|
||||
"checksumSHA1": "pxgHNx36gpRdhSqtaE5fqp7lrAA=",
|
||||
"path": "github.com/minio/parquet-go",
|
||||
"revision": "84e7daee0cea0bf82d1d15795dcea0f7bcd508c9",
|
||||
"revisionTime": "2018-12-30T03:24:02Z"
|
||||
"revision": "1014bfb4d0e323e3fbf6683e3519a98b0721f5cc",
|
||||
"revisionTime": "2019-01-14T09:43:57Z"
|
||||
},
|
||||
{
|
||||
"checksumSHA1": "N4WRPw4p3AN958RH/O53kUsJacQ=",
|
||||
|
||||
Reference in New Issue
Block a user