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>
127 lines
3.4 KiB
Go
127 lines
3.4 KiB
Go
package output
|
|
|
|
import (
|
|
"bufio"
|
|
"fmt"
|
|
"os"
|
|
|
|
"github.com/johnkerl/miller/v6/pkg/cli"
|
|
"github.com/johnkerl/miller/v6/pkg/types"
|
|
)
|
|
|
|
func ChannelWriter(
|
|
writerChannel <-chan []*types.RecordAndContext, // list of *types.RecordAndContext
|
|
recordWriter IRecordWriter,
|
|
writerOptions *cli.TWriterOptions,
|
|
doneChannel chan<- bool,
|
|
dataProcessingErrorChannel chan<- bool,
|
|
bufferedOutputStream *bufio.Writer,
|
|
outputIsStdout bool,
|
|
) {
|
|
|
|
for {
|
|
recordsAndContexts := <-writerChannel
|
|
done, errored := channelWriterHandleBatch(
|
|
recordsAndContexts,
|
|
recordWriter,
|
|
writerOptions,
|
|
dataProcessingErrorChannel,
|
|
bufferedOutputStream,
|
|
outputIsStdout,
|
|
)
|
|
if errored {
|
|
dataProcessingErrorChannel <- true
|
|
doneChannel <- true
|
|
break
|
|
}
|
|
if done {
|
|
doneChannel <- true
|
|
break
|
|
}
|
|
}
|
|
}
|
|
|
|
// TODO: comment
|
|
// Returns true on end of record stream
|
|
func channelWriterHandleBatch(
|
|
recordsAndContexts []*types.RecordAndContext,
|
|
recordWriter IRecordWriter,
|
|
writerOptions *cli.TWriterOptions,
|
|
dataProcessingErrorChannel chan<- bool,
|
|
bufferedOutputStream *bufio.Writer,
|
|
outputIsStdout bool,
|
|
) (done bool, errored bool) {
|
|
for _, recordAndContext := range recordsAndContexts {
|
|
// Three things can come through:
|
|
// * End-of-stream marker
|
|
// * Non-nil records to be printed
|
|
// * Strings to be printed from put/filter DSL print/dump/etc
|
|
// statements. They are handled here rather than fmt.Println directly
|
|
// in the put/filter handlers since we want all print statements and
|
|
// record-output to be in the same goroutine, for deterministic
|
|
// output ordering.
|
|
|
|
if !recordAndContext.EndOfStream {
|
|
record := recordAndContext.Record
|
|
context := &recordAndContext.Context
|
|
|
|
// XXX more
|
|
// XXX also make sure this results in exit 1 & goroutine cleanup
|
|
if writerOptions.FailOnDataError && record != nil {
|
|
ok := true
|
|
for pe := record.Head; pe != nil; pe = pe.Next {
|
|
if pe.Value.IsError() {
|
|
context := recordAndContext.Context
|
|
fmt.Fprintf(os.Stderr, "mlr: data error at NR=%d FNR=%d FILENAME=%s\n",
|
|
context.NR, context.FNR, context.FILENAME,
|
|
)
|
|
is, err := pe.Value.GetError()
|
|
if is {
|
|
if err != nil {
|
|
fmt.Fprintf(os.Stderr, "mlr: field %s: %v\n", pe.Key, err)
|
|
} else {
|
|
fmt.Fprintf(os.Stderr, "mlr: field %s\n", pe.Key)
|
|
}
|
|
ok = false
|
|
}
|
|
}
|
|
}
|
|
if !ok {
|
|
return true, true
|
|
}
|
|
}
|
|
|
|
if record != nil {
|
|
err := recordWriter.Write(record, context, bufferedOutputStream, outputIsStdout)
|
|
if err != nil {
|
|
fmt.Fprintf(os.Stderr, "mlr: %v\n", err)
|
|
return true, true
|
|
}
|
|
}
|
|
|
|
outputString := recordAndContext.OutputString
|
|
if outputString != "" {
|
|
bufferedOutputStream.WriteString(outputString)
|
|
}
|
|
|
|
if writerOptions.FlushOnEveryRecord {
|
|
// bufio.Writer errors are sticky; the final Flush in pkg/stream is checked
|
|
_ = bufferedOutputStream.Flush()
|
|
}
|
|
|
|
} else {
|
|
// Let the record-writers drain their output, if they have any
|
|
// queued up. For example, PPRINT needs to see all same-schema
|
|
// records before printing any, since it needs to compute max width
|
|
// down columns.
|
|
context := &recordAndContext.Context
|
|
err := recordWriter.Write(nil, context, bufferedOutputStream, outputIsStdout)
|
|
if err != nil {
|
|
fmt.Fprintf(os.Stderr, "mlr: %v\n", err)
|
|
return true, true
|
|
}
|
|
return true, false
|
|
}
|
|
}
|
|
return false, false
|
|
}
|