[or-cvs] [pytorctl/mysql-bwscanner] Lets try this again...
mikeperry at torproject.org
mikeperry at torproject.org
Tue Jul 6 11:31:52 UTC 2010
Author: Mike Perry <mikeperry-git at fscked.org>
Date: Tue, 6 Jul 2010 04:30:58 -0700
Subject: Lets try this again...
Commit: 9ce1ba55512e696aff3c2d772133808f61975639
---
SQLSupport.py | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/SQLSupport.py b/SQLSupport.py
index 8c55018..2c3dad1 100644
--- a/SQLSupport.py
+++ b/SQLSupport.py
@@ -295,25 +295,25 @@ class RouterStats(Entity):
# http://www.sqlalchemy.org/docs/04/sqlexpression.html#sql_update
to_s = tc_session.execute(select([func.count(Extension.id)],
and_(stats_clause, Extension.table.c.to_node_idhex
- == RouterStats.table.c.router_idhex)).as_scalar())
+ == RouterStats.table.c.router_idhex)))
from_s = tc_session.execute(select([func.count(Extension.id)],
and_(stats_clause, Extension.table.c.from_node_idhex
- == RouterStats.table.c.router_idhex)).as_scalar())
+ == RouterStats.table.c.router_idhex)))
f_to_s = tc_session.execute(select([func.count(FailedExtension.id)],
and_(stats_clause, FailedExtension.table.c.to_node_idhex
== RouterStats.table.c.router_idhex,
FailedExtension.table.c.row_type
- =='failedextension')).as_scalar())
+ =='failedextension')))
f_from_s = tc_session.execute(select([func.count(FailedExtension.id)],
and_(stats_clause, FailedExtension.table.c.from_node_idhex
== RouterStats.table.c.router_idhex,
FailedExtension.table.c.row_type
- =='failedextension')).as_scalar())
+ =='failedextension')))
avg_ext = tc_session.execute(select([func.avg(Extension.delta)],
and_(stats_clause,
Extension.table.c.to_node_idhex==RouterStats.table.c.router_idhex,
Extension.table.c.hop==0,
- Extension.table.c.row_type=='extension')).as_scalar())
+ Extension.table.c.row_type=='extension')))
RouterStats.table.update(stats_clause, values=
{RouterStats.table.c.circ_try_to:to_s,
@@ -375,19 +375,19 @@ class RouterStats(Entity):
tc_session.clear()
min_r = tc_session.execute(select([func.min(BwHistory.rank)],
BwHistory.table.c.router_idhex
- == RouterStats.table.c.router_idhex).as_scalar())
+ == RouterStats.table.c.router_idhex))
avg_r = tc_session.execute(select([func.avg(BwHistory.rank)],
BwHistory.table.c.router_idhex
- == RouterStats.table.c.router_idhex).as_scalar())
+ == RouterStats.table.c.router_idhex))
max_r = tc_session.execute(select([func.max(BwHistory.rank)],
BwHistory.table.c.router_idhex
- == RouterStats.table.c.router_idhex).as_scalar())
+ == RouterStats.table.c.router_idhex))
avg_bw = tc_session.execute(select([func.avg(BwHistory.bw)],
BwHistory.table.c.router_idhex
- == RouterStats.table.c.router_idhex).as_scalar())
+ == RouterStats.table.c.router_idhex))
avg_desc_bw = tc_session.execute(select([func.avg(BwHistory.desc_bw)],
BwHistory.table.c.router_idhex
- == RouterStats.table.c.router_idhex).as_scalar())
+ == RouterStats.table.c.router_idhex))
RouterStats.table.update(values=
{RouterStats.table.c.min_rank:min_r,
@@ -397,9 +397,9 @@ class RouterStats(Entity):
RouterStats.table.c.avg_desc_bw:avg_desc_bw}).execute()
#min_avg_rank = \
- # tc_session.execute(select([func.min(RouterStats.avg_rank)]).as_scalar())
+ # tc_session.execute(select([func.min(RouterStats.avg_rank)]))
max_avg_rank = \
- tc_session.execute(select([func.max(RouterStats.avg_rank)]).as_scalar())
+ tc_session.execute(select([func.max(RouterStats.avg_rank)]))
RouterStats.table.update(values=
{RouterStats.table.c.percentile:
@@ -411,18 +411,18 @@ class RouterStats(Entity):
tc_session.clear()
avg_from_rate = tc_session.execute(
select([func.avg(RouterStats.circ_from_rate)],
- stats_clause).as_scalar())
+ stats_clause))
avg_to_rate = tc_session.execute(
select([func.avg(RouterStats.circ_to_rate)],
- stats_clause).as_scalar())
+ stats_clause))
avg_bi_rate = tc_session.execute(
select([func.avg(RouterStats.circ_bi_rate)],
- stats_clause).as_scalar())
+ stats_clause))
avg_ext = tc_session.execute(
select([func.avg(RouterStats.avg_first_ext)],
- stats_clause).as_scalar())
+ stats_clause))
avg_sbw = tc_session.execute(select([func.avg(RouterStats.sbw)],
- stats_clause).as_scalar())
+ stats_clause))
RouterStats.table.update(stats_clause, values=
{RouterStats.table.c.circ_from_ratio:
--
1.7.1
More information about the tor-commits
mailing list