MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-11-08 21:24:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: S3 Select CSV -> JSON with variable field count (#15677)

Browse Source 
When there are fewer fields than expected, output fewer fields.
This commit is contained in:
Klaus Post
2022-09-13 02:00:59 +02:00
committed by GitHub
parent 4a92134235
commit c22f3ca7a8
2 changed files with 35 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/s3select/csv/record.go
View File

@@ -125,9 +125,11 @@ func (r *Record) WriteCSV(writer io.Writer, opts sql.WriteCSVOpts) error {
// WriteJSON - encodes to JSON data.
func (r *Record) WriteJSON(writer io.Writer) error {
var kvs jstream.KVS = make([]jstream.KV, len(r.columnNames))
for i := 0; i < len(r.columnNames); i++ {
kvs[i] = jstream.KV{Key: r.columnNames[i], Value: r.csvRecord[i]}
var kvs jstream.KVS = make([]jstream.KV, 0, len(r.columnNames))
for i, cn := range r.columnNames {
if i < len(r.csvRecord) {
kvs = append(kvs, jstream.KV{Key: cn, Value: r.csvRecord[i]})
}
}
return json.NewEncoder(writer).Encode(kvs)
}