mirror of
https://github.com/johnkerl/miller.git
synced 2026-07-17 16:38:54 +00:00
Phase 3 of plans/exit.md: the streaming-interface change, the load-bearing piece for #341 (DSL exit statement) and #440 (strict mode). - RecordTransformer.Transform and RecordTransformerFunc now return error. All 69 Transform implementations and their dispatch helpers updated (mechanical rewrite, compiler- and errcheck-verified). - runSingleTransformerBatch, on a Transform error, forwards any output produced before the failure plus an end-of-stream marker downstream, so the rest of the chain and the record-writer drain and finish cleanly; runSingleTransformer then surfaces the error to stream.Stream's select loop (non-blocking send; first error wins) and signals upstream-done so the record-reader stops. This is exactly the flush-then-exit sequencing a future DSL 'exit N' needs. - dataProcessingErrorChannel and FileOutputHandler.recordErroredChannel are now chan error instead of chan bool; ChannelWriter still prints write- error details at the site and sends the 'exiting due to data error' sentinel, preserving the exact stderr shape pinned by regression cases. - Mid-stream os.Exit sites converted to returned errors: put/filter DSL begin/main/end-block errors and the non-boolean filter-expression case, tee write/close failures, split write/open/close failures, join left-file ingest failures (both half-streaming and sorted paths, with full error plumbing through JoinBucketKeeper), histogram/stats2 ingest errors, surv fit errors, and step stepper allocation (tStepperAllocator now returns (tStepper, error); bad EWMA coefficients propagate; negative slwin parameters are reported by the CLI parser via the existing bad-stepper-name pattern). - The two genuinely internal join-bucket-keeper states now use lib.InternalCodingErrorWithMessageIf instead of hand-rolled print+exit. - pkg/transformers is now os.Exit-free. Behavior notes: the non-boolean filter message gains the standard 'mlr: ' prefix and a newline (it previously printed with neither); tee errors now include the underlying cause. All 4779 regression cases pass unchanged; mlr head early-out latency is unaffected (0.02s over 50M records). Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
228 lines
6.3 KiB
Go
228 lines
6.3 KiB
Go
package transformers
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"strings"
|
|
|
|
"github.com/johnkerl/miller/v6/pkg/cli"
|
|
"github.com/johnkerl/miller/v6/pkg/mlrval"
|
|
"github.com/johnkerl/miller/v6/pkg/types"
|
|
)
|
|
|
|
const verbNameFillDown = "fill-down"
|
|
|
|
var fillDownOptions = []OptionSpec{
|
|
{Flag: "--all", Type: "bool", Desc: "Operate on all fields in the input."},
|
|
{Flag: "-a", Aliases: []string{"--only-if-absent"}, Type: "bool", Desc: "If a given record has a missing value for a given field, fill that from the corresponding value from a previous record, if any. By default, a 'missing' field either is absent, or has the empty-string value. With -a, a field is 'missing' only if it is absent."},
|
|
{Flag: "-f", Arg: "{a,b,c}", Type: "csv-list", Desc: "Field names for fill-down."},
|
|
}
|
|
|
|
var FillDownSetup = TransformerSetup{
|
|
Verb: verbNameFillDown,
|
|
UsageFunc: transformerFillDownUsage,
|
|
ParseCLIFunc: transformerFillDownParseCLI,
|
|
IgnoresInput: false,
|
|
Options: fillDownOptions,
|
|
}
|
|
|
|
func transformerFillDownUsage(
|
|
o *os.File,
|
|
) {
|
|
fmt.Fprintf(o, "Usage: %s %s [options]\n", "mlr", verbNameFillDown)
|
|
fmt.Fprintln(o, "If a given record has a missing value for a given field, fill that from")
|
|
fmt.Fprintln(o, "the corresponding value from a previous record, if any.")
|
|
fmt.Fprintln(o, "By default, a 'missing' field either is absent, or has the empty-string value.")
|
|
fmt.Fprintln(o, "With -a, a field is 'missing' only if it is absent.")
|
|
fmt.Fprintln(o, "")
|
|
WriteVerbOptions(o, fillDownOptions)
|
|
}
|
|
|
|
func transformerFillDownParseCLI(
|
|
pargi *int,
|
|
argc int,
|
|
args []string,
|
|
_ *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
|
|
verb := args[argi]
|
|
argi++
|
|
|
|
var fillDownFieldNames []string = nil
|
|
doAll := false
|
|
onlyIfAbsent := false
|
|
|
|
var err error
|
|
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":
|
|
transformerFillDownUsage(os.Stdout)
|
|
return nil, cli.ErrHelpRequested
|
|
|
|
case "-f":
|
|
fillDownFieldNames, err = cli.VerbGetStringArrayArg(verb, opt, args, &argi, argc)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
case "--all":
|
|
doAll = true
|
|
|
|
case "-a", "--only-if-absent":
|
|
onlyIfAbsent = true
|
|
|
|
default:
|
|
return nil, cli.VerbErrorf(verb, "option \"%s\" not recognized", opt)
|
|
}
|
|
}
|
|
|
|
if fillDownFieldNames == nil && !doAll {
|
|
return nil, cli.VerbErrorf(verb, "-f field names or --all required")
|
|
}
|
|
|
|
*pargi = argi
|
|
if !doConstruct { // All transformers must do this for main command-line parsing
|
|
return nil, nil
|
|
}
|
|
|
|
transformer, err := NewTransformerFillDown(
|
|
fillDownFieldNames,
|
|
doAll,
|
|
onlyIfAbsent,
|
|
)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return transformer, nil
|
|
}
|
|
|
|
type TransformerFillDown struct {
|
|
// input
|
|
fillDownFieldNames []string
|
|
onlyIfAbsent bool
|
|
|
|
// state
|
|
lastNonNullValues map[string]*mlrval.Mlrval
|
|
|
|
recordTransformerFunc RecordTransformerFunc
|
|
}
|
|
|
|
func NewTransformerFillDown(
|
|
fillDownFieldNames []string,
|
|
doAll bool,
|
|
onlyIfAbsent bool,
|
|
) (*TransformerFillDown, error) {
|
|
tr := &TransformerFillDown{
|
|
fillDownFieldNames: fillDownFieldNames,
|
|
onlyIfAbsent: onlyIfAbsent,
|
|
lastNonNullValues: make(map[string]*mlrval.Mlrval),
|
|
}
|
|
|
|
if doAll {
|
|
tr.recordTransformerFunc = tr.transformAll
|
|
} else {
|
|
tr.recordTransformerFunc = tr.transformSpecified
|
|
}
|
|
|
|
return tr, nil
|
|
}
|
|
|
|
func (tr *TransformerFillDown) Transform(
|
|
inrecAndContext *types.RecordAndContext,
|
|
outputRecordsAndContexts *[]*types.RecordAndContext, // list of *types.RecordAndContext
|
|
inputDownstreamDoneChannel <-chan bool,
|
|
outputDownstreamDoneChannel chan<- bool,
|
|
) error {
|
|
HandleDefaultDownstreamDone(inputDownstreamDoneChannel, outputDownstreamDoneChannel)
|
|
return tr.recordTransformerFunc(inrecAndContext, outputRecordsAndContexts, inputDownstreamDoneChannel, outputDownstreamDoneChannel)
|
|
}
|
|
|
|
func (tr *TransformerFillDown) transformSpecified(
|
|
inrecAndContext *types.RecordAndContext,
|
|
outputRecordsAndContexts *[]*types.RecordAndContext, // list of *types.RecordAndContext
|
|
inputDownstreamDoneChannel <-chan bool,
|
|
outputDownstreamDoneChannel chan<- bool,
|
|
) error {
|
|
if !inrecAndContext.EndOfStream {
|
|
inrec := inrecAndContext.Record
|
|
|
|
for _, fillDownFieldName := range tr.fillDownFieldNames {
|
|
present := false
|
|
value := inrec.Get(fillDownFieldName)
|
|
if tr.onlyIfAbsent {
|
|
present = value != nil
|
|
} else {
|
|
present = value != nil && !value.IsVoid()
|
|
}
|
|
|
|
if present {
|
|
// Remember it for a subsequent record lacking this field
|
|
tr.lastNonNullValues[fillDownFieldName] = value.Copy()
|
|
} else {
|
|
// Reuse previously seen value, if any
|
|
prev, ok := tr.lastNonNullValues[fillDownFieldName]
|
|
if ok {
|
|
inrec.PutCopy(fillDownFieldName, prev)
|
|
}
|
|
}
|
|
}
|
|
|
|
*outputRecordsAndContexts = append(*outputRecordsAndContexts, inrecAndContext)
|
|
|
|
} else {
|
|
*outputRecordsAndContexts = append(*outputRecordsAndContexts, inrecAndContext) // end-of-stream marker
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (tr *TransformerFillDown) transformAll(
|
|
inrecAndContext *types.RecordAndContext,
|
|
outputRecordsAndContexts *[]*types.RecordAndContext, // list of *types.RecordAndContext
|
|
inputDownstreamDoneChannel <-chan bool,
|
|
outputDownstreamDoneChannel chan<- bool,
|
|
) error {
|
|
if !inrecAndContext.EndOfStream {
|
|
inrec := inrecAndContext.Record
|
|
|
|
for pe := inrec.Head; pe != nil; pe = pe.Next {
|
|
fillDownFieldName := pe.Key
|
|
present := false
|
|
value := inrec.Get(fillDownFieldName)
|
|
if tr.onlyIfAbsent {
|
|
present = value != nil
|
|
} else {
|
|
present = value != nil && !value.IsVoid()
|
|
}
|
|
|
|
if present {
|
|
// Remember it for a subsequent record lacking this field
|
|
tr.lastNonNullValues[fillDownFieldName] = value.Copy()
|
|
} else {
|
|
// Reuse previously seen value, if any
|
|
prev, ok := tr.lastNonNullValues[fillDownFieldName]
|
|
if ok {
|
|
inrec.PutCopy(fillDownFieldName, prev)
|
|
}
|
|
}
|
|
}
|
|
|
|
*outputRecordsAndContexts = append(*outputRecordsAndContexts, inrecAndContext)
|
|
|
|
} else {
|
|
*outputRecordsAndContexts = append(*outputRecordsAndContexts, inrecAndContext) // end-of-stream marker
|
|
}
|
|
return nil
|
|
}
|