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>
165 lines
4.6 KiB
Go
165 lines
4.6 KiB
Go
package transformers
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"strings"
|
|
|
|
"github.com/johnkerl/miller/v6/pkg/cli"
|
|
"github.com/johnkerl/miller/v6/pkg/lib"
|
|
"github.com/johnkerl/miller/v6/pkg/mlrval"
|
|
"github.com/johnkerl/miller/v6/pkg/types"
|
|
)
|
|
|
|
const verbNameTemplate = "template"
|
|
|
|
var templateOptions = []OptionSpec{
|
|
{Flag: "-f", Arg: "{a,b,c}", Type: "csv-list", Desc: "Comma-separated field names for template, e.g. a,b,c."},
|
|
{Flag: "-t", Arg: "{filename}", Type: "filename", Desc: "CSV file whose header line will be used for template."},
|
|
{Flag: "--fill-with", Arg: "{filler string}", Type: "string", Desc: "What to fill absent fields with. Defaults to the empty string."},
|
|
}
|
|
|
|
var TemplateSetup = TransformerSetup{
|
|
Verb: verbNameTemplate,
|
|
UsageFunc: transformerTemplateUsage,
|
|
ParseCLIFunc: transformerTemplateParseCLI,
|
|
IgnoresInput: false,
|
|
Options: templateOptions,
|
|
}
|
|
|
|
func transformerTemplateUsage(
|
|
o *os.File,
|
|
) {
|
|
fmt.Fprintf(o, "Usage: %s %s [options]\n", "mlr", verbNameTemplate)
|
|
fmt.Fprintf(o, "Places input-record fields in the order specified by list of column names.\n")
|
|
fmt.Fprintf(o, "If the input record is missing a specified field, it will be filled with the fill-with.\n")
|
|
fmt.Fprintf(o, "If the input record possesses an unspecified field, it will be discarded.\n")
|
|
WriteVerbOptions(o, templateOptions)
|
|
fmt.Fprintf(o, "Example:\n")
|
|
fmt.Fprintf(o, "* Specified fields are a,b,c.\n")
|
|
fmt.Fprintf(o, "* Input record is c=3,a=1,f=6.\n")
|
|
fmt.Fprintf(o, "* Output record is a=1,b=,c=3.\n")
|
|
}
|
|
|
|
func transformerTemplateParseCLI(
|
|
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 fieldNames []string = nil
|
|
fillWith := ""
|
|
|
|
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":
|
|
transformerTemplateUsage(os.Stdout)
|
|
return nil, cli.ErrHelpRequested
|
|
|
|
case "-f":
|
|
fieldNames, err = cli.VerbGetStringArrayArg(verb, opt, args, &argi, argc)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
case "-t":
|
|
templateFileName, err := cli.VerbGetStringArg(verb, opt, args, &argi, argc)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
temp, err := lib.ReadCSVHeader(templateFileName)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("mlr %s: cannot read template file: %w", verb, err)
|
|
}
|
|
fieldNames = temp
|
|
|
|
case "--fill-with":
|
|
fillWith, 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)
|
|
}
|
|
}
|
|
|
|
if fieldNames == nil {
|
|
return nil, cli.VerbErrorf(verb, "-f or -t is required")
|
|
}
|
|
|
|
*pargi = argi
|
|
if !doConstruct { // All transformers must do this for main command-line parsing
|
|
return nil, nil
|
|
}
|
|
|
|
transformer, err := NewTransformerTemplate(
|
|
fieldNames,
|
|
fillWith,
|
|
)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return transformer, nil
|
|
}
|
|
|
|
type TransformerTemplate struct {
|
|
fieldNameList []string
|
|
fieldNameSet map[string]bool
|
|
fillWith *mlrval.Mlrval
|
|
}
|
|
|
|
func NewTransformerTemplate(
|
|
fieldNames []string,
|
|
fillWith string,
|
|
) (*TransformerTemplate, error) {
|
|
return &TransformerTemplate{
|
|
fieldNameList: fieldNames,
|
|
fieldNameSet: lib.StringListToSet(fieldNames),
|
|
fillWith: mlrval.FromString(fillWith),
|
|
}, nil
|
|
}
|
|
|
|
func (tr *TransformerTemplate) Transform(
|
|
inrecAndContext *types.RecordAndContext,
|
|
outputRecordsAndContexts *[]*types.RecordAndContext, // list of *types.RecordAndContext
|
|
inputDownstreamDoneChannel <-chan bool,
|
|
outputDownstreamDoneChannel chan<- bool,
|
|
) error {
|
|
HandleDefaultDownstreamDone(inputDownstreamDoneChannel, outputDownstreamDoneChannel)
|
|
if !inrecAndContext.EndOfStream {
|
|
inrec := inrecAndContext.Record
|
|
outrec := mlrval.NewMlrmap()
|
|
for _, fieldName := range tr.fieldNameList {
|
|
value := inrec.Get(fieldName)
|
|
if value != nil {
|
|
outrec.PutReference(fieldName, value) // inrec will be GC'ed
|
|
} else {
|
|
outrec.PutCopy(fieldName, tr.fillWith)
|
|
}
|
|
}
|
|
outrecAndContext := types.NewRecordAndContext(outrec, &inrecAndContext.Context)
|
|
*outputRecordsAndContexts = append(*outputRecordsAndContexts, outrecAndContext)
|
|
} else {
|
|
*outputRecordsAndContexts = append(*outputRecordsAndContexts, inrecAndContext)
|
|
}
|
|
return nil
|
|
}
|