mirror of
https://github.com/johnkerl/miller.git
synced 2026-07-17 16:38:54 +00:00
The DKVPX record reader set dkvpxReader.Comma = ',' unconditionally,
ignoring the resolved --ifs value; the key-value separator '=' was
likewise hard-coded in the dkvpx parser, ignoring --ips. So e.g.
printf 'a=1;b=2\n' | mlr -i dkvpx --ifs semicolon --ojson cat
produced a single field {"a": "1;b=2"} instead of {"a": 1, "b": 2}.
Fixes:
* pkg/dkvpx.Reader gains an Equals field (default '=') alongside Comma.
* The DKVPX record reader now passes the resolved IFS/IPS through,
validating that each is a single character (mirroring the CSV
reader's "IFS can only be a single character" error) rather than
silently ignoring or truncating them.
* The DKVPX record writer already emitted OFS/OPS, but its quoting
decisions were based on the default separators, so with --ofs
semicolon a value containing ';' went out unquoted (ambiguous) while
a value containing ',' was quoted needlessly. Quoting now keys off
the actual OFS/OPS.
Adds unit tests, regression cases under test/cases/io-dkvpx/, and a
note in the separators reference table.
Discovered while investigating #369; tracked in #2170.
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
200 lines
5.2 KiB
Go
200 lines
5.2 KiB
Go
// RecordReaderDKVPX reads DKVPX format: IFS-delimited (default comma) key=value
|
|
// pairs (default pair separator "=") with CSV-style quoting. It uses the dkvpx
|
|
// package for parsing.
|
|
package input
|
|
|
|
import (
|
|
"fmt"
|
|
"io"
|
|
"unicode/utf8"
|
|
|
|
"github.com/johnkerl/miller/v6/pkg/cli"
|
|
"github.com/johnkerl/miller/v6/pkg/dkvpx"
|
|
"github.com/johnkerl/miller/v6/pkg/lib"
|
|
"github.com/johnkerl/miller/v6/pkg/mlrval"
|
|
"github.com/johnkerl/miller/v6/pkg/types"
|
|
)
|
|
|
|
type RecordReaderDKVPX struct {
|
|
readerOptions *cli.TReaderOptions
|
|
recordsPerBatch int64
|
|
ifs rune // The dkvpx reader requires single-character IFS
|
|
ips rune // The dkvpx reader requires single-character IPS
|
|
}
|
|
|
|
func NewRecordReaderDKVPX(
|
|
readerOptions *cli.TReaderOptions,
|
|
recordsPerBatch int64,
|
|
) (*RecordReaderDKVPX, error) {
|
|
if readerOptions.IRS != "\n" && readerOptions.IRS != "\r\n" {
|
|
return nil, fmt.Errorf("for DKVPX, IRS cannot be altered; LF vs CR/LF is autodetected")
|
|
}
|
|
if utf8.RuneCountInString(readerOptions.IFS) != 1 {
|
|
return nil, fmt.Errorf("for DKVPX, IFS can only be a single character")
|
|
}
|
|
if utf8.RuneCountInString(readerOptions.IPS) != 1 {
|
|
return nil, fmt.Errorf("for DKVPX, IPS can only be a single character")
|
|
}
|
|
ifs, _ := utf8.DecodeRuneInString(readerOptions.IFS)
|
|
ips, _ := utf8.DecodeRuneInString(readerOptions.IPS)
|
|
return &RecordReaderDKVPX{
|
|
readerOptions: readerOptions,
|
|
recordsPerBatch: recordsPerBatch,
|
|
ifs: ifs,
|
|
ips: ips,
|
|
}, nil
|
|
}
|
|
|
|
func (reader *RecordReaderDKVPX) Read(
|
|
filenames []string,
|
|
context types.Context,
|
|
readerChannel chan<- []*types.RecordAndContext,
|
|
errorChannel chan error,
|
|
downstreamDoneChannel <-chan bool,
|
|
) {
|
|
if filenames != nil {
|
|
if len(filenames) == 0 {
|
|
handle, err := lib.OpenStdin(
|
|
reader.readerOptions.Prepipe,
|
|
reader.readerOptions.PrepipeIsRaw,
|
|
reader.readerOptions.FileInputEncoding,
|
|
)
|
|
if err != nil {
|
|
errorChannel <- err
|
|
} else {
|
|
reader.processHandle(handle, "(stdin)", &context, readerChannel, errorChannel, downstreamDoneChannel)
|
|
}
|
|
} else {
|
|
for _, filename := range filenames {
|
|
handle, err := lib.OpenFileForRead(
|
|
filename,
|
|
reader.readerOptions.Prepipe,
|
|
reader.readerOptions.PrepipeIsRaw,
|
|
reader.readerOptions.FileInputEncoding,
|
|
)
|
|
if err != nil {
|
|
errorChannel <- err
|
|
} else {
|
|
reader.processHandle(handle, filename, &context, readerChannel, errorChannel, downstreamDoneChannel)
|
|
_ = handle.Close()
|
|
}
|
|
}
|
|
}
|
|
}
|
|
readerChannel <- types.NewEndOfStreamMarkerList(&context)
|
|
}
|
|
|
|
func (reader *RecordReaderDKVPX) processHandle(
|
|
handle io.Reader,
|
|
filename string,
|
|
context *types.Context,
|
|
readerChannel chan<- []*types.RecordAndContext,
|
|
errorChannel chan<- error,
|
|
downstreamDoneChannel <-chan bool,
|
|
) {
|
|
context.UpdateForStartOfFile(filename)
|
|
recordsPerBatch := reader.recordsPerBatch
|
|
|
|
dkvpxReader := dkvpx.NewReader(NewBOMStrippingReader(handle))
|
|
dkvpxReader.Comma = reader.ifs
|
|
dkvpxReader.Equals = reader.ips
|
|
if reader.readerOptions.CommentHandling != cli.CommentsAreData &&
|
|
len(reader.readerOptions.CommentString) == 1 {
|
|
dkvpxReader.Comment = rune(reader.readerOptions.CommentString[0])
|
|
}
|
|
|
|
dkvpxRecordsChannel := make(chan []*lib.OrderedMap[string], recordsPerBatch)
|
|
go channelizedDKVPXRecordScanner(dkvpxReader, dkvpxRecordsChannel, downstreamDoneChannel, errorChannel, recordsPerBatch)
|
|
|
|
for {
|
|
recordsAndContexts, eof := reader.getRecordBatch(dkvpxRecordsChannel, errorChannel, context)
|
|
if len(recordsAndContexts) > 0 {
|
|
readerChannel <- recordsAndContexts
|
|
}
|
|
if eof {
|
|
break
|
|
}
|
|
}
|
|
}
|
|
|
|
func channelizedDKVPXRecordScanner(
|
|
dkvpxReader *dkvpx.Reader,
|
|
dkvpxRecordsChannel chan<- []*lib.OrderedMap[string],
|
|
downstreamDoneChannel <-chan bool,
|
|
errorChannel chan<- error,
|
|
recordsPerBatch int64,
|
|
) {
|
|
i := int64(0)
|
|
done := false
|
|
|
|
dkvpxRecords := make([]*lib.OrderedMap[string], 0, recordsPerBatch)
|
|
|
|
for {
|
|
i++
|
|
|
|
dkvpxRecord, err := dkvpxReader.Read()
|
|
if lib.IsEOF(err) {
|
|
break
|
|
}
|
|
if err != nil {
|
|
errorChannel <- err
|
|
break
|
|
}
|
|
|
|
dkvpxRecords = append(dkvpxRecords, dkvpxRecord)
|
|
|
|
if i%recordsPerBatch == 0 {
|
|
select {
|
|
case <-downstreamDoneChannel:
|
|
done = true
|
|
break
|
|
default:
|
|
break
|
|
}
|
|
if done {
|
|
break
|
|
}
|
|
dkvpxRecordsChannel <- dkvpxRecords
|
|
dkvpxRecords = make([]*lib.OrderedMap[string], 0, recordsPerBatch)
|
|
}
|
|
|
|
if done {
|
|
break
|
|
}
|
|
}
|
|
dkvpxRecordsChannel <- dkvpxRecords
|
|
close(dkvpxRecordsChannel)
|
|
}
|
|
|
|
func (reader *RecordReaderDKVPX) getRecordBatch(
|
|
dkvpxRecordsChannel <-chan []*lib.OrderedMap[string],
|
|
errorChannel chan<- error,
|
|
context *types.Context,
|
|
) ([]*types.RecordAndContext, bool) {
|
|
recordsAndContexts := []*types.RecordAndContext{}
|
|
dedupeFieldNames := reader.readerOptions.DedupeFieldNames
|
|
|
|
dkvpxRecords, more := <-dkvpxRecordsChannel
|
|
if !more {
|
|
return recordsAndContexts, true
|
|
}
|
|
|
|
nfields := 0
|
|
for _, omap := range dkvpxRecords {
|
|
nfields += int(omap.FieldCount)
|
|
}
|
|
arena := mlrval.NewRecordArena(nfields)
|
|
|
|
for _, omap := range dkvpxRecords {
|
|
record := arena.NewRecord()
|
|
|
|
for pe := omap.Head; pe != nil; pe = pe.Next {
|
|
arena.PutDeferred(record, pe.Key, pe.Value, dedupeFieldNames)
|
|
}
|
|
|
|
context.UpdateForInputRecord()
|
|
recordsAndContexts = append(recordsAndContexts, types.NewRecordAndContext(record, context))
|
|
}
|
|
|
|
return recordsAndContexts, false
|
|
}
|