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>
215 lines
5.7 KiB
Go
215 lines
5.7 KiB
Go
package transformers
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"strings"
|
|
|
|
"github.com/johnkerl/miller/v6/pkg/cli"
|
|
"github.com/johnkerl/miller/v6/pkg/output"
|
|
"github.com/johnkerl/miller/v6/pkg/types"
|
|
)
|
|
|
|
const verbNameTee = "tee"
|
|
|
|
var TeeSetup = TransformerSetup{
|
|
Verb: verbNameTee,
|
|
UsageFunc: transformerTeeUsage,
|
|
ParseCLIFunc: transformerTeeParseCLI,
|
|
IgnoresInput: false,
|
|
}
|
|
|
|
func transformerTeeUsage(
|
|
o *os.File,
|
|
) {
|
|
fmt.Fprintf(o, "Usage: %s %s [options] {filename}\n", "mlr", verbNameTee)
|
|
fmt.Fprintf(o, "Options:\n")
|
|
fmt.Fprintf(o,
|
|
`-a Append to existing file, if any, rather than overwriting.
|
|
-p Treat filename as a pipe-to command.
|
|
Any of the output-format command-line flags (see mlr -h). Example: using
|
|
mlr --icsv --opprint put '...' then tee --ojson ./mytap.dat then stats1 ...
|
|
the input is CSV, the output is pretty-print tabular, but the tee-file output
|
|
is written in JSON format.
|
|
|
|
-h|--help Show this message.
|
|
`)
|
|
}
|
|
|
|
func transformerTeeParseCLI(
|
|
pargi *int,
|
|
argc int,
|
|
args []string,
|
|
mainOptions *cli.TOptions,
|
|
doConstruct bool, // false for first pass of CLI-parse, true for second pass
|
|
) (RecordTransformer, error) {
|
|
|
|
// Skip the verb name from the current spot in the mlr command line
|
|
argi := *pargi
|
|
argi++
|
|
|
|
filenameOrCommand := ""
|
|
appending := false
|
|
piping := false
|
|
// TODO: make sure this is a full nested-struct copy.
|
|
var localOptions *cli.TOptions = nil
|
|
if mainOptions != nil {
|
|
copyThereof := *mainOptions // struct copy
|
|
localOptions = ©Thereof
|
|
}
|
|
|
|
// Parse local flags.
|
|
|
|
for argi < argc /* variable increment: 1 or 2 depending on flag */ {
|
|
opt := args[argi]
|
|
if !strings.HasPrefix(opt, "-") {
|
|
break // No more flag options to process
|
|
}
|
|
if args[argi] == "--" {
|
|
break // All transformers must do this so main-flags can follow verb-flags
|
|
}
|
|
argi++
|
|
|
|
switch opt {
|
|
case "-h", "--help":
|
|
transformerTeeUsage(os.Stdout)
|
|
return nil, cli.ErrHelpRequested
|
|
|
|
case "-a":
|
|
appending = true
|
|
piping = false
|
|
|
|
case "-p":
|
|
appending = false
|
|
piping = true
|
|
|
|
default:
|
|
// This is inelegant. For error-proofing we advance argi already in our
|
|
// loop (so individual if-statements don't need to). However,
|
|
// ParseWriterOptions expects it unadvanced.
|
|
largi := argi - 1
|
|
if cli.FLAG_TABLE.Parse(args, argc, &largi, localOptions) {
|
|
// This lets mlr main and mlr tee have different output formats.
|
|
// Nothing else to handle here.
|
|
argi = largi
|
|
} else {
|
|
os.Exit(1)
|
|
}
|
|
}
|
|
}
|
|
|
|
if err := cli.FinalizeWriterOptions(&localOptions.WriterOptions); err != nil {
|
|
return nil, cli.VerbErrorf(verbNameTee, "%v", err)
|
|
}
|
|
|
|
// Get the filename/command from the command line, after the flags
|
|
if argi >= argc {
|
|
return nil, cli.VerbErrorf(verbNameTee, "filename or command required")
|
|
}
|
|
filenameOrCommand = args[argi]
|
|
argi++
|
|
|
|
*pargi = argi
|
|
if !doConstruct { // All transformers must do this for main command-line parsing
|
|
return nil, nil
|
|
}
|
|
|
|
transformer, err := NewTransformerTee(
|
|
appending,
|
|
piping,
|
|
filenameOrCommand,
|
|
&localOptions.WriterOptions,
|
|
)
|
|
if err != nil {
|
|
// Error message already printed out
|
|
os.Exit(1)
|
|
}
|
|
|
|
return transformer, nil
|
|
}
|
|
|
|
type TransformerTee struct {
|
|
filenameOrCommandForDisplay string
|
|
fileOutputHandler *output.FileOutputHandler
|
|
}
|
|
|
|
func NewTransformerTee(
|
|
appending bool,
|
|
piping bool,
|
|
filenameOrCommand string,
|
|
recordWriterOptions *cli.TWriterOptions,
|
|
) (*TransformerTee, error) {
|
|
var fileOutputHandler *output.FileOutputHandler
|
|
var err error
|
|
var filenameOrCommandForDisplay string
|
|
if piping {
|
|
fileOutputHandler, err = output.NewPipeWriteOutputHandler(filenameOrCommand, recordWriterOptions)
|
|
filenameOrCommandForDisplay = "| " + filenameOrCommand
|
|
} else if appending {
|
|
fileOutputHandler, err = output.NewFileAppendOutputHandler(filenameOrCommand, recordWriterOptions)
|
|
filenameOrCommandForDisplay = ">> " + filenameOrCommand
|
|
} else {
|
|
fileOutputHandler, err = output.NewFileWriteOutputHandler(filenameOrCommand, recordWriterOptions)
|
|
filenameOrCommandForDisplay = "> " + filenameOrCommand
|
|
}
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return &TransformerTee{
|
|
filenameOrCommandForDisplay: filenameOrCommandForDisplay,
|
|
fileOutputHandler: fileOutputHandler,
|
|
}, nil
|
|
}
|
|
|
|
func (tr *TransformerTee) Transform(
|
|
inrecAndContext *types.RecordAndContext,
|
|
outputRecordsAndContexts *[]*types.RecordAndContext, // list of *types.RecordAndContext
|
|
inputDownstreamDoneChannel <-chan bool,
|
|
outputDownstreamDoneChannel chan<- bool,
|
|
) {
|
|
|
|
// If we receive a downstream-done flag from a transformer downstream from
|
|
// us, read it to unblock their goroutine but -- unlike most other verbs --
|
|
// do not forward the flag farther upstream.
|
|
//
|
|
// For example, 'mlr cut -f foo then head -n 10' on million-line input:
|
|
// head can signal it's got 10 records, then write downStreamDone <- true,
|
|
// then cut and record-reader can stop sending any more data. This makes
|
|
// the UX response for head on huge files.
|
|
//
|
|
// But 'mlr cut -f foo then tee bar.txt then head -n 10' -- one does expect
|
|
// bar.txt to have all the output from cut.
|
|
select {
|
|
case <-inputDownstreamDoneChannel:
|
|
// Do not write this to the coutputDownstreamDoneChannel, as other transformers do
|
|
break
|
|
default:
|
|
break
|
|
}
|
|
|
|
if !inrecAndContext.EndOfStream {
|
|
err := tr.fileOutputHandler.WriteRecordAndContext(inrecAndContext)
|
|
if err != nil {
|
|
fmt.Fprintf(
|
|
os.Stderr,
|
|
"%s: error writing to tee \"%s\":\n",
|
|
"mlr", tr.filenameOrCommandForDisplay,
|
|
)
|
|
os.Exit(1)
|
|
}
|
|
|
|
*outputRecordsAndContexts = append(*outputRecordsAndContexts, inrecAndContext)
|
|
} else {
|
|
err := tr.fileOutputHandler.Close()
|
|
if err != nil {
|
|
fmt.Fprintf(
|
|
os.Stderr,
|
|
"%s: error closing tee \"%s\":\n",
|
|
"mlr", tr.filenameOrCommandForDisplay,
|
|
)
|
|
os.Exit(1)
|
|
}
|
|
*outputRecordsAndContexts = append(*outputRecordsAndContexts, inrecAndContext)
|
|
}
|
|
}
|