mirror of
https://github.com/johnkerl/miller.git
synced 2026-07-18 00:45:47 +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>
365 lines
11 KiB
Go
365 lines
11 KiB
Go
package transformers
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"regexp"
|
|
"strings"
|
|
|
|
"github.com/johnkerl/miller/v6/pkg/cli"
|
|
"github.com/johnkerl/miller/v6/pkg/lib"
|
|
"github.com/johnkerl/miller/v6/pkg/types"
|
|
)
|
|
|
|
type tHavingFieldsCriterion int
|
|
|
|
const (
|
|
havingFieldsCriterionUnspecified tHavingFieldsCriterion = iota
|
|
havingFieldsAtLeast
|
|
havingFieldsWhichAre
|
|
havingFieldsAtMost
|
|
havingAllFieldsMatching
|
|
havingAnyFieldsMatching
|
|
havingNoFieldsMatching
|
|
)
|
|
|
|
const verbNameHavingFields = "having-fields"
|
|
|
|
var havingFieldsOptions = []OptionSpec{
|
|
{Flag: "--at-least", Arg: "{comma-separated names}", Type: "csv-list", Desc: "Pass records that have at least these field names."},
|
|
{Flag: "--which-are", Arg: "{comma-separated names}", Type: "csv-list", Desc: "Pass records whose field names are exactly these."},
|
|
{Flag: "--at-most", Arg: "{comma-separated names}", Type: "csv-list", Desc: "Pass records that have at most these field names."},
|
|
{Flag: "--all-matching", Arg: "{regular expression}", Type: "regex", Desc: "Pass records where all field names match the regex."},
|
|
{Flag: "--any-matching", Arg: "{regular expression}", Type: "regex", Desc: "Pass records where any field name matches the regex."},
|
|
{Flag: "--none-matching", Arg: "{regular expression}", Type: "regex", Desc: "Pass records where no field name matches the regex."},
|
|
}
|
|
|
|
var HavingFieldsSetup = TransformerSetup{
|
|
Verb: verbNameHavingFields,
|
|
UsageFunc: transformerHavingFieldsUsage,
|
|
ParseCLIFunc: transformerHavingFieldsParseCLI,
|
|
IgnoresInput: false,
|
|
Options: havingFieldsOptions,
|
|
}
|
|
|
|
func transformerHavingFieldsUsage(
|
|
o *os.File,
|
|
) {
|
|
exeName := "mlr"
|
|
verb := verbNameHavingFields
|
|
fmt.Fprintf(o, "Usage: %s %s [options]\n", "mlr", verbNameHavingFields)
|
|
|
|
fmt.Fprintf(o, "Conditionally passes through records depending on each record's field names.\n")
|
|
WriteVerbOptions(o, havingFieldsOptions)
|
|
fmt.Fprintf(o, "Examples:\n")
|
|
fmt.Fprintf(o, " %s %s --which-are amount,status,owner\n", exeName, verb)
|
|
fmt.Fprintf(o, " %s %s --any-matching 'sda[0-9]'\n", exeName, verb)
|
|
fmt.Fprintf(o, " %s %s --any-matching '\"sda[0-9]\"'\n", exeName, verb)
|
|
fmt.Fprintf(o, " %s %s --any-matching '\"sda[0-9]\"i' (this is case-insensitive)\n", exeName, verb)
|
|
}
|
|
|
|
func transformerHavingFieldsParseCLI(
|
|
pargi *int,
|
|
argc int,
|
|
args []string,
|
|
_ *cli.TOptions,
|
|
doConstruct bool, // false for first pass of CLI-parse, true for second pass
|
|
) (RecordTransformer, error) {
|
|
|
|
havingFieldsCriterion := havingFieldsCriterionUnspecified
|
|
var fieldNames []string = nil
|
|
regexString := ""
|
|
|
|
// 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":
|
|
transformerHavingFieldsUsage(os.Stdout)
|
|
return nil, cli.ErrHelpRequested
|
|
|
|
case "--at-least":
|
|
havingFieldsCriterion = havingFieldsAtLeast
|
|
fieldNames, err = cli.VerbGetStringArrayArg(verb, opt, args, &argi, argc)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
regexString = ""
|
|
|
|
case "--which-are":
|
|
havingFieldsCriterion = havingFieldsWhichAre
|
|
fieldNames, err = cli.VerbGetStringArrayArg(verb, opt, args, &argi, argc)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
regexString = ""
|
|
|
|
case "--at-most":
|
|
havingFieldsCriterion = havingFieldsAtMost
|
|
fieldNames, err = cli.VerbGetStringArrayArg(verb, opt, args, &argi, argc)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
regexString = ""
|
|
|
|
case "--all-matching":
|
|
havingFieldsCriterion = havingAllFieldsMatching
|
|
regexString, err = cli.VerbGetStringArg(verb, opt, args, &argi, argc)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
fieldNames = nil
|
|
|
|
case "--any-matching":
|
|
havingFieldsCriterion = havingAnyFieldsMatching
|
|
regexString, err = cli.VerbGetStringArg(verb, opt, args, &argi, argc)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
fieldNames = nil
|
|
|
|
case "--none-matching":
|
|
havingFieldsCriterion = havingNoFieldsMatching
|
|
regexString, err = cli.VerbGetStringArg(verb, opt, args, &argi, argc)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
fieldNames = nil
|
|
|
|
default:
|
|
return nil, cli.VerbErrorf(verb, "option \"%s\" not recognized", opt)
|
|
}
|
|
}
|
|
|
|
if havingFieldsCriterion == havingFieldsCriterionUnspecified {
|
|
return nil, cli.VerbErrorf(verb, "-a, -b, -n, or --any-matching/--all-matching/--none-matching is required")
|
|
}
|
|
if fieldNames == nil && regexString == "" {
|
|
return nil, cli.VerbErrorf(verb, "field names or regex required")
|
|
}
|
|
|
|
*pargi = argi
|
|
if !doConstruct { // All transformers must do this for main command-line parsing
|
|
return nil, nil
|
|
}
|
|
|
|
transformer, err := NewTransformerHavingFields(
|
|
havingFieldsCriterion,
|
|
fieldNames,
|
|
regexString,
|
|
)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return transformer, nil
|
|
}
|
|
|
|
type TransformerHavingFields struct {
|
|
fieldNames []string
|
|
numFieldNames int64
|
|
fieldNameSet map[string]bool
|
|
|
|
regex *regexp.Regexp
|
|
|
|
recordTransformerFunc RecordTransformerFunc
|
|
}
|
|
|
|
func NewTransformerHavingFields(
|
|
havingFieldsCriterion tHavingFieldsCriterion,
|
|
fieldNames []string,
|
|
regexString string,
|
|
) (*TransformerHavingFields, error) {
|
|
|
|
tr := &TransformerHavingFields{}
|
|
|
|
if fieldNames != nil {
|
|
tr.fieldNames = fieldNames
|
|
tr.numFieldNames = int64(len(fieldNames))
|
|
tr.fieldNameSet = lib.StringListToSet(fieldNames)
|
|
|
|
switch havingFieldsCriterion {
|
|
case havingFieldsAtLeast:
|
|
tr.recordTransformerFunc = tr.transformHavingFieldsAtLeast
|
|
case havingFieldsWhichAre:
|
|
tr.recordTransformerFunc = tr.transformHavingFieldsWhichAre
|
|
case havingFieldsAtMost:
|
|
tr.recordTransformerFunc = tr.transformHavingFieldsAtMost
|
|
default:
|
|
lib.InternalCodingErrorIf(true)
|
|
}
|
|
|
|
} else {
|
|
// Let them type in a.*b if they want, or "a.*b", or "a.*b"i.
|
|
// Strip off the leading " and trailing " or "i.
|
|
regex, err := lib.CompileMillerRegex(regexString)
|
|
if err != nil {
|
|
return nil, cli.VerbErrorf(verbNameHavingFields, "cannot compile regex \"%s\"", regexString)
|
|
}
|
|
tr.regex = regex
|
|
|
|
switch havingFieldsCriterion {
|
|
case havingAllFieldsMatching:
|
|
tr.recordTransformerFunc = tr.transformHavingAllFieldsMatching
|
|
case havingAnyFieldsMatching:
|
|
tr.recordTransformerFunc = tr.transformHavingAnyFieldsMatching
|
|
case havingNoFieldsMatching:
|
|
tr.recordTransformerFunc = tr.transformHavingNoFieldsMatching
|
|
default:
|
|
lib.InternalCodingErrorIf(true)
|
|
}
|
|
}
|
|
|
|
return tr, nil
|
|
}
|
|
|
|
func (tr *TransformerHavingFields) 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 *TransformerHavingFields) transformHavingFieldsAtLeast(
|
|
inrecAndContext *types.RecordAndContext,
|
|
outputRecordsAndContexts *[]*types.RecordAndContext, // list of *types.RecordAndContext
|
|
inputDownstreamDoneChannel <-chan bool,
|
|
outputDownstreamDoneChannel chan<- bool,
|
|
) error {
|
|
if !inrecAndContext.EndOfStream {
|
|
inrec := inrecAndContext.Record
|
|
numFound := int64(0)
|
|
for pe := inrec.Head; pe != nil; pe = pe.Next {
|
|
if tr.fieldNameSet[pe.Key] {
|
|
numFound++
|
|
if numFound == tr.numFieldNames {
|
|
*outputRecordsAndContexts = append(*outputRecordsAndContexts, inrecAndContext)
|
|
return nil
|
|
}
|
|
}
|
|
}
|
|
|
|
} else {
|
|
*outputRecordsAndContexts = append(*outputRecordsAndContexts, inrecAndContext)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (tr *TransformerHavingFields) transformHavingFieldsWhichAre(
|
|
inrecAndContext *types.RecordAndContext,
|
|
outputRecordsAndContexts *[]*types.RecordAndContext, // list of *types.RecordAndContext
|
|
inputDownstreamDoneChannel <-chan bool,
|
|
outputDownstreamDoneChannel chan<- bool,
|
|
) error {
|
|
if !inrecAndContext.EndOfStream {
|
|
inrec := inrecAndContext.Record
|
|
if inrec.FieldCount != tr.numFieldNames {
|
|
return nil
|
|
}
|
|
for pe := inrec.Head; pe != nil; pe = pe.Next {
|
|
if !tr.fieldNameSet[pe.Key] {
|
|
return nil
|
|
}
|
|
}
|
|
*outputRecordsAndContexts = append(*outputRecordsAndContexts, inrecAndContext)
|
|
} else {
|
|
*outputRecordsAndContexts = append(*outputRecordsAndContexts, inrecAndContext)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (tr *TransformerHavingFields) transformHavingFieldsAtMost(
|
|
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 {
|
|
if !tr.fieldNameSet[pe.Key] {
|
|
return nil
|
|
}
|
|
}
|
|
*outputRecordsAndContexts = append(*outputRecordsAndContexts, inrecAndContext)
|
|
} else {
|
|
*outputRecordsAndContexts = append(*outputRecordsAndContexts, inrecAndContext)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (tr *TransformerHavingFields) transformHavingAllFieldsMatching(
|
|
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 {
|
|
if !tr.regex.MatchString(pe.Key) {
|
|
return nil
|
|
}
|
|
}
|
|
*outputRecordsAndContexts = append(*outputRecordsAndContexts, inrecAndContext)
|
|
} else {
|
|
*outputRecordsAndContexts = append(*outputRecordsAndContexts, inrecAndContext)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (tr *TransformerHavingFields) transformHavingAnyFieldsMatching(
|
|
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 {
|
|
if tr.regex.MatchString(pe.Key) {
|
|
*outputRecordsAndContexts = append(*outputRecordsAndContexts, inrecAndContext)
|
|
return nil
|
|
}
|
|
}
|
|
} else {
|
|
*outputRecordsAndContexts = append(*outputRecordsAndContexts, inrecAndContext)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (tr *TransformerHavingFields) transformHavingNoFieldsMatching(
|
|
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 {
|
|
if tr.regex.MatchString(pe.Key) {
|
|
return nil
|
|
}
|
|
}
|
|
*outputRecordsAndContexts = append(*outputRecordsAndContexts, inrecAndContext)
|
|
} else {
|
|
*outputRecordsAndContexts = append(*outputRecordsAndContexts, inrecAndContext)
|
|
}
|
|
return nil
|
|
}
|