mirror of
https://github.com/johnkerl/miller.git
synced 2026-07-17 16:38:54 +00:00
* Tier-2 structured verb options: OptionSpec, initial migration (#2098) PR 3 of the AI-friendly roadmap (plans/plan-2098-llm.md). Infrastructure: - Add OptionSpec{Flag,Arg,Type,Desc,Repeatable,Values} to pkg/transformers/aaa_record_transformer.go alongside TransformerSetup. Type is one of: bool, string, int, float, csv-list, regex, filename, format, enum. For type=="enum", Values lists the valid choices. - Add Options []OptionSpec to TransformerSetup (nil = not yet migrated). - Emit Options in VerbInfoForJSON (omitempty so unmigrated verbs stay backward-compatible; agents check key presence for Tier-2 availability). UsageText is always present as the Tier-1 prose fallback. - Add VerbOptionsNilCheck() in aaa_verb_options_check.go: progress report of migrated vs. unmigrated verbs, analogous to FLAG_TABLE.NilCheck(). - Wire verb-options-nil-check into mlr help (internal/docgen section). Initial migration (5/70 verbs): - nothing: empty Options (no verb-specific options, explicitly migrated) - cat: -n (bool), -N (string), -g (csv-list), --filename, --filenum (bool) - head: -g (csv-list), -n (int) - tail: -g (csv-list), -n (int) - tee: -a, -p (bool) Tests: - 5 new unit tests in aaa_transformer_json_test.go covering migrated/ unmigrated paths, field population, JSON round-trip, and key-presence. - Regression test case 0003: mlr help verb-options-nil-check golden output. Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com> * Migrate all 70 verbs to structured OptionSpec; bump catalog schema to v2 Completes the Tier-2 migration started in the previous commit. Every verb in TRANSFORMER_LOOKUP_TABLE now has a non-nil Options field. - Workflow-migrated all 65 remaining verbs. Each Setup var now carries Options: []OptionSpec{...} with Flag/Arg/Type/Desc fields. Verbs with no verb-specific options (altkv, check, group-like, nothing, etc.) use an empty slice to signal "migrated but no options." - Drop `omitempty` from VerbInfoForJSON.Options: empty slices were silently dropped, making migrated-no-option verbs indistinguishable from unmigrated ones in JSON. Without omitempty: null=unmigrated, []=migrated-no-options, [...]= migrated-with-options. Bump catalogSchemaVersion 1→2 for this shape change. - Replace the two "unmigrated-verb" unit tests (which used stats1 as an example) with TestAllVerbsFullyMigrated (asserts every verb has non-nil Options) and TestAllVerbsHaveOptionsKeyInJSON (asserts every migrated verb emits the "options" key in JSON). - Regenerate test/cases/cli-help/0003/expout: now reads "Verb options migration: 70/70 migrated." Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com> * remove a transitional helper * git rms * Render verb usage Options blocks from structured OptionSpec Each verb's usage message and its Tier-2 OptionSpec list previously duplicated the option text. New WriteVerbOptions (aaa_verb_usage.go) renders the "Options:" block from the specs: aligned flag column, descriptions word-wrapped at 80, uniform trailing -h|--help line. - OptionSpec gains Aliases (JSON "aliases") so long-form spellings like join's --lk|--left-keep-field-names survive in both outputs - All 70 verbs migrated; options literals hoisted to package-level vars (usage funcs can't reference their Setup var without a Go init cycle) - Hand-written per-option details the specs had condensed away are merged into Desc, enriching the JSON catalog - Non-option prose (examples, cross-references, dynamic accumulator listings) kept verbatim - Regenerated the six usage-embedding regression expectations and the two affected doc pages Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Fix pre-existing usage-text bugs surfaced by the OptionSpec migration - gap: usage said "One of -f or -g is required" but the parser takes -n or -g - seqgen: drop description line copy-pasted from cat ("Passes input records directly to output...") which contradicted "Discards the input record stream" - utf8-to-latin1: description read inverted ("from Latin-1 to UTF-8") - sec2gmtdate: usage said "../c/mlr" instead of "mlr" - top: document the accepted-but-undocumented --max flag - stats2: add linreg-pca to the -a enum values, matching the runtime accumulator table Regression expectations and docs regenerated accordingly. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Fix check usage sentence order; stats1 usage blank line to usage stream - check: the description's second and third lines were swapped, reading "Consumes records without printing any output, / Useful for doing a well-formatted check on input data. / with the exception that warnings are printed to stderr." - stats1: a bare fmt.Println() in the usage func wrote its blank line to process stdout instead of the usage output stream Regression expectation and docs regenerated. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> --------- Co-authored-by: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>
207 lines
5.4 KiB
Go
207 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,
|
|
) {
|
|
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)
|
|
}
|
|
}
|
|
|
|
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()
|
|
}
|
|
}
|
|
}
|