Rfaulk has submitted this change and it was merged.
Change subject: add - aggregator_meta namedtuple to Aggregator class.
......................................................................
add - aggregator_meta namedtuple to Aggregator class.
Change-Id: I4a4d71452ebcf65894e4055b15fedb0b1c0e13fd
---
M user_metrics/etl/aggregator.py
1 file changed, 7 insertions(+), 5 deletions(-)
Approvals:
Rfaulk: Verified; Looks good to me, approved
diff --git a/user_metrics/etl/aggregator.py b/user_metrics/etl/aggregator.py
index 5a663a3..4387642 100644
--- a/user_metrics/etl/aggregator.py
+++ b/user_metrics/etl/aggregator.py
@@ -342,6 +342,8 @@
results.
"""
+ aggregator_meta = namedtuple('aggregator_meta', 'field index method')
+
def __init__(self, method=None):
"""
Initialize the aggregator method
@@ -391,13 +393,13 @@
"""
For each aggregate field store the name, index in data, and op
"""
- self._agg_items = [(name + op.__name__, index, op)
- for name, index in self._field_prefixes.iteritems()
+ self._agg_items = [Aggregator.aggregator_meta(name + op.__name__,
+ index, op) for name, index in self._field_prefixes.iteritems()
for op in self._method]
@property
def header(self):
- return [item[0] for item in self._agg_items]
+ return [item.field for item in self._agg_items]
def data_etl(self, data):
super(AggregatorStatOp, self).data_etl(data)
@@ -407,8 +409,8 @@
def run(self, data):
"""
- Pass data through aggregate method
+ Call each aggregation method
"""
for item in self._agg_items:
- setattr(self, item[0], item[2]([elem[item[1]] for elem in data]))
+ setattr(self, item.field, item.method([elem[item.index] for elem
in data]))
return self
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/81190
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4a4d71452ebcf65894e4055b15fedb0b1c0e13fd
Gerrit-PatchSet: 1
Gerrit-Project: analytics/user-metrics
Gerrit-Branch: master
Gerrit-Owner: Rfaulk <[email protected]>
Gerrit-Reviewer: Rfaulk <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
