mirror of
https://github.com/johnkerl/miller.git
synced 2026-07-17 16:38:54 +00:00
When a transformer fails mid-stream (e.g. join -s with a malformed left file), the error could be lost, yielding exit 0 with no stderr message: - runSingleTransformerBatch forwarded the end-of-stream marker downstream before runSingleTransformer sent the error to dataProcessingErrorChannel, so the record-writer could finish and signal done-writing while the error was still unsent. - Even with the error buffered, stream.Stream's select loop chooses among simultaneously-ready channels at random, and exiting on the done-writing signal dropped the buffered error. Send the error before forwarding the end-of-stream marker (so it is always buffered before the writer can finish), and drain the error channels after the select loop exits. Observed as a one-off Windows CI failure of test/cases/verb-join/left-file-malformed-sorted, where the same case passed on automatic rerun within the same job. Reproduced locally by widening the deschedule window with a sleep between the end-of-stream forward and the error send: 5/5 runs exited 0 with empty stderr; with this fix, 200/200 runs exit 1 with the expected message even with adversarial delays injected on both sides of the end-of-stream forward. Follow-up to the os.Exit-removal refactor (plans/exit.md, #2204/#2205). Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
132 lines
4.9 KiB
Go
132 lines
4.9 KiB
Go
package stream
|
|
|
|
import (
|
|
"bufio"
|
|
"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. The
|
|
// dataProcessingErrorChannel carries mid-stream errors from the
|
|
// transformer chain (e.g. DSL runtime errors, tee/split write failures)
|
|
// and from the record-writer; senders use a non-blocking send, so the
|
|
// first error wins and is returned once the writer finishes draining.
|
|
inputErrorChannel := make(chan error, 1)
|
|
doneWritingChannel := make(chan bool, 1)
|
|
dataProcessingErrorChannel := make(chan error, 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, dataProcessingErrorChannel, 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 derr := <-dataProcessingErrorChannel:
|
|
retval = derr
|
|
case <-doneWritingChannel:
|
|
done = true
|
|
}
|
|
}
|
|
|
|
// An error and the done-writing signal can be ready simultaneously, and
|
|
// select chooses among ready channels at random -- so an error may still
|
|
// be sitting in a buffer when the loop above exits. Senders guarantee the
|
|
// error is buffered before the end-of-stream marker that lets the writer
|
|
// finish, so a final non-blocking drain is sufficient to pick it up.
|
|
if retval == nil {
|
|
select {
|
|
case ierr := <-inputErrorChannel:
|
|
retval = ierr
|
|
default:
|
|
}
|
|
}
|
|
if retval == nil {
|
|
select {
|
|
case derr := <-dataProcessingErrorChannel:
|
|
retval = derr
|
|
default:
|
|
}
|
|
}
|
|
|
|
if err := bufferedOutputStream.Flush(); err != nil && retval == nil {
|
|
retval = err
|
|
}
|
|
|
|
return retval
|
|
}
|