openstack/yaql
Code Issues Proposed changes

Merge "groupBy() aggregator was fixed"

Browse Source
This commit is contained in:
Jenkins 2016-09-26 13:08:03 +00:00 committed by Gerrit Code Review
commit a7393f446a
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
yaql/standard_library/queries.py
View File

@ -343,12 +343,14 @@ def group_by(engine, collection, key_selector, value_selector=None,
aggregator=None):
groups = {}
if aggregator is None:
aggregator = lambda x: x
new_aggregator = lambda x: x
else:
new_aggregator = lambda x: (x[0], aggregator(x[1]))
for t in collection:
value = t if value_selector is None else value_selector(t)
groups.setdefault(key_selector(t), []).append(value)
utils.limit_memory_usage(engine, (1, groups))
return select(six.iteritems(groups), aggregator)
return select(six.iteritems(groups), new_aggregator)
@specs.method

6
yaql/tests/test_queries.py
View File

@ -212,18 +212,18 @@ class TestQueries(yaql.tests.TestCase):
self.assertItemsEqual(
[[1, 'ac'], [2, 'be'], [3, 'd']],
self.eval('$.items().orderBy($[0]).'
'groupBy($[1], $[0], [$[0], $[1].sum()])', data=data))
'groupBy($[1], $[0], $.sum())', data=data))
self.assertItemsEqual(
[[1, ['a', 1, 'c', 1]], [2, ['b', 2, 'e', 2]], [3, ['d', 3]]],
self.eval('$.items().orderBy($[0]).'
'groupBy($[1],, [$[0], $[1].sum()])',
'groupBy($[1],, $.sum())',
data=data))
self.assertItemsEqual(
[[1, ['a', 1, 'c', 1]], [2, ['b', 2, 'e', 2]], [3, ['d', 3]]],
self.eval('$.items().orderBy($[0]).'
'groupBy($[1], aggregator => [$[0], $[1].sum()])',
'groupBy($[1], aggregator => $.sum())',
data=data))
def test_join(self):