[or-cvs] [pytorctl/mysql-bwscanner] Use the session to execute our selects.

[mikeperry at torproject.org]

Author: Mike Perry <mikeperry-git at fscked.org>
Date: Sat, 3 Jul 2010 20:15:36 -0700
Subject: Use the session to execute our selects.
Commit: 3b81bfb0b43b0e6d755050f816043de7b9553565

---
 SQLSupport.py |   68 ++++++++++++++++++++++++++++++--------------------------
 1 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/SQLSupport.py b/SQLSupport.py
index 8e19593..9776ed6 100644
--- a/SQLSupport.py
+++ b/SQLSupport.py
@@ -292,27 +292,27 @@ class RouterStats(Entity):
   def _compute_stats_query(stats_clause):
     tc_session.clear()
     # http://www.sqlalchemy.org/docs/04/sqlexpression.html#sql_update
-    to_s = select([func.count(Extension.id)], 
+    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().execute()
-    from_s = select([func.count(Extension.id)], 
+             == RouterStats.table.c.router_idhex)).as_scalar())
+    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().execute()
-    f_to_s = select([func.count(FailedExtension.id)], 
+             == RouterStats.table.c.router_idhex)).as_scalar())
+    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().execute()
-    f_from_s = select([func.count(FailedExtension.id)], 
+                  =='failedextension')).as_scalar())
+    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().execute()
-    avg_ext = select([func.avg(Extension.delta)], 
+                     =='failedextension')).as_scalar())
+    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().execute()
+             Extension.table.c.row_type=='extension')).as_scalar())
 
     RouterStats.table.update(stats_clause, values=
       {RouterStats.table.c.circ_try_to:to_s,
@@ -372,21 +372,21 @@ class RouterStats(Entity):
 
   def _compute_ranks():
     tc_session.clear()
-    min_r = select([func.min(BwHistory.rank)],
+    min_r = tc_session.execute(select([func.min(BwHistory.rank)],
         BwHistory.table.c.router_idhex
-            == RouterStats.table.c.router_idhex).as_scalar().execute()
-    avg_r = select([func.avg(BwHistory.rank)],
+            == RouterStats.table.c.router_idhex).as_scalar())
+    avg_r = tc_session.execute(select([func.avg(BwHistory.rank)],
         BwHistory.table.c.router_idhex
-            == RouterStats.table.c.router_idhex).as_scalar().execute()
-    max_r = select([func.max(BwHistory.rank)],
+            == RouterStats.table.c.router_idhex).as_scalar())
+    max_r = tc_session.execute(select([func.max(BwHistory.rank)],
         BwHistory.table.c.router_idhex
-            == RouterStats.table.c.router_idhex).as_scalar().execute()
-    avg_bw = select([func.avg(BwHistory.bw)],
+            == RouterStats.table.c.router_idhex).as_scalar())
+    avg_bw = tc_session.execute(select([func.avg(BwHistory.bw)],
         BwHistory.table.c.router_idhex
-            == RouterStats.table.c.router_idhex).as_scalar().execute()
-    avg_desc_bw = select([func.avg(BwHistory.desc_bw)],
+            == RouterStats.table.c.router_idhex).as_scalar())
+    avg_desc_bw = tc_session.execute(select([func.avg(BwHistory.desc_bw)],
         BwHistory.table.c.router_idhex
-            == RouterStats.table.c.router_idhex).as_scalar().execute()
+            == RouterStats.table.c.router_idhex).as_scalar())
 
     RouterStats.table.update(values=
        {RouterStats.table.c.min_rank:min_r,
@@ -396,9 +396,9 @@ class RouterStats(Entity):
         RouterStats.table.c.avg_desc_bw:avg_desc_bw}).execute()
 
     #min_avg_rank = \
-    #    select([func.min(RouterStats.avg_rank)]).as_scalar().execute()
+    #  tc_session.execute(select([func.min(RouterStats.avg_rank)]).as_scalar())
     max_avg_rank = \
-        select([func.max(RouterStats.avg_rank)]).as_scalar().execute()
+       tc_session.execute(select([func.max(RouterStats.avg_rank)]).as_scalar())
 
     RouterStats.table.update(values=
        {RouterStats.table.c.percentile:
@@ -408,16 +408,20 @@ class RouterStats(Entity):
 
   def _compute_ratios(stats_clause):
     tc_session.clear()
-    avg_from_rate = select([func.avg(RouterStats.circ_from_rate)],
-                           stats_clause).as_scalar().execute()
-    avg_to_rate = select([func.avg(RouterStats.circ_to_rate)],
-                           stats_clause).as_scalar().execute()
-    avg_bi_rate = select([func.avg(RouterStats.circ_bi_rate)],
-                           stats_clause).as_scalar().execute()
-    avg_ext = select([func.avg(RouterStats.avg_first_ext)],
-                           stats_clause).as_scalar().execute()
-    avg_sbw = select([func.avg(RouterStats.sbw)],
-                           stats_clause).as_scalar().execute()
+    avg_from_rate = tc_session.execute(
+                     select([func.avg(RouterStats.circ_from_rate)],
+                           stats_clause).as_scalar())
+    avg_to_rate = tc_session.execute(
+                     select([func.avg(RouterStats.circ_to_rate)],
+                           stats_clause).as_scalar())
+    avg_bi_rate = tc_session.execute(
+                     select([func.avg(RouterStats.circ_bi_rate)],
+                           stats_clause).as_scalar())
+    avg_ext = tc_session.execute(
+                     select([func.avg(RouterStats.avg_first_ext)],
+                           stats_clause).as_scalar())
+    avg_sbw = tc_session.execute(select([func.avg(RouterStats.sbw)],
+                           stats_clause).as_scalar())
 
     RouterStats.table.update(stats_clause, values=
        {RouterStats.table.c.circ_from_ratio:
-- 
1.7.1