miller/pkg/input/record_reader_dkvpx.go
John Kerl 91eaff1341
Lint round 5+6: staticcheck and errcheck to zero (#2130)
* refine the plan

* Fix all staticcheck lint findings (uncapped)

golangci-lint's default max-same-issues=3 was hiding most of the backlog:
the true pre-fix count was 69 staticcheck findings, not 34. This fixes all
of them, driving staticcheck to zero:

- ST1023/QF1011 (37): omit explicit types inferred from the RHS
- S1009/S1031 (15): drop redundant nil checks before len()/range
- SA9003 (9): remove comment-only empty branches, keeping the comments
- QF1007 (3): merge conditional assignment into declaration
- QF1006 (3): lift break conditions into loop conditions
- QF1001 (3): apply De Morgan's law / name the negated predicate

Also updates plans/lintfixes.md with the cap discovery and the corrected
errcheck picture (1202 uncapped, ~949 of them fmt.Fprint*).

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* Drive errcheck to zero: config for bulk categories, propagate real errors

Adds .golangci.yml with errcheck exclude-functions for fmt.Fprint* (usage
printers), (*bufio.Writer).Write/WriteString (sticky errors, surfaced at the
now-checked final Flush), and (*strings.Builder).WriteString; pins
max-issues-per-linter/max-same-issues to 0 so CI reports true counts.

Real error paths now propagate instead of being dropped:
- Finalize{Reader,Writer}Options in join/put/filter/split/tee and the
  repl/script entry points: 'mlr join -i badformat' now errors instead of
  silently using wrong separators
- final output-stream Flush in pkg/stream: write failure no longer exits 0
- DSL emit/print/dump redirect writes, matching their sibling branches
- CSV writer WriteCSVRecordMaybeColorized, close-time Flush in file output
  handlers, ENV[...] Setenv, REPL record-write and redirect-close errors
- termcvt write-side Close before rename (had "TODO: check return status")

The rest are deliberate ignores, marked with _ = and a comment where the
reason isn't obvious: unset-of-missing-path no-ops, read-side closes,
mid-stream FlushOnEveryRecord, init-time strftime registrations, in-memory
usage-capture pipes, and regtest-harness env/temp-file teardown.

golangci-lint now reports 0 issues on ./cmd/mlr ./pkg/... with all caps off.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

---------

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
2026-07-03 11:42:08 -04:00

185 lines
4.6 KiB
Go

// RecordReaderDKVPX reads DKVPX format: comma-delimited key=value pairs with
// CSV-style quoting. It uses the dkvpx package for parsing.
package input
import (
"fmt"
"io"
"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
}
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")
}
return &RecordReaderDKVPX{
readerOptions: readerOptions,
recordsPerBatch: recordsPerBatch,
}, 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 = ','
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
}