mirror of
https://github.com/johnkerl/miller.git
synced 2026-07-28 10:13:59 +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>
179 lines
4.5 KiB
Go
179 lines
4.5 KiB
Go
package transformers
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"regexp"
|
|
"strings"
|
|
|
|
"github.com/johnkerl/miller/v6/pkg/cli"
|
|
"github.com/johnkerl/miller/v6/pkg/types"
|
|
)
|
|
|
|
const verbNameGrep = "grep"
|
|
|
|
var grepOptions = []OptionSpec{
|
|
{Flag: "-i", Type: "bool", Desc: "Use case-insensitive search."},
|
|
{Flag: "-v", Type: "bool", Desc: "Invert: pass through records which do not match the regex."},
|
|
{Flag: "-a", Type: "bool", Desc: "Only grep for values, not keys and values."},
|
|
}
|
|
|
|
var GrepSetup = TransformerSetup{
|
|
Verb: verbNameGrep,
|
|
UsageFunc: transformerGrepUsage,
|
|
ParseCLIFunc: transformerGrepParseCLI,
|
|
IgnoresInput: false,
|
|
Options: grepOptions,
|
|
}
|
|
|
|
func transformerGrepUsage(
|
|
o *os.File,
|
|
) {
|
|
fmt.Fprintf(o, "Usage: %s %s [options] {regular expression}\n", "mlr", verbNameGrep)
|
|
fmt.Fprintf(o, "Passes through records which match the regular expression.\n")
|
|
|
|
WriteVerbOptions(o, grepOptions)
|
|
|
|
fmt.Fprintf(o, `Note that "%s filter" is more powerful, but requires you to know field names.
|
|
By contrast, "%s grep" allows you to regex-match the entire record. It does this
|
|
by formatting each record in memory as DKVP (or NIDX, if -a is supplied), using
|
|
OFS "," and OPS "=", and matching the resulting line against the regex specified
|
|
here. In particular, the regex is not applied to the input stream: if you have
|
|
CSV with header line "x,y,z" and data line "1,2,3" then the regex will be
|
|
matched, not against either of these lines, but against the DKVP line
|
|
"x=1,y=2,z=3". Furthermore, not all the options to system grep are supported,
|
|
and this command is intended to be merely a keystroke-saver. To get all the
|
|
features of system grep, you can do
|
|
"%s --odkvp ... | grep ... | %s --idkvp ..."
|
|
`, "mlr", "mlr", "mlr", "mlr")
|
|
}
|
|
|
|
func transformerGrepParseCLI(
|
|
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++
|
|
|
|
ignoreCase := false
|
|
invert := false
|
|
valuesOnly := false
|
|
|
|
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":
|
|
transformerGrepUsage(os.Stdout)
|
|
return nil, cli.ErrHelpRequested
|
|
|
|
case "-i":
|
|
ignoreCase = true
|
|
|
|
case "-v":
|
|
invert = true
|
|
|
|
case "-a":
|
|
valuesOnly = true
|
|
|
|
default:
|
|
return nil, cli.VerbErrorf(verb, "option \"%s\" not recognized", opt)
|
|
}
|
|
}
|
|
|
|
// Get the regex from the command line
|
|
if argi >= argc {
|
|
return nil, cli.VerbErrorf(verb, "pattern required")
|
|
}
|
|
pattern := args[argi]
|
|
argi++
|
|
|
|
if ignoreCase {
|
|
pattern = "(?i)" + pattern
|
|
}
|
|
|
|
// TODO: maybe CompilePOSIX
|
|
regexp, err := regexp.Compile(pattern)
|
|
if err != nil {
|
|
return nil, cli.VerbErrorf(verb, "invalid regex \"%s\": %w", pattern, err)
|
|
}
|
|
|
|
*pargi = argi
|
|
if !doConstruct { // All transformers must do this for main command-line parsing
|
|
return nil, nil
|
|
}
|
|
|
|
transformer, err := NewTransformerGrep(
|
|
regexp,
|
|
invert,
|
|
valuesOnly,
|
|
)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return transformer, nil
|
|
}
|
|
|
|
type TransformerGrep struct {
|
|
regexp *regexp.Regexp
|
|
invert bool
|
|
valuesOnly bool
|
|
}
|
|
|
|
func NewTransformerGrep(
|
|
regexp *regexp.Regexp,
|
|
invert bool,
|
|
valuesOnly bool,
|
|
) (*TransformerGrep, error) {
|
|
tr := &TransformerGrep{
|
|
regexp: regexp,
|
|
invert: invert,
|
|
valuesOnly: valuesOnly,
|
|
}
|
|
return tr, nil
|
|
}
|
|
|
|
func (tr *TransformerGrep) 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
|
|
var inrecAsString string
|
|
if tr.valuesOnly {
|
|
inrecAsString = inrec.ToNIDXString()
|
|
} else {
|
|
inrecAsString = inrec.ToDKVPString()
|
|
}
|
|
matches := tr.regexp.MatchString(inrecAsString)
|
|
if tr.invert {
|
|
if !matches {
|
|
*outputRecordsAndContexts = append(*outputRecordsAndContexts, inrecAndContext)
|
|
}
|
|
} else {
|
|
if matches {
|
|
*outputRecordsAndContexts = append(*outputRecordsAndContexts, inrecAndContext)
|
|
}
|
|
}
|
|
} else {
|
|
*outputRecordsAndContexts = append(*outputRecordsAndContexts, inrecAndContext)
|
|
}
|
|
return nil
|
|
}
|