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>
109 lines
4.1 KiB
Go
109 lines
4.1 KiB
Go
package stream
|
|
|
|
import (
|
|
"bufio"
|
|
"errors"
|
|
"io"
|
|
|
|
"github.com/johnkerl/miller/v6/pkg/cli"
|
|
"github.com/johnkerl/miller/v6/pkg/input"
|
|
"github.com/johnkerl/miller/v6/pkg/output"
|
|
"github.com/johnkerl/miller/v6/pkg/transformers"
|
|
"github.com/johnkerl/miller/v6/pkg/types"
|
|
)
|
|
|
|
// Since Go is concurrent, the context struct (AWK-like variables such as
|
|
// FILENAME, NF, NF, FNR, etc.) needs to be duplicated and passed through the
|
|
// channels along with each record.
|
|
//
|
|
// * Record-readers update FILENAME, FILENUM, NF, NR, FNR within context structs.
|
|
//
|
|
// * Record-transformers can read these from the context structs.
|
|
//
|
|
// * Record-writers don't need them (OPS et al. are already in the
|
|
// writer-options struct). However, we have chained transformers using the
|
|
// 'then' command-line syntax. This means a given transformer might be piping
|
|
// its output to a record-writer, or another transformer. So, the
|
|
// record-and-context pair goes to the record-writers even though they don't
|
|
// need the contexts.
|
|
|
|
// Stream is the high-level sketch of Miller. It coordinates instantiating
|
|
// format-specific record-reader and record-writer objects, using flags from
|
|
// the command line; setting up I/O channels; running the record stream from
|
|
// the record-reader object, through the specified chain of transformers
|
|
// (verbs), to the record-writer object.
|
|
func Stream(
|
|
// fileNames argument is separate from options.FileNames for in-place mode,
|
|
// which sends along only one file name per call to Stream():
|
|
fileNames []string,
|
|
options *cli.TOptions,
|
|
recordTransformers []transformers.RecordTransformer,
|
|
outputStream io.WriteCloser,
|
|
outputIsStdout bool,
|
|
) error {
|
|
|
|
// Since Go is concurrent, the context struct needs to be duplicated and
|
|
// passed through the channels along with each record.
|
|
initialContext := types.NewContext()
|
|
|
|
// Instantiate the record-reader.
|
|
// RecordsPerBatch is tracked separately from ReaderOptions since join/repl
|
|
// may use batch size of 1.
|
|
recordReader, err := input.Create(&options.ReaderOptions, options.ReaderOptions.RecordsPerBatch)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// Instantiate the record-writer
|
|
recordWriter, err := output.Create(&options.WriterOptions)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// Set up the reader-to-transformer and transformer-to-writer channels.
|
|
readerChannel := make(chan []*types.RecordAndContext, 2) // list of *types.RecordAndContext
|
|
writerChannel := make(chan []*types.RecordAndContext, 1) // list of *types.RecordAndContext
|
|
|
|
// We're done when a fatal error is registered on input (file not found,
|
|
// etc) or when the record-writer has written all its output. We use
|
|
// channels to communicate both of these conditions.
|
|
inputErrorChannel := make(chan error, 1)
|
|
doneWritingChannel := make(chan bool, 1)
|
|
dataProcessingErrorChannel := make(chan bool, 1)
|
|
|
|
// For mlr head, so a transformer can communicate it will disregard all
|
|
// further input. It writes this back upstream, and that is passed back to
|
|
// the record-reader which then stops reading input. This is necessary to
|
|
// get quick response from, for example, mlr head -n 10 on input files with
|
|
// millions or billions of records.
|
|
readerDownstreamDoneChannel := make(chan bool, 1)
|
|
|
|
// Start the reader, transformer, and writer. Let them run until fatal input
|
|
// error or end-of-processing happens.
|
|
bufferedOutputStream := bufio.NewWriter(outputStream)
|
|
|
|
go recordReader.Read(fileNames, *initialContext, readerChannel, inputErrorChannel, readerDownstreamDoneChannel)
|
|
go transformers.ChainTransformer(readerChannel, readerDownstreamDoneChannel, recordTransformers,
|
|
writerChannel, options)
|
|
go output.ChannelWriter(writerChannel, recordWriter, &options.WriterOptions, doneWritingChannel,
|
|
dataProcessingErrorChannel, bufferedOutputStream, outputIsStdout)
|
|
|
|
var retval error
|
|
done := false
|
|
for !done {
|
|
select {
|
|
case ierr := <-inputErrorChannel:
|
|
retval = ierr
|
|
case <-dataProcessingErrorChannel:
|
|
retval = errors.New("exiting due to data error") // details already printed
|
|
case <-doneWritingChannel:
|
|
done = true
|
|
}
|
|
}
|
|
|
|
if err := bufferedOutputStream.Flush(); err != nil && retval == nil {
|
|
retval = err
|
|
}
|
|
|
|
return retval
|
|
}
|