miller/pkg/transformers/histogram.go
John Kerl f637633420
Tier-2 structured verb options: OptionSpec, initial migration (#2098) (#2111)
* 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>
2026-07-03 14:27:23 -04:00

393 lines
10 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 verbNameHistogram = "histogram"
const histogramDefaultBinCount = int64(20)
var histogramOptions = []OptionSpec{
{Flag: "-f", Arg: "{a,b,c}", Type: "csv-list", Desc: "Value-field names for histogram counts."},
{Flag: "--lo", Arg: "{lo}", Type: "float", Desc: "Histogram low value."},
{Flag: "--hi", Arg: "{hi}", Type: "float", Desc: "Histogram high value."},
{Flag: "--nbins", Arg: "{n}", Type: "int", Desc: "Number of histogram bins. Defaults to 20."},
{Flag: "--auto", Type: "bool", Desc: "Automatically computes limits, ignoring --lo and --hi. Holds all values in memory before producing any output."},
{Flag: "-o", Arg: "{prefix}", Type: "string", Desc: "Prefix for output field name. Default: no prefix."},
}
var HistogramSetup = TransformerSetup{
Verb: verbNameHistogram,
UsageFunc: transformerHistogramUsage,
ParseCLIFunc: transformerHistogramParseCLI,
IgnoresInput: false,
Options: histogramOptions,
}
func transformerHistogramUsage(
o *os.File,
) {
argv0 := "mlr"
verb := verbNameHistogram
fmt.Fprintf(o, "Just a histogram. Input values < lo or > hi are not counted.\n")
fmt.Fprintf(o, "Usage: %s %s [options]\n", argv0, verb)
WriteVerbOptions(o, histogramOptions)
}
func transformerHistogramParseCLI(
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++
// Parse local flags
var valueFieldNames []string = nil
lo := 0.0
nbins := histogramDefaultBinCount
hi := 0.0
doAuto := false
outputPrefix := ""
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":
transformerHistogramUsage(os.Stdout)
return nil, cli.ErrHelpRequested
case "-f":
valueFieldNames, err = cli.VerbGetStringArrayArg(verb, opt, args, &argi, argc)
if err != nil {
return nil, err
}
case "--lo":
lo, err = cli.VerbGetFloatArg(verb, opt, args, &argi, argc)
if err != nil {
return nil, err
}
case "--nbins":
nbins, err = cli.VerbGetIntArg(verb, opt, args, &argi, argc)
if err != nil {
return nil, err
}
case "--hi":
hi, err = cli.VerbGetFloatArg(verb, opt, args, &argi, argc)
if err != nil {
return nil, err
}
case "--auto":
doAuto = true
case "-o":
outputPrefix, 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 valueFieldNames == nil {
return nil, cli.VerbErrorf(verb, "-f field names required")
}
if nbins <= 0 {
return nil, cli.VerbErrorf(verb, "number of bins must be positive")
}
if lo == hi && !doAuto {
return nil, cli.VerbErrorf(verb, "lo and hi must differ, or use --auto")
}
*pargi = argi
if !doConstruct { // All transformers must do this for main command-line parsing
return nil, nil
}
transformer, err := NewTransformerHistogram(
valueFieldNames,
lo,
nbins,
hi,
doAuto,
outputPrefix,
)
if err != nil {
return nil, err
}
return transformer, nil
}
const histogramVectorInitialSize = 1024
type TransformerHistogram struct {
valueFieldNames []string
lo float64
nbins int64
hi float64
mul float64
countsByField map[string][]int64
vectorsByFieldName map[string][]float64 // For auto-mode
outputPrefix string
recordTransformerFunc RecordTransformerFunc
}
func NewTransformerHistogram(
valueFieldNames []string,
lo float64,
nbins int64,
hi float64,
doAuto bool,
outputPrefix string,
) (*TransformerHistogram, error) {
countsByField := make(map[string][]int64)
for _, valueFieldName := range valueFieldNames {
countsByField[valueFieldName] = make([]int64, nbins)
for i := range nbins {
countsByField[valueFieldName][i] = 0
}
}
tr := &TransformerHistogram{
valueFieldNames: valueFieldNames,
countsByField: countsByField,
outputPrefix: outputPrefix,
nbins: nbins,
}
if !doAuto {
tr.recordTransformerFunc = tr.transformNonAuto
tr.lo = lo
tr.hi = hi
tr.mul = float64(nbins) / (hi - lo)
} else {
tr.vectorsByFieldName = make(map[string][]float64)
for _, valueFieldName := range valueFieldNames {
tr.vectorsByFieldName[valueFieldName] = make([]float64, 0, histogramVectorInitialSize)
}
tr.recordTransformerFunc = tr.transformAuto
}
return tr, nil
}
func (tr *TransformerHistogram) Transform(
inrecAndContext *types.RecordAndContext,
outputRecordsAndContexts *[]*types.RecordAndContext, // list of *types.RecordAndContext
inputDownstreamDoneChannel <-chan bool,
outputDownstreamDoneChannel chan<- bool,
) {
HandleDefaultDownstreamDone(inputDownstreamDoneChannel, outputDownstreamDoneChannel)
tr.recordTransformerFunc(inrecAndContext, outputRecordsAndContexts, inputDownstreamDoneChannel, outputDownstreamDoneChannel)
}
func (tr *TransformerHistogram) transformNonAuto(
inrecAndContext *types.RecordAndContext,
outputRecordsAndContexts *[]*types.RecordAndContext, // list of *types.RecordAndContext
inputDownstreamDoneChannel <-chan bool,
outputDownstreamDoneChannel chan<- bool,
) {
if !inrecAndContext.EndOfStream {
tr.ingestNonAuto(inrecAndContext)
} else {
tr.emitNonAuto(&inrecAndContext.Context, outputRecordsAndContexts)
*outputRecordsAndContexts = append(*outputRecordsAndContexts, inrecAndContext) // end-of-stream marker
}
}
func (tr *TransformerHistogram) ingestNonAuto(
inrecAndContext *types.RecordAndContext,
) {
inrec := inrecAndContext.Record
for _, valueFieldName := range tr.valueFieldNames {
stringValue := inrec.Get(valueFieldName)
if stringValue != nil {
floatValue, ok := stringValue.GetNumericToFloatValue()
if !ok {
fmt.Fprintf(
os.Stderr,
"%s %s: cannot parse \"%s\" as float.\n",
"mlr", verbNameHistogram, stringValue.String(),
)
os.Exit(1)
}
if (floatValue >= tr.lo) && (floatValue < tr.hi) {
idx := int((floatValue - tr.lo) * tr.mul)
tr.countsByField[valueFieldName][idx]++
} else if floatValue == tr.hi {
idx := tr.nbins - 1
tr.countsByField[valueFieldName][idx]++
}
}
}
}
func (tr *TransformerHistogram) emitNonAuto(
endOfStreamContext *types.Context,
outputRecordsAndContexts *[]*types.RecordAndContext, // list of *types.RecordAndContext
) {
countFieldNames := make(map[string]string)
for _, valueFieldName := range tr.valueFieldNames {
countFieldNames[valueFieldName] = tr.outputPrefix + valueFieldName + "_count"
}
for i := int64(0); i < tr.nbins; i++ {
outrec := mlrval.NewMlrmapAsRecord()
outrec.PutReference(
tr.outputPrefix+"bin_lo",
mlrval.FromFloat(tr.lo+float64(i)/tr.mul),
)
outrec.PutReference(
tr.outputPrefix+"bin_hi",
mlrval.FromFloat(tr.lo+float64(i+1)/tr.mul),
)
for _, valueFieldName := range tr.valueFieldNames {
outrec.PutReference(
countFieldNames[valueFieldName],
mlrval.FromInt(tr.countsByField[valueFieldName][i]),
)
}
*outputRecordsAndContexts = append(*outputRecordsAndContexts, types.NewRecordAndContext(outrec, endOfStreamContext))
}
}
func (tr *TransformerHistogram) transformAuto(
inrecAndContext *types.RecordAndContext,
outputRecordsAndContexts *[]*types.RecordAndContext, // list of *types.RecordAndContext
inputDownstreamDoneChannel <-chan bool,
outputDownstreamDoneChannel chan<- bool,
) {
if !inrecAndContext.EndOfStream {
tr.ingestAuto(inrecAndContext)
} else {
tr.emitAuto(&inrecAndContext.Context, outputRecordsAndContexts)
*outputRecordsAndContexts = append(*outputRecordsAndContexts, inrecAndContext) // end-of-stream marker
}
}
func (tr *TransformerHistogram) ingestAuto(
inrecAndContext *types.RecordAndContext,
) {
inrec := inrecAndContext.Record
for _, valueFieldName := range tr.valueFieldNames {
mvalue := inrec.Get(valueFieldName)
if mvalue != nil {
value := mvalue.GetNumericToFloatValueOrDie()
tr.vectorsByFieldName[valueFieldName] = append(tr.vectorsByFieldName[valueFieldName], value)
}
}
}
func (tr *TransformerHistogram) emitAuto(
endOfStreamContext *types.Context,
outputRecordsAndContexts *[]*types.RecordAndContext, // list of *types.RecordAndContext
) {
haveLoHi := false
lo := 0.0
hi := 1.0
nbins := tr.nbins
// Limits pass
for _, valueFieldName := range tr.valueFieldNames {
vector := tr.vectorsByFieldName[valueFieldName]
n := len(vector)
for i := range n {
value := vector[i]
if haveLoHi {
if lo > value {
lo = value
}
if hi < value {
hi = value
}
} else {
lo = value
hi = value
haveLoHi = true
}
}
}
// Binning pass
mul := float64(nbins) / (hi - lo)
for _, valueFieldName := range tr.valueFieldNames {
vector := tr.vectorsByFieldName[valueFieldName]
counts := tr.countsByField[valueFieldName]
lib.InternalCodingErrorIf(counts == nil)
n := len(vector)
for i := range n {
value := vector[i]
if (value >= lo) && (value < hi) {
idx := int(((value - lo) * mul))
counts[idx]++
} else if value == hi {
idx := nbins - 1
counts[idx]++
}
}
}
// Emission pass
countFieldNames := make(map[string]string)
for _, valueFieldName := range tr.valueFieldNames {
countFieldNames[valueFieldName] = tr.outputPrefix + valueFieldName + "_count"
}
for i := range nbins {
outrec := mlrval.NewMlrmapAsRecord()
outrec.PutReference(
tr.outputPrefix+"bin_lo",
mlrval.FromFloat(lo+(float64(i)/mul)),
)
outrec.PutReference(
tr.outputPrefix+"bin_hi",
mlrval.FromFloat(lo+(float64(i+1)/mul)),
)
for _, valueFieldName := range tr.valueFieldNames {
outrec.PutReference(
countFieldNames[valueFieldName],
mlrval.FromInt(tr.countsByField[valueFieldName][i]),
)
}
*outputRecordsAndContexts = append(*outputRecordsAndContexts, types.NewRecordAndContext(outrec, endOfStreamContext))
}
}