miller/pkg/transformers/top.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

298 lines
9 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/transformers/utils"
"github.com/johnkerl/miller/v6/pkg/types"
)
const verbNameTop = "top"
const verbTopDefaultOutputFieldName = "top_idx"
var topOptions = []OptionSpec{
{Flag: "-f", Arg: "{a,b,c}", Type: "csv-list", Desc: "Value-field names for top counts."},
{Flag: "-g", Arg: "{d,e,f}", Type: "csv-list", Desc: "Optional group-by-field names for top counts."},
{Flag: "-n", Arg: "{count}", Type: "int", Desc: "How many records to print per category; default 1."},
{Flag: "-a", Type: "bool", Desc: "Print all fields for top-value records; default is to print only value and group-by fields. Requires a single value-field name only."},
{Flag: "--max", Type: "bool", Desc: "Print top largest values. This is the default."},
{Flag: "--min", Type: "bool", Desc: "Print top smallest values; default is top largest values."},
{Flag: "-F", Type: "bool", Desc: "Keep top values as floats even if they look like integers (ignored in Miller 6, kept for backward compatibility)."},
{Flag: "-o", Arg: "{name}", Type: "string", Desc: "Field name for output indices. Default \"top_idx\". Ignored if -a is used."},
}
var TopSetup = TransformerSetup{
Verb: verbNameTop,
UsageFunc: transformerTopUsage,
ParseCLIFunc: transformerTopParseCLI,
IgnoresInput: false,
Options: topOptions,
}
func transformerTopUsage(
o *os.File,
) {
argv0 := "mlr"
verb := verbNameTop
fmt.Fprintf(o, "Usage: %s %s [options]\n", argv0, verb)
WriteVerbOptions(o, topOptions)
fmt.Fprintf(o, "Prints the n records with smallest/largest values at specified fields,\n")
fmt.Fprintf(o, "optionally by category. If -a is given, then the top records are emitted\n")
fmt.Fprintf(o, "with the same fields as they appeared in the input. Without -a, only fields\n")
fmt.Fprintf(o, "from -f, fields from -g, and the top-index field are emitted. For more information\n")
fmt.Fprintf(o, "please see https://miller.readthedocs.io/en/latest/reference-verbs#top\n")
}
func transformerTopParseCLI(
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
topCount := int64(1)
var valueFieldNames []string = nil
var groupByFieldNames []string = nil
showFullRecords := false
doMax := true
outputFieldName := verbTopDefaultOutputFieldName
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":
transformerTopUsage(os.Stdout)
return nil, cli.ErrHelpRequested
case "-n":
topCount, err = cli.VerbGetIntArg(verb, opt, args, &argi, argc)
if err != nil {
return nil, err
}
case "-f":
valueFieldNames, err = cli.VerbGetStringArrayArg(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
}
case "-a":
showFullRecords = true
case "--max":
doMax = true
case "--min":
doMax = false
case "-F":
// Ignored in Miller 6; allowed for command-line backward compatibility
case "-o":
outputFieldName, 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 len(valueFieldNames) > 1 && showFullRecords {
return nil, cli.VerbErrorf(verb, "-a (full records) incompatible with multiple -f fields")
}
*pargi = argi
if !doConstruct { // All transformers must do this for main command-line parsing
return nil, nil
}
transformer, _ := NewTransformerTop(
topCount,
valueFieldNames,
groupByFieldNames,
showFullRecords,
doMax,
outputFieldName,
)
return transformer, nil
}
type TransformerTop struct {
topCount int64
valueFieldNames []string
groupByFieldNames []string
showFullRecords bool
doMax bool
outputFieldName string
// Two-level map from grouping key (string of joined-together group-by field values),
// to string value-field name, to *utils.TopKeeper
groups *lib.OrderedMap[*lib.OrderedMap[*utils.TopKeeper]]
groupingKeysToGroupByFieldValues map[string][]*mlrval.Mlrval
}
func NewTransformerTop(
topCount int64,
valueFieldNames []string,
groupByFieldNames []string,
showFullRecords bool,
doMax bool,
outputFieldName string,
) (*TransformerTop, error) {
tr := &TransformerTop{
topCount: topCount,
valueFieldNames: valueFieldNames,
groupByFieldNames: groupByFieldNames,
showFullRecords: showFullRecords,
doMax: doMax,
outputFieldName: outputFieldName,
groups: lib.NewOrderedMap[*lib.OrderedMap[*utils.TopKeeper]](),
groupingKeysToGroupByFieldValues: make(map[string][]*mlrval.Mlrval),
}
return tr, nil
}
func (tr *TransformerTop) Transform(
inrecAndContext *types.RecordAndContext,
outputRecordsAndContexts *[]*types.RecordAndContext, // list of *types.RecordAndContext
inputDownstreamDoneChannel <-chan bool,
outputDownstreamDoneChannel chan<- bool,
) {
HandleDefaultDownstreamDone(inputDownstreamDoneChannel, outputDownstreamDoneChannel)
if !inrecAndContext.EndOfStream {
tr.ingest(inrecAndContext)
} else {
tr.emit(inrecAndContext, outputRecordsAndContexts)
}
}
func (tr *TransformerTop) ingest(
inrecAndContext *types.RecordAndContext,
) {
inrec := inrecAndContext.Record
// ["s", "t"]
valueFieldValues, fok := inrec.ReferenceSelectedValues(tr.valueFieldNames)
groupingKey, groupByFieldValues, gok := inrec.GetSelectedValuesAndJoined(tr.groupByFieldNames)
// Heterogeneous-data case -- not all sought fields were present in record
if !fok || !gok {
return
}
iSecondLevel := tr.groups.Get(groupingKey)
var secondLevel *lib.OrderedMap[*utils.TopKeeper] = nil
if iSecondLevel == nil {
secondLevel = lib.NewOrderedMap[*utils.TopKeeper]()
tr.groups.Put(groupingKey, secondLevel)
tr.groupingKeysToGroupByFieldValues[groupingKey] = groupByFieldValues
} else {
secondLevel = iSecondLevel
}
// for "x", "y" and "1", "2"
for i := range tr.valueFieldNames {
valueFieldName := tr.valueFieldNames[i]
valueFieldValue := valueFieldValues[i]
iTopKeeper := secondLevel.Get(valueFieldName)
var topKeeper *utils.TopKeeper
if iTopKeeper == nil {
topKeeper = utils.NewTopKeeper(tr.topCount, tr.doMax)
secondLevel.Put(valueFieldName, topKeeper)
} else {
topKeeper = iTopKeeper
}
var maybeRecordAndContext *types.RecordAndContext = nil
if tr.showFullRecords {
maybeRecordAndContext = inrecAndContext
}
topKeeper.Add(
valueFieldValue,
maybeRecordAndContext,
)
}
}
func (tr *TransformerTop) emit(
inrecAndContext *types.RecordAndContext,
outputRecordsAndContexts *[]*types.RecordAndContext, // list of *types.RecordAndContext
) {
for pa := tr.groups.Head; pa != nil; pa = pa.Next {
groupingKey := pa.Key
secondLevel := pa.Value
groupByFieldValues := tr.groupingKeysToGroupByFieldValues[groupingKey]
// Above we required that there be only one value field in the
// show-full-records case. That's because here, we print each record at most
// once, which would need a change in the format presented as output.
if tr.showFullRecords {
for pb := secondLevel.Head; pb != nil; pb = pb.Next {
topKeeper := pb.Value
for i := int64(0); i < topKeeper.GetSize(); i++ {
*outputRecordsAndContexts = append(*outputRecordsAndContexts, topKeeper.TopRecordsAndContexts[i].Copy())
}
}
} else {
for i := int64(0); i < tr.topCount; i++ {
newrec := mlrval.NewMlrmapAsRecord()
// Add in a=s,b=t fields:
for j := range tr.groupByFieldNames {
newrec.PutCopy(tr.groupByFieldNames[j], groupByFieldValues[j])
}
// Add in fields such as x_top_1=#
// for "x", "y"
for pb := secondLevel.Head; pb != nil; pb = pb.Next {
valueFieldName := pb.Key
topKeeper := pb.Value
key := valueFieldName + "_top"
if i < topKeeper.GetSize() {
newrec.PutReference(tr.outputFieldName, mlrval.FromInt(i+1))
newrec.PutReference(key, topKeeper.TopValues[i].Copy())
} else {
newrec.PutReference(tr.outputFieldName, mlrval.FromInt(i+1))
newrec.PutCopy(key, mlrval.VOID)
}
}
*outputRecordsAndContexts = append(*outputRecordsAndContexts, types.NewRecordAndContext(newrec, &inrecAndContext.Context))
}
}
}
*outputRecordsAndContexts = append(*outputRecordsAndContexts, inrecAndContext) // emit end-of-stream marker
}