Changeset 890:01626215f2ac

Timestamp:

08/28/10 13:53:37 (3 years ago)

Author:

fl

Branch:

trunk

Message:

[svn r1236] performance tuning

Files:

• adhocracy/controllers/proposal.py (modified) (2 diffs)
• adhocracy/lib/auth/authorization.py (modified) (1 diff)
• adhocracy/lib/democracy/__init__.py (modified) (1 diff)
• adhocracy/model/__init__.py (modified) (5 diffs)
• adhocracy/model/poll.py (modified) (3 diffs)
• adhocracy/model/user.py (modified) (2 diffs)
• adhocracy/templates/proposal/tiles.html (modified) (1 diff)
• development.ini (modified) (2 diffs)
• scripts/create_indexes.sql (added)

adhocracy/controllers/proposal.py

@@ -4 +4 @@
 from pylons.i18n import _
 from formencode import foreach, Invalid
+from sqlalchemy import or_, and_
+from sqlalchemy.orm import eagerload_all, eagerload
 
 from adhocracy.lib.base import *
@@ -132 +134 @@
     @RequireInstance
     def show(self, id, format='html'):
-        c.proposal = get_entity_or_abort(model.Proposal, id)     
-        require.proposal.show(c.proposal)
+        c.proposal = get_entity_or_abort(model.Proposal, id)
+        require.proposal.show(c.proposal)
+        
+        #q = model.meta.Session.query(model.Proposal)
+        #id = int(unicode(id).split('-', 1)[0])
+        #q = q.filter(model.Proposal.id==id)
+        #q = q.filter(model.Proposal.instance_id==c.instance.id)
+        #q = q.filter(or_(model.Proposal.delete_time==None,
+        #                 model.Proposal.delete_time>datetime.utcnow()))
+        #q = q.options(eagerload_all('parents'))
+        #q = q.options(eagerload_all('rate_poll.tallies'))
+        #q = q.options(eagerload_all('creator'))
+        #q = q.options(eagerload_all('rate_poll.tallies'))
+        #q = q.options(eagerload_all('taggings'))
+        #q = q.options(eagerload_all('description'))
+        #q = q.options(eagerload_all('description.creator'))
+        #q = q.options(eagerload_all('description.comments.revisions'))
+        #q = q.options(eagerload_all(model.Proposal._selections))
+        #q = q.options(eagerload_all('_selections.page._texts'))
+        #q = q.options(eagerload_all('children'))
+        #q = q.options(eagerload_all('parents'))
+        #c.proposal = q.first()
         
         if format == 'rss':

adhocracy/lib/auth/authorization.py

@@ -59 +59 @@
     even when they are not protected, thus making the authorization system more 
     configurable.
-    """    
+    """
+    
     def evaluate(self, environ, credentials):
         if c.user:
             super(has_permission, self).evaluate(environ, credentials)
         else:
-            anon_group = model.Group.by_code(model.Group.CODE_ANONYMOUS)
-            for perm in anon_group.permissions:
-                if perm.permission_name == self.permission_name:
-                    return
-            self.unmet()
+            if environ.get('anonymous_permissions') is None:
+                anon_group = model.Group.by_code(model.Group.CODE_ANONYMOUS)
+                environ['anonymous_permissions'] = [p.permission_name for p in anon_group.permissions]
+            if not self.permission_name in environ['anonymous_permissions']:
+                self.unmet()
         
 

adhocracy/lib/democracy/__init__.py

@@ -16 +16 @@
         try:
             for vote in model.Vote.all():
-                handle_vote(vote)
+                pass
+                #handle_vote(vote)
         except Exception, e:
             log.exception("Cannot update tallies: %s" % e)

adhocracy/model/__init__.py

@@ -75 +75 @@
 mapper(Proposal, proposal_table, inherits=Delegateable, polymorphic_identity='proposal', properties={
     'description': relation(Page, primaryjoin=proposal_table.c.description_id==page_table.c.id, 
-                        uselist=False, backref=backref('_proposal')),
+                        uselist=False, lazy=True, backref=backref('_proposal')),
     'rate_poll': relation(Poll, primaryjoin=proposal_table.c.rate_poll_id==poll_table.c.id, 
-                        uselist=False, lazy=True),
+                        uselist=False, lazy=False),
     'adopt_poll': relation(Poll, primaryjoin=proposal_table.c.adopt_poll_id==poll_table.c.id, 
                         uselist=False, lazy=True)
@@ -97 +97 @@
                      backref=backref('revisions', lazy=True, cascade='all')),
     'comment': relation(Comment, lazy=False, backref=backref('revisions', cascade='all',
-                        lazy=True, order_by=revision_table.c.create_time.desc())),
+                        lazy=False, order_by=revision_table.c.create_time.desc())),
     'title': synonym('_title', map_column=True)
     }, extension=meta.extension)
