mirror
/
ogn-python
kopia lustrzana https://github.com/glidernet/ogn-python
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Make ReceiverStats working without receiver_beacon_count

pull/68/head
Konstantin Gründger 2017-12-12 23:35:39 +01:00
rodzic 58f9d54342
commit 0b36569b0b
1 zmienionych plików z 7 dodań i 12 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

19
ogn/collect/stats.py
Wyświetl plik

@ -2,6 +2,7 @@ from celery.utils.log import get_task_logger
from sqlalchemy import insert, distinct from sqlalchemy import insert, distinct
from sqlalchemy.sql import null, and_, or_, func, not_ from sqlalchemy.sql import null, and_, or_, func, not_
from sqlalchemy.sql.expression import literal_column
from ogn.model import AircraftBeacon, ReceiverBeacon, Device, Receiver, DeviceStats, ReceiverStats from ogn.model import AircraftBeacon, ReceiverBeacon, Device, Receiver, DeviceStats, ReceiverStats
@ -55,8 +56,6 @@ def update_receiver_stats(date=None):
logger.warn("A date is needed for calculating stats. Exiting") logger.warn("A date is needed for calculating stats. Exiting")
return None return None
return "Not usable. Need indices."
# First kill the stats for the selected date # First kill the stats for the selected date
deleted_counter = app.session.query(ReceiverStats) \ deleted_counter = app.session.query(ReceiverStats) \
.filter(ReceiverStats.date == date) \ .filter(ReceiverStats.date == date) \
@ -64,23 +63,19 @@ def update_receiver_stats(date=None):
# Calculate stats for the selected date # Calculate stats for the selected date
receiver_stats = app.session.query( receiver_stats = app.session.query(
ReceiverBeacon.receiver_id, AircraftBeacon.receiver_id,
func.date(ReceiverBeacon.timestamp).label('date'), literal_column("'{}'".format(date)).label('date'),
func.count(AircraftBeacon.id).label('aircraft_beacon_count'), func.count(AircraftBeacon.id).label('aircraft_beacon_count'),
func.count(ReceiverBeacon.id).label('receiver_beacon_count'),
func.count(distinct(AircraftBeacon.device_id)).label('aircraft_count'), func.count(distinct(AircraftBeacon.device_id)).label('aircraft_count'),
func.max(AircraftBeacon.distance).label('max_distance')) \ func.max(AircraftBeacon.distance).label('max_distance')) \
.filter(and_(ReceiverBeacon.receiver_id == AircraftBeacon.receiver_id, ReceiverBeacon.receiver_id != null(), AircraftBeacon.receiver_id != null())) \ .filter(AircraftBeacon.receiver_id != null()) \
.filter(and_(func.date(ReceiverBeacon.timestamp) == date, func.date(AircraftBeacon.timestamp) == date)) \ .filter(func.date(AircraftBeacon.timestamp) == date) \
.group_by(ReceiverBeacon.receiver_id, func.date(ReceiverBeacon.timestamp)) \ .group_by(AircraftBeacon.receiver_id) \
.subquery() .subquery()
print(receiver_stats)
return
# And insert them # And insert them
ins = insert(ReceiverStats).from_select( ins = insert(ReceiverStats).from_select(
[ReceiverStats.receiver_id, ReceiverStats.date, ReceiverStats.aircraft_beacon_count, ReceiverStats.receiver_beacon_count, ReceiverStats.aircraft_count, ReceiverStats.max_distance], [ReceiverStats.receiver_id, ReceiverStats.date, ReceiverStats.aircraft_beacon_count, ReceiverStats.aircraft_count, ReceiverStats.max_distance],
receiver_stats) receiver_stats)
res = app.session.execute(ins) res = app.session.execute(ins)
insert_counter = res.rowcount insert_counter = res.rowcount