paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-16 20:02:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

counts.py: Remove CustomPullCountStat.

Browse Source
This commit is contained in:
Rishi Gupta
2017-04-01 17:47:28 -07:00
committed by Tim Abbott
parent 118b44d4f0
commit eadfc743c8
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
analytics/lib/counts.py
View File

@@ -52,7 +52,6 @@ class CountStat(object):
else: # frequency == CountStat.DAY else: # frequency == CountStat.DAY
self.interval = timedelta(days=1) self.interval = timedelta(days=1)
self.is_logging = False self.is_logging = False
self.custom_pull_function = None # type: Optional[Callable[[CountStat, datetime, datetime], None]]
def __unicode__(self): def __unicode__(self):
# type: () -> Text # type: () -> Text
@@ -64,12 +63,6 @@ class LoggingCountStat(CountStat):
CountStat.__init__(self, property, DataCollector(output_table, None), frequency) CountStat.__init__(self, property, DataCollector(output_table, None), frequency)
self.is_logging = True self.is_logging = True
class CustomPullCountStat(CountStat):
def __init__(self, property, output_table, frequency, custom_pull_function):
# type: (str, Type[BaseCount], str, Callable[[CountStat, datetime, datetime], None]) -> None
CountStat.__init__(self, property, DataCollector(output_table, None), frequency)
self.custom_pull_function = custom_pull_function
class DataCollector(object): class DataCollector(object):
def __init__(self, output_table, pull_function): def __init__(self, output_table, pull_function):
# type: (Type[BaseCount], Optional[Callable[[CountStat, datetime, datetime], None]]) -> None # type: (Type[BaseCount], Optional[Callable[[CountStat, datetime, datetime], None]]) -> None
@@ -121,9 +114,7 @@ def do_fill_count_stat_at_hour(stat, end_time):
return return
start_time = end_time - stat.interval start_time = end_time - stat.interval
if stat.custom_pull_function is not None: if not stat.is_logging:
stat.custom_pull_function(stat, start_time, end_time)
elif not stat.is_logging:
stat.data_collector.pull_function(stat, start_time, end_time) stat.data_collector.pull_function(stat, start_time, end_time)
do_aggregate_to_summary_table(stat, end_time) do_aggregate_to_summary_table(stat, end_time)
@@ -465,7 +456,7 @@ count_stats_ = [
CountStat('15day_actives::day', CountStat('15day_actives::day',
zerver_data_collector(UserCount, check_useractivityinterval_by_user_query, None), zerver_data_collector(UserCount, check_useractivityinterval_by_user_query, None),
CountStat.DAY, interval=timedelta(days=15)-timedelta(minutes=15)), CountStat.DAY, interval=timedelta(days=15)-timedelta(minutes=15)),
CustomPullCountStat('minutes_active::day', UserCount, CountStat.DAY, do_pull_minutes_active) CountStat('minutes_active::day', DataCollector(UserCount, do_pull_minutes_active), CountStat.DAY)
] ]
COUNT_STATS = {stat.property: stat for stat in count_stats_} COUNT_STATS = {stat.property: stat for stat in count_stats_}