mirror of
https://github.com/johnkerl/miller.git
synced 2026-07-18 08:55:41 +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>
246 lines
6.9 KiB
Go
246 lines
6.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/types"
|
|
)
|
|
|
|
const verbNameCount = "count"
|
|
|
|
var countOptions = []OptionSpec{
|
|
{Flag: "-g", Arg: "{a,b,c}", Type: "csv-list", Desc: "Optional group-by-field names for counts, e.g. a,b,c"},
|
|
{Flag: "-n", Type: "bool", Desc: "Show only the number of distinct values. Not interesting without -g."},
|
|
{Flag: "-o", Arg: "{name}", Type: "string", Desc: "Field name for output-count. Default \"count\"."},
|
|
}
|
|
|
|
var CountSetup = TransformerSetup{
|
|
Verb: verbNameCount,
|
|
UsageFunc: transformerCountUsage,
|
|
ParseCLIFunc: transformerCountParseCLI,
|
|
IgnoresInput: false,
|
|
Options: countOptions,
|
|
}
|
|
|
|
func transformerCountUsage(
|
|
o *os.File,
|
|
) {
|
|
fmt.Fprintf(o, "Usage: %s %s [options]\n", "mlr", verbNameCount)
|
|
fmt.Fprint(o,
|
|
`Prints number of records, optionally grouped by distinct values for specified field names.
|
|
`)
|
|
WriteVerbOptions(o, countOptions)
|
|
}
|
|
|
|
func transformerCountParseCLI(
|
|
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++
|
|
|
|
var groupByFieldNames []string = nil
|
|
showCountsOnly := false
|
|
outputFieldName := "count"
|
|
|
|
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":
|
|
transformerCountUsage(os.Stdout)
|
|
return nil, cli.ErrHelpRequested
|
|
|
|
case "-g":
|
|
groupByFieldNames, err = cli.VerbGetStringArrayArg(verb, opt, args, &argi, argc)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
case "-n":
|
|
showCountsOnly = true
|
|
|
|
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)
|
|
}
|
|
}
|
|
|
|
*pargi = argi
|
|
if !doConstruct { // All transformers must do this for main command-line parsing
|
|
return nil, nil
|
|
}
|
|
|
|
transformer, err := NewTransformerCount(
|
|
groupByFieldNames,
|
|
showCountsOnly,
|
|
outputFieldName,
|
|
)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return transformer, nil
|
|
}
|
|
|
|
type TransformerCount struct {
|
|
// input
|
|
groupByFieldNames []string
|
|
showCountsOnly bool
|
|
outputFieldName string
|
|
|
|
// state
|
|
recordTransformerFunc RecordTransformerFunc
|
|
ungroupedCount int64
|
|
// Example:
|
|
// * Suppose group-by fields are a,b.
|
|
// * One record has a=foo,b=bar
|
|
// * Another record has a=baz,b=quux
|
|
// * Map keys are strings "foo,bar" and "baz,quux".
|
|
// * groupedCounts maps "foo,bar" to 1 and "baz,quux" to 1.
|
|
// * groupByValues maps "foo,bar" to ["foo", "bar"] and "baz,quux" to ["baz", "quux"].
|
|
groupedCounts *lib.OrderedMap[int64]
|
|
groupingValues *lib.OrderedMap[[]*mlrval.Mlrval]
|
|
}
|
|
|
|
func NewTransformerCount(
|
|
groupByFieldNames []string,
|
|
showCountsOnly bool,
|
|
outputFieldName string,
|
|
) (*TransformerCount, error) {
|
|
|
|
tr := &TransformerCount{
|
|
groupByFieldNames: groupByFieldNames,
|
|
showCountsOnly: showCountsOnly,
|
|
outputFieldName: outputFieldName,
|
|
|
|
ungroupedCount: 0,
|
|
groupedCounts: lib.NewOrderedMap[int64](),
|
|
groupingValues: lib.NewOrderedMap[[]*mlrval.Mlrval](),
|
|
}
|
|
|
|
if groupByFieldNames == nil {
|
|
tr.recordTransformerFunc = tr.countUngrouped
|
|
} else {
|
|
tr.recordTransformerFunc = tr.countGrouped
|
|
}
|
|
|
|
return tr, nil
|
|
}
|
|
|
|
func (tr *TransformerCount) 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 *TransformerCount) countUngrouped(
|
|
inrecAndContext *types.RecordAndContext,
|
|
outputRecordsAndContexts *[]*types.RecordAndContext, // list of *types.RecordAndContext
|
|
inputDownstreamDoneChannel <-chan bool,
|
|
outputDownstreamDoneChannel chan<- bool,
|
|
) {
|
|
if !inrecAndContext.EndOfStream {
|
|
tr.ungroupedCount++
|
|
} else {
|
|
newrec := mlrval.NewMlrmapAsRecord()
|
|
newrec.PutCopy(tr.outputFieldName, mlrval.FromInt(tr.ungroupedCount))
|
|
*outputRecordsAndContexts = append(*outputRecordsAndContexts, types.NewRecordAndContext(newrec, &inrecAndContext.Context))
|
|
|
|
*outputRecordsAndContexts = append(*outputRecordsAndContexts, inrecAndContext) // end-of-stream marker
|
|
}
|
|
}
|
|
|
|
func (tr *TransformerCount) countGrouped(
|
|
inrecAndContext *types.RecordAndContext,
|
|
outputRecordsAndContexts *[]*types.RecordAndContext, // list of *types.RecordAndContext
|
|
inputDownstreamDoneChannel <-chan bool,
|
|
outputDownstreamDoneChannel chan<- bool,
|
|
) {
|
|
if !inrecAndContext.EndOfStream {
|
|
inrec := inrecAndContext.Record
|
|
|
|
groupingKey, selectedValues, ok := inrec.GetSelectedValuesAndJoined(
|
|
tr.groupByFieldNames,
|
|
)
|
|
if !ok { // Current record does not have specified fields; ignore
|
|
return
|
|
}
|
|
|
|
if !tr.groupedCounts.Has(groupingKey) {
|
|
var count int64 = 1
|
|
tr.groupedCounts.Put(groupingKey, count)
|
|
tr.groupingValues.Put(groupingKey, selectedValues)
|
|
} else {
|
|
tr.groupedCounts.Put(
|
|
groupingKey,
|
|
tr.groupedCounts.Get(groupingKey)+1,
|
|
)
|
|
}
|
|
|
|
} else {
|
|
if tr.showCountsOnly {
|
|
newrec := mlrval.NewMlrmapAsRecord()
|
|
newrec.PutCopy(tr.outputFieldName, mlrval.FromInt(tr.groupedCounts.FieldCount))
|
|
|
|
outrecAndContext := types.NewRecordAndContext(newrec, &inrecAndContext.Context)
|
|
*outputRecordsAndContexts = append(*outputRecordsAndContexts, outrecAndContext)
|
|
|
|
} else {
|
|
for outer := tr.groupedCounts.Head; outer != nil; outer = outer.Next {
|
|
groupingKey := outer.Key
|
|
newrec := mlrval.NewMlrmapAsRecord()
|
|
|
|
// Example:
|
|
// * Suppose group-by fields are a,b.
|
|
// * Record has a=foo,b=bar
|
|
// * Grouping key is "foo,bar"
|
|
// * Grouping values for key is ["foo", "bar"]
|
|
// Here we populate a record with "a=foo,b=bar".
|
|
|
|
groupingValuesForKey := tr.groupingValues.Get(groupingKey)
|
|
i := 0
|
|
for _, groupingValueForKey := range groupingValuesForKey {
|
|
newrec.PutCopy(tr.groupByFieldNames[i], groupingValueForKey)
|
|
i++
|
|
}
|
|
|
|
countForGroup := outer.Value
|
|
newrec.PutCopy(tr.outputFieldName, mlrval.FromInt(countForGroup))
|
|
|
|
outrecAndContext := types.NewRecordAndContext(newrec, &inrecAndContext.Context)
|
|
*outputRecordsAndContexts = append(*outputRecordsAndContexts, outrecAndContext)
|
|
}
|
|
}
|
|
|
|
*outputRecordsAndContexts = append(*outputRecordsAndContexts, inrecAndContext) // end-of-stream marker
|
|
}
|
|
}
|