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>
226 lines
5.9 KiB
Go
226 lines
5.9 KiB
Go
package transformers
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"strings"
|
|
|
|
"github.com/johnkerl/miller/v6/pkg/cli"
|
|
"github.com/johnkerl/miller/v6/pkg/types"
|
|
)
|
|
|
|
type tRepeatCountSource int
|
|
|
|
const (
|
|
repeatCountSourceUnspecified tRepeatCountSource = iota
|
|
repeatCountFromInt
|
|
repeatCountFromFieldName
|
|
)
|
|
|
|
const verbNameRepeat = "repeat"
|
|
|
|
var repeatOptions = []OptionSpec{
|
|
{
|
|
Flag: "-n",
|
|
Arg: "{repeat count}",
|
|
Type: "int",
|
|
Desc: "Repeat each input record this many times.",
|
|
},
|
|
{
|
|
Flag: "-f",
|
|
Arg: "{field name}",
|
|
Type: "string",
|
|
Desc: "Same as -n, but take the repeat count from the specified field name of each input record.",
|
|
},
|
|
}
|
|
|
|
var RepeatSetup = TransformerSetup{
|
|
Verb: verbNameRepeat,
|
|
UsageFunc: transformerRepeatUsage,
|
|
ParseCLIFunc: transformerRepeatParseCLI,
|
|
IgnoresInput: false,
|
|
Options: repeatOptions,
|
|
}
|
|
|
|
func transformerRepeatUsage(
|
|
o *os.File,
|
|
) {
|
|
fmt.Fprintf(o, "Usage: %s %s [options]\n", "mlr", verbNameRepeat)
|
|
fmt.Fprintf(o, "Copies input records to output records multiple times.\n")
|
|
fmt.Fprintf(o, "Options must be exactly one of -n or -f.\n")
|
|
WriteVerbOptions(o, repeatOptions)
|
|
fmt.Fprintf(o, "Example:\n")
|
|
fmt.Fprintf(o, " echo x=0 | %s %s -n 4 then put '$x=urand()'\n", "mlr", verbNameRepeat)
|
|
fmt.Fprintf(o, "produces:\n")
|
|
fmt.Fprintf(o, " x=0.488189\n")
|
|
fmt.Fprintf(o, " x=0.484973\n")
|
|
fmt.Fprintf(o, " x=0.704983\n")
|
|
fmt.Fprintf(o, " x=0.147311\n")
|
|
fmt.Fprintf(o, "Example:\n")
|
|
fmt.Fprintf(o, " echo a=1,b=2,c=3 | %s %s -f b\n", "mlr", verbNameRepeat)
|
|
fmt.Fprintf(o, "produces:\n")
|
|
fmt.Fprintf(o, " a=1,b=2,c=3\n")
|
|
fmt.Fprintf(o, " a=1,b=2,c=3\n")
|
|
fmt.Fprintf(o, "Example:\n")
|
|
fmt.Fprintf(o, " echo a=1,b=2,c=3 | %s %s -f c\n", "mlr", verbNameRepeat)
|
|
fmt.Fprintf(o, "produces:\n")
|
|
fmt.Fprintf(o, " a=1,b=2,c=3\n")
|
|
fmt.Fprintf(o, " a=1,b=2,c=3\n")
|
|
fmt.Fprintf(o, " a=1,b=2,c=3\n")
|
|
}
|
|
|
|
func transformerRepeatParseCLI(
|
|
pargi *int,
|
|
argc int,
|
|
args []string,
|
|
_ *cli.TOptions,
|
|
doConstruct bool, // false for first pass of CLI-parse, true for second pass
|
|
) (RecordTransformer, error) {
|
|
|
|
repeatCountSource := repeatCountSourceUnspecified
|
|
repeatCount := int64(0)
|
|
repeatCountFieldName := ""
|
|
|
|
// Skip the verb name from the current spot in the mlr command line
|
|
argi := *pargi
|
|
verb := args[argi]
|
|
argi++
|
|
|
|
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":
|
|
transformerRepeatUsage(os.Stdout)
|
|
return nil, cli.ErrHelpRequested
|
|
|
|
case "-n":
|
|
repeatCount, err = cli.VerbGetIntArg(verb, opt, args, &argi, argc)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
repeatCountSource = repeatCountFromInt
|
|
|
|
case "-f":
|
|
repeatCountFieldName, err = cli.VerbGetStringArg(verb, opt, args, &argi, argc)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
repeatCountSource = repeatCountFromFieldName
|
|
|
|
default:
|
|
return nil, cli.VerbErrorf(verb, "option \"%s\" not recognized", opt)
|
|
}
|
|
}
|
|
|
|
if repeatCountSource == repeatCountSourceUnspecified {
|
|
return nil, cli.VerbErrorf(verb, "-n or -f is required")
|
|
}
|
|
|
|
*pargi = argi
|
|
if !doConstruct { // All transformers must do this for main command-line parsing
|
|
return nil, nil
|
|
}
|
|
|
|
transformer, err := NewTransformerRepeat(
|
|
repeatCountSource,
|
|
repeatCount,
|
|
repeatCountFieldName,
|
|
)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return transformer, nil
|
|
}
|
|
|
|
type TransformerRepeat struct {
|
|
repeatCount int64
|
|
repeatCountFieldName string
|
|
recordTransformerFunc RecordTransformerFunc
|
|
}
|
|
|
|
func NewTransformerRepeat(
|
|
repeatCountSource tRepeatCountSource,
|
|
repeatCount int64,
|
|
repeatCountFieldName string,
|
|
) (*TransformerRepeat, error) {
|
|
|
|
tr := &TransformerRepeat{
|
|
repeatCount: repeatCount,
|
|
repeatCountFieldName: repeatCountFieldName,
|
|
}
|
|
|
|
if repeatCountSource == repeatCountFromInt {
|
|
tr.recordTransformerFunc = tr.repeatByCount
|
|
} else {
|
|
tr.recordTransformerFunc = tr.repeatByFieldName
|
|
}
|
|
|
|
return tr, nil
|
|
}
|
|
|
|
func (tr *TransformerRepeat) 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 *TransformerRepeat) repeatByCount(
|
|
inrecAndContext *types.RecordAndContext,
|
|
outputRecordsAndContexts *[]*types.RecordAndContext, // list of *types.RecordAndContext
|
|
inputDownstreamDoneChannel <-chan bool,
|
|
outputDownstreamDoneChannel chan<- bool,
|
|
) error {
|
|
if !inrecAndContext.EndOfStream {
|
|
for i := int64(0); i < tr.repeatCount; i++ {
|
|
*outputRecordsAndContexts = append(*outputRecordsAndContexts, types.NewRecordAndContext(
|
|
inrecAndContext.Record.Copy(),
|
|
&inrecAndContext.Context,
|
|
))
|
|
}
|
|
} else {
|
|
*outputRecordsAndContexts = append(*outputRecordsAndContexts, inrecAndContext)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (tr *TransformerRepeat) repeatByFieldName(
|
|
inrecAndContext *types.RecordAndContext,
|
|
outputRecordsAndContexts *[]*types.RecordAndContext, // list of *types.RecordAndContext
|
|
inputDownstreamDoneChannel <-chan bool,
|
|
outputDownstreamDoneChannel chan<- bool,
|
|
) error {
|
|
if !inrecAndContext.EndOfStream {
|
|
fieldValue := inrecAndContext.Record.Get(tr.repeatCountFieldName)
|
|
if fieldValue == nil {
|
|
return nil
|
|
}
|
|
repeatCount, ok := fieldValue.GetIntValue()
|
|
if !ok {
|
|
return nil
|
|
}
|
|
for i := 0; i < int(repeatCount); i++ {
|
|
*outputRecordsAndContexts = append(*outputRecordsAndContexts, types.NewRecordAndContext(
|
|
inrecAndContext.Record.Copy(),
|
|
&inrecAndContext.Context,
|
|
))
|
|
}
|
|
|
|
} else {
|
|
*outputRecordsAndContexts = append(*outputRecordsAndContexts, inrecAndContext)
|
|
}
|
|
return nil
|
|
}
|