suyiiyii/yq
1
0
Fork 0
mirror of https://github.com/mikefarah/yq.git synced 2025-02-06 20:23:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed group by issue

Browse Source
This commit is contained in:
Mike Farah 2023-05-30 11:39:25 +10:00
parent d033ad570e
commit d17216de3f
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/yqlib/doc/operators/group-by.md
View File

@ -13,9 +13,9 @@ yq 'group_by(.foo)' sample.yml
``` ```
will output will output
```yaml ```yaml
- - [{foo: 1, bar: 10}, {foo: 3, bar: 100}, {foo: 1, bar: 1}] - - {foo: 1, bar: 10}
- [{foo: 1, bar: 10}, {foo: 3, bar: 100}, {foo: 1, bar: 1}] - {foo: 1, bar: 1}
- - [{foo: 1, bar: 10}, {foo: 3, bar: 100}, {foo: 1, bar: 1}] - - {foo: 3, bar: 100}
``` ```
## Group by field, with nuls ## Group by field, with nuls
@ -29,10 +29,10 @@ yq 'group_by(.foo)' sample.yml
``` ```
will output will output
```yaml ```yaml
- - [{cat: dog}, {foo: 1, bar: 10}, {foo: 3, bar: 100}, {no: foo for you}, {foo: 1, bar: 1}] - - {cat: dog}
- [{cat: dog}, {foo: 1, bar: 10}, {foo: 3, bar: 100}, {no: foo for you}, {foo: 1, bar: 1}] - {no: foo for you}
- - [{cat: dog}, {foo: 1, bar: 10}, {foo: 3, bar: 100}, {no: foo for you}, {foo: 1, bar: 1}] - - {foo: 1, bar: 10}
- [{cat: dog}, {foo: 1, bar: 10}, {foo: 3, bar: 100}, {no: foo for you}, {foo: 1, bar: 1}] - {foo: 1, bar: 1}
- - [{cat: dog}, {foo: 1, bar: 10}, {foo: 3, bar: 100}, {no: foo for you}, {foo: 1, bar: 1}] - - {foo: 3, bar: 100}
``` ```

2
pkg/yqlib/operator_group_by.go
View File

@ -30,7 +30,7 @@ func processIntoGroups(d *dataTreeNavigator, context Context, rhsExp *Expression
groupList = list.New() groupList = list.New()
newMatches.Set(keyValue, groupList) newMatches.Set(keyValue, groupList)
} }
groupList.(*list.List).PushBack(node) groupList.(*list.List).PushBack(child)
} }
return newMatches, nil return newMatches, nil
} }

18
pkg/yqlib/operator_group_by_test.go
View File

@ -13,19 +13,19 @@ var groupByOperatorScenarios = []expressionScenario{
"D0, P[], (!!seq)::- - {foo: 1, bar: 10}\n - {foo: 1, bar: 1}\n- - {foo: 3, bar: 100}\n", "D0, P[], (!!seq)::- - {foo: 1, bar: 10}\n - {foo: 1, bar: 1}\n- - {foo: 3, bar: 100}\n",
}, },
}, },
// { {
// description: "Group by field, with nuls", description: "Group by field, with nuls",
// document: `[{cat: dog}, {foo: 1, bar: 10}, {foo: 3, bar: 100}, {no: foo for you}, {foo: 1, bar: 1}]`, document: `[{cat: dog}, {foo: 1, bar: 10}, {foo: 3, bar: 100}, {no: foo for you}, {foo: 1, bar: 1}]`,
// expression: `group_by(.foo)`, expression: `group_by(.foo)`,
// expected: []string{ expected: []string{
// "D0, P[], (!!seq)::- - {cat: dog}\n - {no: foo for you}\n- - {foo: 1, bar: 10}\n - {foo: 1, bar: 1}\n- - {foo: 3, bar: 100}\n", "D0, P[], (!!seq)::- - {cat: dog}\n - {no: foo for you}\n- - {foo: 1, bar: 10}\n - {foo: 1, bar: 1}\n- - {foo: 3, bar: 100}\n",
// }, },
// }, },
} }
func TestGroupByOperatorScenarios(t *testing.T) { func TestGroupByOperatorScenarios(t *testing.T) {
for _, tt := range groupByOperatorScenarios { for _, tt := range groupByOperatorScenarios {
testScenario(t, &tt) testScenario(t, &tt)
} }
// documentOperatorScenarios(t, "group-by", groupByOperatorScenarios) documentOperatorScenarios(t, "group-by", groupByOperatorScenarios)
} }