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>
208 lines
5.4 KiB
Go
208 lines
5.4 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/types"
|
|
)
|
|
|
|
const verbNameSample = "sample"
|
|
|
|
var sampleOptions = []OptionSpec{
|
|
{
|
|
Flag: "-g",
|
|
Arg: "{a,b,c}",
|
|
Type: "csv-list",
|
|
Desc: "Optional: group-by-field names for samples, e.g. a,b,c.",
|
|
},
|
|
{
|
|
Flag: "-k",
|
|
Arg: "{k}",
|
|
Type: "int",
|
|
Desc: "Required: number of records to output in total, or by group if using -g.",
|
|
},
|
|
}
|
|
|
|
var SampleSetup = TransformerSetup{
|
|
Verb: verbNameSample,
|
|
UsageFunc: transformerSampleUsage,
|
|
ParseCLIFunc: transformerSampleParseCLI,
|
|
IgnoresInput: false,
|
|
Options: sampleOptions,
|
|
}
|
|
|
|
func transformerSampleUsage(
|
|
o *os.File,
|
|
) {
|
|
fmt.Fprintf(o, "Usage: %s %s [options]\n", "mlr", verbNameSample)
|
|
fmt.Fprintf(o,
|
|
`Reservoir sampling (subsampling without replacement), optionally by category.
|
|
See also %s bootstrap and %s shuffle.
|
|
`, "mlr", "mlr")
|
|
WriteVerbOptions(o, sampleOptions)
|
|
}
|
|
|
|
func transformerSampleParseCLI(
|
|
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++
|
|
|
|
sampleCount := int64(-1)
|
|
var groupByFieldNames []string = nil
|
|
|
|
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":
|
|
transformerSampleUsage(os.Stdout)
|
|
return nil, cli.ErrHelpRequested
|
|
|
|
case "-k":
|
|
sampleCount, err = cli.VerbGetIntArg(verb, opt, args, &argi, argc)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
case "-g":
|
|
groupByFieldNames, err = cli.VerbGetStringArrayArg(verb, opt, args, &argi, argc)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
default:
|
|
return nil, cli.VerbErrorf(verb, "option \"%s\" not recognized", opt)
|
|
}
|
|
}
|
|
|
|
if sampleCount < 0 {
|
|
return nil, cli.VerbErrorf(verb, "sample count must be non-negative")
|
|
}
|
|
|
|
*pargi = argi
|
|
if !doConstruct { // All transformers must do this for main command-line parsing
|
|
return nil, nil
|
|
}
|
|
|
|
transformer, err := NewTransformerSample(
|
|
sampleCount,
|
|
groupByFieldNames,
|
|
)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return transformer, nil
|
|
}
|
|
|
|
type sampleBucketType struct {
|
|
nalloc int64
|
|
nused int64
|
|
recordsAndContexts []*types.RecordAndContext
|
|
}
|
|
|
|
type TransformerSample struct {
|
|
groupByFieldNames []string
|
|
sampleCount int64
|
|
bucketsByGroup *lib.OrderedMap[*sampleBucketType]
|
|
}
|
|
|
|
func NewTransformerSample(
|
|
sampleCount int64,
|
|
groupByFieldNames []string,
|
|
) (*TransformerSample, error) {
|
|
tr := &TransformerSample{
|
|
sampleCount: sampleCount,
|
|
groupByFieldNames: groupByFieldNames,
|
|
bucketsByGroup: lib.NewOrderedMap[*sampleBucketType](),
|
|
}
|
|
return tr, nil
|
|
}
|
|
|
|
func (tr *TransformerSample) Transform(
|
|
inrecAndContext *types.RecordAndContext,
|
|
outputRecordsAndContexts *[]*types.RecordAndContext, // list of *types.RecordAndContext
|
|
inputDownstreamDoneChannel <-chan bool,
|
|
outputDownstreamDoneChannel chan<- bool,
|
|
) error {
|
|
HandleDefaultDownstreamDone(inputDownstreamDoneChannel, outputDownstreamDoneChannel)
|
|
// Not end of input stream: retain the record, and emit nothing until end of stream.
|
|
if !inrecAndContext.EndOfStream {
|
|
inrec := inrecAndContext.Record
|
|
groupingKey, ok := inrec.GetSelectedValuesJoined(tr.groupByFieldNames)
|
|
if ok {
|
|
sampleBucket := tr.bucketsByGroup.Get(groupingKey)
|
|
if sampleBucket == nil {
|
|
sampleBucket = newSampleBucket(tr.sampleCount)
|
|
tr.bucketsByGroup.Put(groupingKey, sampleBucket)
|
|
}
|
|
sampleBucket.handleRecord(inrecAndContext, inrecAndContext.Context.NR)
|
|
} // else, specified keys aren't present in this record, so ignore it
|
|
|
|
} else { // end of record stream
|
|
|
|
for pe := tr.bucketsByGroup.Head; pe != nil; pe = pe.Next {
|
|
sampleBucket := pe.Value
|
|
for i := int64(0); i < sampleBucket.nused; i++ {
|
|
*outputRecordsAndContexts = append(*outputRecordsAndContexts, sampleBucket.recordsAndContexts[i])
|
|
|
|
}
|
|
}
|
|
|
|
// Emit the stream-terminating null record
|
|
*outputRecordsAndContexts = append(*outputRecordsAndContexts, inrecAndContext)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func newSampleBucket(sampleCount int64) *sampleBucketType {
|
|
return &sampleBucketType{
|
|
nalloc: sampleCount,
|
|
nused: 0,
|
|
recordsAndContexts: make([]*types.RecordAndContext, sampleCount),
|
|
}
|
|
}
|
|
|
|
// This is the reservoir-sampling algorithm. Here we retain an input record
|
|
// (if retained in the sample) or let it be GC'ed (if not retained in the
|
|
// sample).
|
|
func (t *sampleBucketType) handleRecord(
|
|
inrecAndContext *types.RecordAndContext,
|
|
recordNumber int64,
|
|
) {
|
|
if t.nused < t.nalloc {
|
|
// Always accept new entries until the bucket is full.
|
|
//
|
|
// Note: we need to copy the record since Go is concurrent and all
|
|
// Miller transformers execute in their own goroutine -- if we just keep a
|
|
// pointer, a downstream transformer mutate the pointed-to record between
|
|
// our saving it and our re-using it.
|
|
t.recordsAndContexts[t.nused] = inrecAndContext.Copy()
|
|
t.nused++
|
|
} else {
|
|
r := int64(lib.RandInt63()) % recordNumber
|
|
if r < t.nalloc {
|
|
t.recordsAndContexts[r] = inrecAndContext.Copy()
|
|
}
|
|
}
|
|
}
|