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>
235 lines
6.1 KiB
Go
235 lines
6.1 KiB
Go
package transformers
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"strings"
|
|
|
|
"github.com/johnkerl/miller/v6/pkg/bifs"
|
|
"github.com/johnkerl/miller/v6/pkg/cli"
|
|
"github.com/johnkerl/miller/v6/pkg/mlrval"
|
|
"github.com/johnkerl/miller/v6/pkg/types"
|
|
)
|
|
|
|
const verbNameSeqgen = "seqgen"
|
|
|
|
var seqgenOptions = []OptionSpec{
|
|
{Flag: "-f", Arg: "{name}", Type: "string", Desc: "Field name for counters. Default \"i\"."},
|
|
{Flag: "--start", Arg: "{value}", Type: "float", Desc: "Inclusive start value. Default 1."},
|
|
{Flag: "--step", Arg: "{value}", Type: "float", Desc: "Step value. Default 1. May be negative but not zero (unless start == stop)."},
|
|
{Flag: "--stop", Arg: "{value}", Type: "float", Desc: "Inclusive stop value. Default 100."},
|
|
}
|
|
|
|
var SeqgenSetup = TransformerSetup{
|
|
Verb: verbNameSeqgen,
|
|
UsageFunc: transformerSeqgenUsage,
|
|
ParseCLIFunc: transformerSeqgenParseCLI,
|
|
IgnoresInput: true,
|
|
Options: seqgenOptions,
|
|
}
|
|
|
|
func transformerSeqgenUsage(
|
|
o *os.File,
|
|
) {
|
|
fmt.Fprintf(o, "Usage: %s %s [options]\n", "mlr", verbNameSeqgen)
|
|
fmt.Fprintf(o, "Produces a sequence of counters. Discards the input record stream. Produces\n")
|
|
fmt.Fprintf(o, "output as specified by the options.\n")
|
|
fmt.Fprintf(o, "\n")
|
|
WriteVerbOptions(o, seqgenOptions)
|
|
|
|
fmt.Fprintf(o, "Start, stop, and/or step may be floating-point. Output is integer if start,\n")
|
|
fmt.Fprintf(o, "stop, and step are all integers. Step may be negative. It may not be zero\n")
|
|
fmt.Fprintf(o, "unless start == stop.\n")
|
|
}
|
|
|
|
func transformerSeqgenParseCLI(
|
|
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++
|
|
|
|
fieldName := "i"
|
|
startString := "1"
|
|
stopString := "100"
|
|
stepString := "1"
|
|
|
|
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":
|
|
transformerSeqgenUsage(os.Stdout)
|
|
return nil, cli.ErrHelpRequested
|
|
|
|
case "-f":
|
|
fieldName, err = cli.VerbGetStringArg(verb, opt, args, &argi, argc)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
case "--start":
|
|
startString, err = cli.VerbGetStringArg(verb, opt, args, &argi, argc)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
case "--stop":
|
|
stopString, err = cli.VerbGetStringArg(verb, opt, args, &argi, argc)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
case "--step":
|
|
stepString, err = cli.VerbGetStringArg(verb, opt, args, &argi, argc)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
default:
|
|
return nil, cli.VerbErrorf(verb, "option \"%s\" not recognized", opt)
|
|
}
|
|
}
|
|
|
|
*pargi = argi
|
|
if !doConstruct { // All transformers must do this for main command-line parsing
|
|
return nil, nil
|
|
}
|
|
|
|
transformer, err := NewTransformerSeqgen(
|
|
fieldName,
|
|
startString,
|
|
stopString,
|
|
stepString,
|
|
)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return transformer, nil
|
|
}
|
|
|
|
type TransformerSeqgen struct {
|
|
fieldName string
|
|
start *mlrval.Mlrval
|
|
stop *mlrval.Mlrval
|
|
step *mlrval.Mlrval
|
|
doneComparator bifs.BinaryFunc
|
|
mdone *mlrval.Mlrval
|
|
}
|
|
|
|
func NewTransformerSeqgen(
|
|
fieldName string,
|
|
startString string,
|
|
stopString string,
|
|
stepString string,
|
|
) (*TransformerSeqgen, error) {
|
|
start := mlrval.FromInferredType(startString)
|
|
stop := mlrval.FromInferredType(stopString)
|
|
step := mlrval.FromInferredType(stepString)
|
|
var doneComparator bifs.BinaryFunc
|
|
|
|
fstart, startIsNumeric := start.GetNumericToFloatValue()
|
|
if !startIsNumeric {
|
|
return nil, fmt.Errorf("mlr seqgen: start value should be number; got \"%s\"", startString)
|
|
}
|
|
|
|
fstop, stopIsNumeric := stop.GetNumericToFloatValue()
|
|
if !stopIsNumeric {
|
|
return nil, fmt.Errorf("mlr seqgen: stop value should be number; got \"%s\"", stopString)
|
|
}
|
|
|
|
fstep, stepIsNumeric := step.GetNumericToFloatValue()
|
|
if !stepIsNumeric {
|
|
return nil, fmt.Errorf("mlr seqgen: step value should be number; got \"%s\"", stepString)
|
|
}
|
|
|
|
if fstep > 0 {
|
|
doneComparator = bifs.BIF_greater_than
|
|
} else if fstep < 0 {
|
|
doneComparator = bifs.BIF_less_than
|
|
} else {
|
|
if fstart == fstop {
|
|
doneComparator = bifs.BIF_equals
|
|
} else {
|
|
return nil, fmt.Errorf("mlr seqgen: step must not be zero unless start == stop")
|
|
}
|
|
}
|
|
|
|
return &TransformerSeqgen{
|
|
fieldName: fieldName,
|
|
start: start,
|
|
stop: stop,
|
|
step: step,
|
|
doneComparator: doneComparator,
|
|
mdone: mlrval.FALSE,
|
|
}, nil
|
|
}
|
|
|
|
func (tr *TransformerSeqgen) Transform(
|
|
inrecAndContext *types.RecordAndContext,
|
|
outputRecordsAndContexts *[]*types.RecordAndContext, // list of *types.RecordAndContext
|
|
inputDownstreamDoneChannel <-chan bool,
|
|
outputDownstreamDoneChannel chan<- bool,
|
|
) error {
|
|
if !inrecAndContext.EndOfStream {
|
|
// Discard upstream records; generate output only when upstream is done.
|
|
return nil
|
|
}
|
|
|
|
counter := tr.start
|
|
context := types.NewNilContext()
|
|
context.UpdateForStartOfFile("seqgen")
|
|
|
|
keepGoing := true
|
|
for {
|
|
|
|
// See ChainTransformer. If a downstream transformer is discarding all
|
|
// further input -- e.g. head -n 10 -- and if no interverning
|
|
// transformer is interested either, then we should break out of our
|
|
// for loop. This way 'mlr seqgen --stop 1000000000 then head -n 10'
|
|
// finishes quickly.
|
|
select {
|
|
case b := <-inputDownstreamDoneChannel:
|
|
outputDownstreamDoneChannel <- b
|
|
keepGoing = false
|
|
default:
|
|
}
|
|
if !keepGoing {
|
|
break
|
|
}
|
|
|
|
tr.mdone = tr.doneComparator(counter, tr.stop)
|
|
done, _ := tr.mdone.GetBoolValue()
|
|
if done {
|
|
break
|
|
}
|
|
|
|
outrec := mlrval.NewMlrmapAsRecord()
|
|
outrec.PutCopy(tr.fieldName, counter)
|
|
|
|
context.UpdateForInputRecord()
|
|
|
|
outrecAndContext := types.NewRecordAndContext(outrec, context)
|
|
*outputRecordsAndContexts = append(*outputRecordsAndContexts, outrecAndContext)
|
|
|
|
counter = bifs.BIF_plus_binary(counter, tr.step)
|
|
}
|
|
|
|
*outputRecordsAndContexts = append(*outputRecordsAndContexts, types.NewEndOfStreamMarker(context))
|
|
return nil
|
|
}
|