mirror of
https://github.com/johnkerl/miller.git
synced 2026-07-18 00:45:47 +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>
463 lines
16 KiB
Go
463 lines
16 KiB
Go
package transformers
|
|
|
|
// WIDE:
|
|
// time X Y Z
|
|
// 1 2009-01-01 0.65473572 2.4520609 -1.46570942
|
|
// 2 2009-01-02 -0.89248112 0.2154713 -2.05357735
|
|
// 3 2009-01-03 0.98012375 1.3179287 4.64248357
|
|
// 4 2009-01-04 0.35397376 3.3765645 -0.25237774
|
|
// 5 2009-01-05 2.19357813 1.3477511 0.09719105
|
|
|
|
// LONG:
|
|
// time item price
|
|
// 1 2009-01-01 X 0.65473572
|
|
// 2 2009-01-02 X -0.89248112
|
|
// 3 2009-01-03 X 0.98012375
|
|
// 4 2009-01-04 X 0.35397376
|
|
// 5 2009-01-05 X 2.19357813
|
|
// 6 2009-01-01 Y 2.45206093
|
|
// 7 2009-01-02 Y 0.21547134
|
|
// 8 2009-01-03 Y 1.31792866
|
|
// 9 2009-01-04 Y 3.37656453
|
|
// 10 2009-01-05 Y 1.34775108
|
|
// 11 2009-01-01 Z -1.46570942
|
|
// 12 2009-01-02 Z -2.05357735
|
|
// 13 2009-01-03 Z 4.64248357
|
|
// 14 2009-01-04 Z -0.25237774
|
|
// 15 2009-01-05 Z 0.09719105
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"regexp"
|
|
"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 verbNameReshape = "reshape"
|
|
|
|
var reshapeOptions = []OptionSpec{
|
|
{Flag: "-i", Arg: "{input field names}", Type: "csv-list", Desc: "Input field names for wide-to-long reshape. Use with -o."},
|
|
{Flag: "-r", Arg: "{input field regex}", Type: "regex", Desc: "Input field regex for wide-to-long reshape. May be repeated. Use with -o. If you have multiple regexes, please specify them using multiple -r, since regexes can contain commas within them.", Repeatable: true},
|
|
{Flag: "-o", Arg: "{key-field name,value-field name}", Type: "csv-list", Desc: "Output key-field and value-field names for wide-to-long reshape. Requires -i or -r."},
|
|
{Flag: "-s", Arg: "{key-field name,value-field name}", Type: "csv-list", Desc: "Key-field and value-field names for long-to-wide reshape."},
|
|
}
|
|
|
|
var ReshapeSetup = TransformerSetup{
|
|
Verb: verbNameReshape,
|
|
UsageFunc: transformerReshapeUsage,
|
|
ParseCLIFunc: transformerReshapeParseCLI,
|
|
IgnoresInput: false,
|
|
Options: reshapeOptions,
|
|
}
|
|
|
|
func transformerReshapeUsage(
|
|
o *os.File,
|
|
) {
|
|
argv0 := "mlr"
|
|
verb := verbNameReshape
|
|
|
|
fmt.Fprintf(o, "Usage: %s %s [options]\n", argv0, verb)
|
|
|
|
fmt.Fprintf(o, "Wide-to-long options:\n")
|
|
fmt.Fprintf(o, " -i {input field names} -o {key-field name,value-field name}\n")
|
|
fmt.Fprintf(o, " -r {input field regex} -o {key-field name,value-field name}\n")
|
|
fmt.Fprintf(o, " These pivot/reshape the input data such that the input fields are removed\n")
|
|
fmt.Fprintf(o, " and separate records are emitted for each key/value pair.\n")
|
|
fmt.Fprintf(o, " Note: if you have multiple regexes, please specify them using multiple -r,\n")
|
|
fmt.Fprintf(o, " since regexes can contain commas within them.\n")
|
|
fmt.Fprintf(o, " Note: this works with tail -f and produces output records for each input\n")
|
|
fmt.Fprintf(o, " record seen. If input is coming from `tail -f`, be sure to use\n")
|
|
fmt.Fprintf(o, " `--records-per-batch 1`.\n")
|
|
fmt.Fprintf(o, "Long-to-wide options:\n")
|
|
fmt.Fprintf(o, " -s {key-field name,value-field name}\n")
|
|
fmt.Fprintf(o, " These pivot/reshape the input data to undo the wide-to-long operation.\n")
|
|
fmt.Fprintf(o, " Note: this does not work with tail -f; it produces output records only after\n")
|
|
fmt.Fprintf(o, " all input records have been read.\n")
|
|
WriteVerbOptions(o, reshapeOptions)
|
|
fmt.Fprintf(o, "\n")
|
|
fmt.Fprintf(o, "Examples:\n")
|
|
fmt.Fprintf(o, "\n")
|
|
fmt.Fprintf(o, " Input file \"wide.txt\":\n")
|
|
fmt.Fprintf(o, " time X Y\n")
|
|
fmt.Fprintf(o, " 2009-01-01 0.65473572 2.4520609\n")
|
|
fmt.Fprintf(o, " 2009-01-02 -0.89248112 0.2154713\n")
|
|
fmt.Fprintf(o, " 2009-01-03 0.98012375 1.3179287\n")
|
|
fmt.Fprintf(o, "\n")
|
|
fmt.Fprintf(o, " %s --pprint %s -i X,Y -o item,value wide.txt\n", argv0, verb)
|
|
fmt.Fprintf(o, " time item value\n")
|
|
fmt.Fprintf(o, " 2009-01-01 X 0.65473572\n")
|
|
fmt.Fprintf(o, " 2009-01-01 Y 2.4520609\n")
|
|
fmt.Fprintf(o, " 2009-01-02 X -0.89248112\n")
|
|
fmt.Fprintf(o, " 2009-01-02 Y 0.2154713\n")
|
|
fmt.Fprintf(o, " 2009-01-03 X 0.98012375\n")
|
|
fmt.Fprintf(o, " 2009-01-03 Y 1.3179287\n")
|
|
fmt.Fprintf(o, "\n")
|
|
fmt.Fprintf(o, " %s --pprint %s -r '[A-Z]' -o item,value wide.txt\n", argv0, verb)
|
|
fmt.Fprintf(o, " time item value\n")
|
|
fmt.Fprintf(o, " 2009-01-01 X 0.65473572\n")
|
|
fmt.Fprintf(o, " 2009-01-01 Y 2.4520609\n")
|
|
fmt.Fprintf(o, " 2009-01-02 X -0.89248112\n")
|
|
fmt.Fprintf(o, " 2009-01-02 Y 0.2154713\n")
|
|
fmt.Fprintf(o, " 2009-01-03 X 0.98012375\n")
|
|
fmt.Fprintf(o, " 2009-01-03 Y 1.3179287\n")
|
|
fmt.Fprintf(o, "\n")
|
|
fmt.Fprintf(o, " Input file \"long.txt\":\n")
|
|
fmt.Fprintf(o, " time item value\n")
|
|
fmt.Fprintf(o, " 2009-01-01 X 0.65473572\n")
|
|
fmt.Fprintf(o, " 2009-01-01 Y 2.4520609\n")
|
|
fmt.Fprintf(o, " 2009-01-02 X -0.89248112\n")
|
|
fmt.Fprintf(o, " 2009-01-02 Y 0.2154713\n")
|
|
fmt.Fprintf(o, " 2009-01-03 X 0.98012375\n")
|
|
fmt.Fprintf(o, " 2009-01-03 Y 1.3179287\n")
|
|
fmt.Fprintf(o, "\n")
|
|
fmt.Fprintf(o, " %s --pprint %s -s item,value long.txt\n", argv0, verb)
|
|
fmt.Fprintf(o, " time X Y\n")
|
|
fmt.Fprintf(o, " 2009-01-01 0.65473572 2.4520609\n")
|
|
fmt.Fprintf(o, " 2009-01-02 -0.89248112 0.2154713\n")
|
|
fmt.Fprintf(o, " 2009-01-03 0.98012375 1.3179287\n")
|
|
fmt.Fprintf(o, "See also %s nest.\n", argv0)
|
|
}
|
|
|
|
func transformerReshapeParseCLI(
|
|
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 inputFieldNames []string = nil
|
|
var inputFieldRegexStrings []string = nil
|
|
var outputFieldNames []string = nil
|
|
var splitOutFieldNames []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":
|
|
transformerReshapeUsage(os.Stdout)
|
|
return nil, cli.ErrHelpRequested
|
|
|
|
case "-i":
|
|
inputFieldNames, err = cli.VerbGetStringArrayArg(verb, opt, args, &argi, argc)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
case "-r":
|
|
inputFieldRegexString, err := cli.VerbGetStringArg(verb, opt, args, &argi, argc)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if inputFieldRegexStrings == nil {
|
|
inputFieldRegexStrings = []string{}
|
|
}
|
|
inputFieldRegexStrings = append(inputFieldRegexStrings, inputFieldRegexString)
|
|
case "-o":
|
|
outputFieldNames, err = cli.VerbGetStringArrayArg(verb, opt, args, &argi, argc)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
case "-s":
|
|
splitOutFieldNames, 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)
|
|
}
|
|
}
|
|
|
|
outputKeyFieldName := ""
|
|
outputValueFieldName := ""
|
|
splitOutKeyFieldName := ""
|
|
splitOutValueFieldName := ""
|
|
|
|
if splitOutFieldNames == nil {
|
|
// wide to long
|
|
if inputFieldNames == nil && inputFieldRegexStrings == nil {
|
|
return nil, cli.VerbErrorf(verb, "-i or -r is required for wide-to-long")
|
|
}
|
|
|
|
if outputFieldNames == nil {
|
|
return nil, cli.VerbErrorf(verb, "-o is required for wide-to-long")
|
|
}
|
|
if len(outputFieldNames) != 2 {
|
|
return nil, cli.VerbErrorf(verb, "-o must have exactly 2 field names for wide-to-long")
|
|
}
|
|
outputKeyFieldName = outputFieldNames[0]
|
|
outputValueFieldName = outputFieldNames[1]
|
|
} else {
|
|
// long to wide
|
|
if len(splitOutFieldNames) != 2 {
|
|
return nil, cli.VerbErrorf(verb, "-s must have exactly 2 field names for long-to-wide")
|
|
}
|
|
splitOutKeyFieldName = splitOutFieldNames[0]
|
|
splitOutValueFieldName = splitOutFieldNames[1]
|
|
}
|
|
|
|
*pargi = argi
|
|
if !doConstruct { // All transformers must do this for main command-line parsing
|
|
return nil, nil
|
|
}
|
|
|
|
transformer, err := NewTransformerReshape(
|
|
inputFieldNames,
|
|
inputFieldRegexStrings,
|
|
outputKeyFieldName,
|
|
outputValueFieldName,
|
|
splitOutKeyFieldName,
|
|
splitOutValueFieldName,
|
|
)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return transformer, nil
|
|
}
|
|
|
|
type TransformerReshape struct {
|
|
// for wide-to-long:
|
|
inputFieldNames []string
|
|
inputFieldRegexes []*regexp.Regexp
|
|
outputKeyFieldName string
|
|
outputValueFieldName string
|
|
|
|
// for long-to-wide:
|
|
splitOutKeyFieldName string
|
|
splitOutValueFieldName string
|
|
otherKeysToOtherValuesToBuckets *lib.OrderedMap[*lib.OrderedMap[*tReshapeBucket]]
|
|
|
|
recordTransformerFunc RecordTransformerFunc
|
|
}
|
|
|
|
func NewTransformerReshape(
|
|
inputFieldNames []string,
|
|
inputFieldRegexStrings []string,
|
|
outputKeyFieldName string,
|
|
outputValueFieldName string,
|
|
splitOutKeyFieldName string,
|
|
splitOutValueFieldName string,
|
|
) (*TransformerReshape, error) {
|
|
|
|
tr := &TransformerReshape{
|
|
inputFieldNames: inputFieldNames,
|
|
outputKeyFieldName: outputKeyFieldName,
|
|
outputValueFieldName: outputValueFieldName,
|
|
|
|
splitOutKeyFieldName: splitOutKeyFieldName,
|
|
splitOutValueFieldName: splitOutValueFieldName,
|
|
otherKeysToOtherValuesToBuckets: lib.NewOrderedMap[*lib.OrderedMap[*tReshapeBucket]](),
|
|
}
|
|
|
|
if inputFieldRegexStrings != nil {
|
|
tr.inputFieldRegexes = make([]*regexp.Regexp, len(inputFieldRegexStrings))
|
|
// TODO: make a library function for string-array to regex-array
|
|
for i, inputFieldRegexString := range inputFieldRegexStrings {
|
|
regex, err := lib.CompileMillerRegex(inputFieldRegexString)
|
|
if err != nil {
|
|
fmt.Fprintf(
|
|
os.Stderr,
|
|
"%s %s: cannot compile regex [%s]\n",
|
|
"mlr", verbNameReshape, inputFieldRegexString,
|
|
)
|
|
os.Exit(1)
|
|
}
|
|
tr.inputFieldRegexes[i] = regex
|
|
}
|
|
}
|
|
|
|
if splitOutKeyFieldName == "" {
|
|
if tr.inputFieldRegexes == nil {
|
|
tr.recordTransformerFunc = tr.wideToLongNoRegex
|
|
} else {
|
|
tr.recordTransformerFunc = tr.wideToLongRegex
|
|
}
|
|
} else {
|
|
tr.recordTransformerFunc = tr.longToWide
|
|
}
|
|
|
|
return tr, nil
|
|
}
|
|
|
|
func (tr *TransformerReshape) 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 *TransformerReshape) wideToLongNoRegex(
|
|
inrecAndContext *types.RecordAndContext,
|
|
outputRecordsAndContexts *[]*types.RecordAndContext, // list of *types.RecordAndContext
|
|
inputDownstreamDoneChannel <-chan bool,
|
|
outputDownstreamDoneChannel chan<- bool,
|
|
) {
|
|
if !inrecAndContext.EndOfStream {
|
|
inrec := inrecAndContext.Record
|
|
pairs := mlrval.NewMlrmap()
|
|
for _, inputFieldName := range tr.inputFieldNames {
|
|
value := inrec.Get(inputFieldName)
|
|
if value != nil {
|
|
// Reference, not copy, since the inrec will be freed here, or everything else will
|
|
pairs.PutReference(inputFieldName, value)
|
|
}
|
|
}
|
|
|
|
// Unset the record keys after iterating over them, rather than during
|
|
for pe := pairs.Head; pe != nil; pe = pe.Next {
|
|
inrec.Remove(pe.Key)
|
|
}
|
|
|
|
if pairs.IsEmpty() {
|
|
*outputRecordsAndContexts = append(*outputRecordsAndContexts, inrecAndContext)
|
|
} else {
|
|
for pf := pairs.Head; pf != nil; pf = pf.Next {
|
|
outrec := inrec.Copy()
|
|
outrec.PutReference(tr.outputKeyFieldName, mlrval.FromString(pf.Key))
|
|
outrec.PutReference(tr.outputValueFieldName, pf.Value)
|
|
*outputRecordsAndContexts = append(*outputRecordsAndContexts, types.NewRecordAndContext(outrec, &inrecAndContext.Context))
|
|
}
|
|
}
|
|
|
|
} else {
|
|
*outputRecordsAndContexts = append(*outputRecordsAndContexts, inrecAndContext) // emit end-of-stream marker
|
|
}
|
|
}
|
|
|
|
func (tr *TransformerReshape) wideToLongRegex(
|
|
inrecAndContext *types.RecordAndContext,
|
|
outputRecordsAndContexts *[]*types.RecordAndContext, // list of *types.RecordAndContext
|
|
inputDownstreamDoneChannel <-chan bool,
|
|
outputDownstreamDoneChannel chan<- bool,
|
|
) {
|
|
if !inrecAndContext.EndOfStream {
|
|
inrec := inrecAndContext.Record
|
|
pairs := mlrval.NewMlrmap()
|
|
|
|
for pd := inrec.Head; pd != nil; pd = pd.Next {
|
|
for _, inputFieldRegex := range tr.inputFieldRegexes {
|
|
if inputFieldRegex.MatchString(pd.Key) {
|
|
// Reference, not copy, since the inrec will be freed here, or everything else will
|
|
pairs.PutReference(pd.Key, pd.Value)
|
|
break
|
|
}
|
|
}
|
|
}
|
|
|
|
// Unset the record keys after iterating over them, rather than during
|
|
for pe := pairs.Head; pe != nil; pe = pe.Next {
|
|
inrec.Remove(pe.Key)
|
|
}
|
|
|
|
if pairs.IsEmpty() {
|
|
*outputRecordsAndContexts = append(*outputRecordsAndContexts, inrecAndContext)
|
|
} else {
|
|
for pf := pairs.Head; pf != nil; pf = pf.Next {
|
|
outrec := inrec.Copy()
|
|
outrec.PutReference(tr.outputKeyFieldName, mlrval.FromString(pf.Key))
|
|
outrec.PutReference(tr.outputValueFieldName, pf.Value)
|
|
*outputRecordsAndContexts = append(*outputRecordsAndContexts, types.NewRecordAndContext(outrec, &inrecAndContext.Context))
|
|
}
|
|
}
|
|
|
|
} else {
|
|
*outputRecordsAndContexts = append(*outputRecordsAndContexts, inrecAndContext) // emit end-of-stream marker
|
|
}
|
|
}
|
|
|
|
func (tr *TransformerReshape) longToWide(
|
|
inrecAndContext *types.RecordAndContext,
|
|
outputRecordsAndContexts *[]*types.RecordAndContext, // list of *types.RecordAndContext
|
|
inputDownstreamDoneChannel <-chan bool,
|
|
outputDownstreamDoneChannel chan<- bool,
|
|
) {
|
|
if !inrecAndContext.EndOfStream {
|
|
inrec := inrecAndContext.Record
|
|
|
|
splitOutKeyFieldValue := inrec.Get(tr.splitOutKeyFieldName)
|
|
splitOutValueFieldValue := inrec.Get(tr.splitOutValueFieldName)
|
|
if splitOutKeyFieldValue == nil || splitOutValueFieldValue == nil {
|
|
*outputRecordsAndContexts = append(*outputRecordsAndContexts, inrecAndContext)
|
|
return
|
|
}
|
|
|
|
inrec.Remove(tr.splitOutKeyFieldName)
|
|
inrec.Remove(tr.splitOutValueFieldName)
|
|
|
|
// Don't unset tr.fieldName in the record, so we can implode in-place at the end.
|
|
otherKeysJoined := inrec.GetKeysJoined()
|
|
var otherValuesToBuckets *lib.OrderedMap[*tReshapeBucket] = nil
|
|
|
|
iOtherValuesToBuckets := tr.otherKeysToOtherValuesToBuckets.Get(otherKeysJoined)
|
|
if iOtherValuesToBuckets == nil {
|
|
otherValuesToBuckets = lib.NewOrderedMap[*tReshapeBucket]()
|
|
tr.otherKeysToOtherValuesToBuckets.Put(otherKeysJoined, otherValuesToBuckets)
|
|
} else {
|
|
otherValuesToBuckets = iOtherValuesToBuckets
|
|
}
|
|
|
|
otherValuesJoined := inrec.GetValuesJoined()
|
|
bucket := otherValuesToBuckets.Get(otherValuesJoined)
|
|
if bucket == nil {
|
|
bucket = newReshapeBucket(inrec)
|
|
otherValuesToBuckets.Put(otherValuesJoined, bucket)
|
|
}
|
|
|
|
bucket.pairs.PutCopy(splitOutKeyFieldValue.String(), splitOutValueFieldValue)
|
|
|
|
} else {
|
|
|
|
for pe := tr.otherKeysToOtherValuesToBuckets.Head; pe != nil; pe = pe.Next {
|
|
otherValuesToBuckets := pe.Value
|
|
for pf := otherValuesToBuckets.Head; pf != nil; pf = pf.Next {
|
|
bucket := pf.Value
|
|
outrec := bucket.representative
|
|
bucket.representative = nil // ownership transfer
|
|
|
|
for pg := bucket.pairs.Head; pg != nil; pg = pg.Next {
|
|
outrec.PutReference(pg.Key, pg.Value)
|
|
}
|
|
|
|
*outputRecordsAndContexts = append(*outputRecordsAndContexts, types.NewRecordAndContext(outrec, &inrecAndContext.Context))
|
|
}
|
|
}
|
|
|
|
*outputRecordsAndContexts = append(*outputRecordsAndContexts, inrecAndContext) // emit end-of-stream marker
|
|
}
|
|
}
|
|
|
|
type tReshapeBucket struct {
|
|
representative *mlrval.Mlrmap
|
|
pairs *mlrval.Mlrmap
|
|
}
|
|
|
|
func newReshapeBucket(representative *mlrval.Mlrmap) *tReshapeBucket {
|
|
return &tReshapeBucket{
|
|
representative: representative,
|
|
pairs: mlrval.NewMlrmap(),
|
|
}
|
|
}
|