@@ -165 +165 @@
 
 mapper(Tally, tally_table, properties={
-    'poll': relation(Poll, backref=backref('tallies', lazy='dynamic')),
+    'poll': relation(Poll, backref=backref('tallies', order_by=tally_table.c.create_time.desc(), lazy=True)),
     'vote': relation(Vote, backref=backref('tally', uselist=False))
     }, extension=meta.extension)
@@ -190 +190 @@
     'parent': relation(Text, lazy=True, uselist=False, 
                        primaryjoin=text_table.c.parent_id==text_table.c.id),
-    'page': relation(Page, lazy=True, backref=backref('_texts', order_by=text_table.c.create_time.desc()),
+    'page': relation(Page, lazy=True, backref=backref('_texts', lazy=False, order_by=text_table.c.create_time.desc()),
                      primaryjoin=text_table.c.page_id==page_table.c.id)
     }, extension=meta.extension)
@@ -198 +198 @@
     'proposal': relation(Proposal, lazy=True, backref=backref('_selections'), 
                          primaryjoin=selection_table.c.proposal_id==proposal_table.c.id),
-    'page': relation(Page, lazy=False, backref=backref('_selections'),
+    'page': relation(Page, lazy=True, backref=backref('_selections'),
                      primaryjoin=selection_table.c.page_id==page_table.c.id)
     }, extension=meta.extension)

adhocracy/model/poll.py

@@ -3 +3 @@
 
 from sqlalchemy import Table, Column, Integer, Unicode, UnicodeText, ForeignKey, DateTime, func, or_
-from sqlalchemy.orm import reconstructor
+from sqlalchemy.orm import reconstructor, aliased, eagerload, eagerload_all
 
 import meta
@@ -93 +93 @@
     def tally(self):
         if self._tally is None:
-            from tally import Tally
-            q = self.tallies
-            q = q.order_by(Tally.create_time.desc())
-            q = q.order_by(Tally.id.desc())
-            _tally = q.limit(1).first()
-            if _tally is None:
-                _tally = Tally.create_from_poll(self)
-            self._tally = _tally
+            if len(self.tallies):
+                self._tally = self.tallies[0]
+            else:
+                from tally import Tally
+                self._tally = Tally.create_from_poll(self)
         return self._tally
     
@@ -198 +195 @@
             q = meta.Session.query(Poll)
             q = q.filter(Poll.subject.in_(subjects))
+            q = q.options(eagerload(Poll.tallies))
             if not include_deleted:
                 q = q.filter(or_(Poll.end_time==None,

adhocracy/model/user.py

@@ -5 +5 @@
 
 from sqlalchemy import Table, Column, Integer, Unicode, UnicodeText, Boolean, DateTime, func, or_
+from sqlalchemy.orm import eagerload_all
 
 from babel import Locale
@@ -270 +271 @@
                              User.delete_time>datetime.utcnow()))
         if instance:
+            q = q.options(eagerload_all('memberships'))
             q = q.join(Membership)
             q = q.filter(or_(Membership.expire_time==None,

adhocracy/templates/proposal/tiles.html

@@ -43 +43 @@
                 <li><a title="${_('Who is receiving delegations?')}" 
                        href="${h.entity_url(proposal, member='delegations')}"
-                class="delegations ttip">${_("Delegations")} (${len(proposal.current_delegations())})</a></li>
+                class="delegations ttip">${_("Delegations")} 
+            ##(${len(proposal.current_delegations())})
+                </a></li>
         %endif
         <li><a title="${_('Who has helped?')}" 
                href="${h.entity_url(proposal, member='contributors')}" class="contributors ttip">
-               ${_("Contributors")} (${len(proposal.contributors())})</a></li>
+               ${_("Contributors")} 
+               ##(${len(proposal.contributors())})
+            </a></li>
         </ul>
         <br/>

development.ini

@@ -107 +107 @@
 # Logging configuration
 [loggers]
-keys = root, routes, adhocracy, sqlalchemy
+keys = root, adhocracy, sqlalchemy
 
 [handlers]
@@ -131 +131 @@
 
 [logger_sqlalchemy]
-#level = INFO
-level = WARN
-#level = DEBUG
-handlers =
+level = DEBUG
+handlers = console
 qualname = sqlalchemy.engine
-# "level = INFO" logs SQL queries.
-# "level = DEBUG" logs SQL queries and results.
-# "level = WARN" logs neither.  (Recommended for production systems.)
 
 [handler_console]