mirror of
https://github.com/johnkerl/miller.git
synced 2026-07-17 16:38:54 +00:00
* 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>
110 lines
3.2 KiB
Go
110 lines
3.2 KiB
Go
package output
|
|
|
|
import (
|
|
"bufio"
|
|
"fmt"
|
|
"strings"
|
|
|
|
csv "github.com/johnkerl/miller/v6/pkg/go-csv"
|
|
|
|
"github.com/johnkerl/miller/v6/pkg/cli"
|
|
"github.com/johnkerl/miller/v6/pkg/mlrval"
|
|
"github.com/johnkerl/miller/v6/pkg/types"
|
|
)
|
|
|
|
type RecordWriterCSV struct {
|
|
writerOptions *cli.TWriterOptions
|
|
csvWriter *csv.Writer
|
|
needToPrintHeader bool
|
|
firstRecordKeys []string
|
|
firstRecordNF int64
|
|
quoteAll bool // For double-quote around all fields
|
|
// fieldsBuffer is a reusable scratch slice for the stringified field values
|
|
// of the record currently being written. WriteCSVRecordMaybeColorized
|
|
// consumes it synchronously and does not retain it, and the writer processes
|
|
// one record at a time, so a single buffer can be shared across records to
|
|
// avoid a per-record allocation.
|
|
fieldsBuffer []string
|
|
}
|
|
|
|
func NewRecordWriterCSV(writerOptions *cli.TWriterOptions) (*RecordWriterCSV, error) {
|
|
if len(writerOptions.OFS) != 1 {
|
|
return nil, fmt.Errorf("for CSV, OFS can only be a single character")
|
|
}
|
|
if writerOptions.ORS != "\n" && writerOptions.ORS != "\r\n" {
|
|
return nil, fmt.Errorf("for CSV, ORS cannot be altered")
|
|
}
|
|
writer := &RecordWriterCSV{
|
|
writerOptions: writerOptions,
|
|
csvWriter: nil, // will be set on first Write() wherein we have the output stream
|
|
needToPrintHeader: !writerOptions.HeaderlessOutput,
|
|
firstRecordKeys: nil,
|
|
firstRecordNF: -1,
|
|
quoteAll: writerOptions.CSVQuoteAll,
|
|
}
|
|
return writer, nil
|
|
}
|
|
|
|
func (writer *RecordWriterCSV) Write(
|
|
outrec *mlrval.Mlrmap,
|
|
_ *types.Context,
|
|
bufferedOutputStream *bufio.Writer,
|
|
outputIsStdout bool,
|
|
) error {
|
|
if outrec == nil {
|
|
// End of record stream: nothing special for this output format
|
|
return nil
|
|
}
|
|
|
|
if writer.csvWriter == nil {
|
|
writer.csvWriter = csv.NewWriter(bufferedOutputStream)
|
|
writer.csvWriter.Comma = rune(writer.writerOptions.OFS[0]) // xxx temp -- needs length-1 OFS
|
|
}
|
|
|
|
if writer.firstRecordKeys == nil {
|
|
writer.firstRecordKeys = outrec.GetKeys()
|
|
writer.firstRecordNF = int64(len(writer.firstRecordKeys))
|
|
}
|
|
|
|
if writer.needToPrintHeader {
|
|
fields := make([]string, outrec.FieldCount)
|
|
i := 0
|
|
for pe := outrec.Head; pe != nil; pe = pe.Next {
|
|
fields[i] = pe.Key
|
|
i++
|
|
}
|
|
err := writer.WriteCSVRecordMaybeColorized(fields, bufferedOutputStream, outputIsStdout, true, writer.quoteAll)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
writer.needToPrintHeader = false
|
|
}
|
|
|
|
outputNF := outrec.FieldCount
|
|
if outputNF < writer.firstRecordNF {
|
|
outputNF = writer.firstRecordNF
|
|
}
|
|
|
|
if int64(cap(writer.fieldsBuffer)) < outputNF {
|
|
writer.fieldsBuffer = make([]string, outputNF)
|
|
}
|
|
fields := writer.fieldsBuffer[:outputNF]
|
|
var i int64 = 0
|
|
for pe := outrec.Head; pe != nil; pe = pe.Next {
|
|
if i < writer.firstRecordNF && pe.Key != writer.firstRecordKeys[i] {
|
|
return fmt.Errorf(
|
|
"CSV schema change: first keys \"%s\"; current keys \"%s\"",
|
|
strings.Join(writer.firstRecordKeys, writer.writerOptions.OFS),
|
|
strings.Join(outrec.GetKeys(), writer.writerOptions.OFS),
|
|
)
|
|
}
|
|
fields[i] = pe.Value.String()
|
|
i++
|
|
}
|
|
|
|
for ; i < outputNF; i++ {
|
|
fields[i] = ""
|
|
}
|
|
|
|
return writer.WriteCSVRecordMaybeColorized(fields, bufferedOutputStream, outputIsStdout, false, writer.quoteAll)
|
|
}
|