improve group / rights query performance

pboard/pboard/controllers/root.py

@@ -147,8 +147,8 @@ class RootController(BaseController):
             current_node=loCurrentNode,
             node_status_list = loNodeStatusList,
             keywords = highlight,
-            user_specific_groups = pld.PODStaticController.getUserSpecificGroups(),
-            real_groups = pld.PODStaticController.getRealGroups()
+            user_specific_group_rights = pld.PODStaticController.getUserDedicatedGroupRightsOnNode(node_id),
+            real_group_rights = pld.PODStaticController.getRealGroupRightsOnNode(node_id)
         )
 
     @expose('pboard.templates.search')

pboard/pboard/lib/dbapi.py

@@ -52,12 +52,28 @@ class PODStaticController(object):
     return loGroups
 
   @classmethod
-  def getUserSpecificGroups(cls):
-    return DBSession.query(pbma.Group).filter(pbma.Group.personnal_group==True).all()
+  def getRealGroupRightsOnNode(cls, piNodeId: int) -> pbmd.DIRTY_GroupRightsOnNode:
+
+    groupRightsOnNodeCustomSelect = DBSession\
+        .query(pbmd.DIRTY_GroupRightsOnNode)\
+        .from_statement(pbmd.DIRTY_RealGroupRightOnNodeSqlQuery)\
+        .params(node_id=piNodeId)\
+        .all()
+
+    return groupRightsOnNodeCustomSelect
 
   @classmethod
-  def getRealGroups(cls):
-    return DBSession.query(pbma.Group).filter(pbma.Group.personnal_group==False).all()
+  def getUserDedicatedGroupRightsOnNode(cls, piNodeId: int) -> pbmd.DIRTY_GroupRightsOnNode:
+
+    groupRightsOnNodeCustomSelect = DBSession\
+        .query(pbmd.DIRTY_GroupRightsOnNode)\
+        .from_statement(pbmd.DIRTY_UserDedicatedGroupRightOnNodeSqlQuery)\
+        .params(node_id=piNodeId)\
+        .all()
+
+    return groupRightsOnNodeCustomSelect
+
+
 
 class PODUserFilteredApiController(object):
   
@@ -93,11 +109,38 @@ class PODUserFilteredApiController(object):
 
 
   def getNode(self, liNodeId):
+    """
     liOwnerIdList = self._getUserIdListForFiltering()
     if liNodeId!=0:
       return DBSession.query(pbmd.PBNode).options(joinedload_all("_lAllChildren")).filter(pbmd.PBNode.node_id==liNodeId).filter(pbmd.PBNode.owner_id.in_(liOwnerIdList)).one()
     return None
+    """
 
+    sqla.or_
+    lsSqlSelectQuery = """pod_nodes.node_id IN
+(SELECT
+	pgn.node_id
+FROM
+	pod_group_node AS pgn
+	join pod_user_group AS pug ON pug.group_id = pgn.group_id
+	join pod_user AS pu ON pug.user_id = pu.user_id
+WHERE
+	rights > 0
+	AND pu.user_id = %s)
+"""
+    lsNodeIdFiltering = lsSqlSelectQuery % (str(self._iCurrentUserId))
+    print("filter: ====>>>", lsNodeIdFiltering)
+    if liNodeId!=0:
+      return DBSession.query(pbmd.PBNode).options(joinedload_all("_lAllChildren"))\
+        .filter(pbmd.PBNode.node_id==liNodeId)\
+        .filter(
+          sqla.or_(
+            pbmd.PBNode.owner_id==self._iCurrentUserId,
+            lsNodeIdFiltering
+          )
+        )\
+        .one()
+    return None
 
   def getLastModifiedNodes(self, piMaxNodeNb):
     """

pboard/pboard/model/data.py

@@ -8,11 +8,14 @@ from hashlib import sha256
 
 import bs4
 from sqlalchemy import Table, ForeignKey, Column, Sequence
+import sqlalchemy as sqla
+from sqlalchemy.sql.sqltypes import Boolean
 from sqlalchemy.types import Unicode, Integer, DateTime, Text, LargeBinary
 import sqlalchemy.types as sqlat
 from sqlalchemy.orm import relation, synonym, relationship
 from sqlalchemy.orm import backref
 import sqlalchemy.orm as sqlao
+import sqlalchemy.orm.query as sqlaoq
 from sqlalchemy import orm as sqlao
 
 from tg.i18n import ugettext as _, lazy_ugettext as l_
@@ -399,3 +402,75 @@ class PBNode(DeclarativeBase):
   def getHistory(self):
       return DBSession.execute("select node_id, version_id, created_at from pod_nodes_history where node_id = :node_id order by created_at desc", {"node_id":self.node_id}).fetchall()
 
+
+#####
+#
+# HACK - 2014-05-21 - D.A
+#
+# The following hack is a horrible piece of code that allow to map a raw SQL select to a mapped class
+#
+class DIRTY_GroupRightsOnNode(object):
+    def hasSomeAccess(self):
+        return self.rights >= pma.Rights.READ_ACCESS
+
+    def hasReadAccess(self):
+        return self.rights & pma.Rights.READ_ACCESS
+
+    def hasWriteAccess(self):
+        return self.rights & pma.Rights.WRITE_ACCESS
+
+DIRTY_group_rights_on_node_query = Table('fake_table', metadata,
+    Column('group_id', Integer, primary_key=True),
+    Column('node_id', Integer, primary_key=True),
+
+    Column('display_name', Unicode(255)),
+    Column('personnal_group', Boolean),
+    Column('rights', Integer, primary_key=True)
+)
+
+DIRTY_UserDedicatedGroupRightOnNodeSqlQuery = """
+SELECT
+    COALESCE(NULLIF(pg.display_name, ''), pu.display_name) AS display_name,
+    pg.personnal_group,
+    pg.group_id,
+    :node_id AS node_id,
+    COALESCE(pgn.rights, 0) AS rights
+FROM
+    pod_group AS pg
+    LEFT JOIN
+        pod_group_node AS pgn
+    ON
+        pg.group_id=pgn.group_id
+        AND pgn.node_id=:node_id
+    LEFT JOIN
+        pod_user AS pu
+    ON
+        pu.user_id=-pg.group_id
+WHERE
+    pg.personnal_group='t'
+ORDER BY
+    display_name
+;"""
+
+DIRTY_RealGroupRightOnNodeSqlQuery = """
+SELECT
+    pg.display_name AS display_name,
+    pg.personnal_group,
+    pg.group_id,
+    :node_id AS node_id,
+    COALESCE(pgn.rights, 0) AS rights
+FROM
+    pod_group AS pg
+    LEFT JOIN
+        pod_group_node AS pgn
+    ON
+        pg.group_id=pgn.group_id
+        AND pgn.node_id=:node_id
+WHERE
+    pg.personnal_group!='t'
+ORDER BY
+    display_name
+;"""
+
+sqlao.mapper(DIRTY_GroupRightsOnNode, DIRTY_group_rights_on_node_query)
+

pboard/pboard/templates/document-widgets-tabs.mak

@@ -33,21 +33,17 @@
           <th></th>
         </tr>
       </thead>
-      % for loCurrentGroup in real_groups:
-        % if loCurrentGroup.hasSomeAccess(poNode):
+      % for loGroupRightsOnNode in real_group_rights:
+        % if loGroupRightsOnNode.hasSomeAccess():
           <tr>
-            <td>${loCurrentGroup.getDisplayName()}</td>
+            <td>${loGroupRightsOnNode.display_name}</td>
             <td>
-              % for loRight in loCurrentGroup.rights:
-                % if loRight.node_id==poNode.node_id:
-                  % if loRight.hasReadAccess():
-                    <span class="label label-success">R</span>
-                  % endif
-                  % if loRight.hasWriteAccess():
-                    <span class="label label-warning">W</span>
-                  % endif
-                % endif
-              % endfor
+              % if loGroupRightsOnNode.hasReadAccess():
+                <span class="label label-success">R</span>
+              % endif
+              % if loGroupRightsOnNode.hasWriteAccess():
+                <span class="label label-warning">W</span>
+              % endif
             </td>
           </tr>
         % endif
@@ -58,21 +54,17 @@
           <th></th>
         </tr>
       </thead>
-      % for loCurrentGroup in user_specific_groups:
-        % if loCurrentGroup.hasSomeAccess(poNode):
+      % for loGroupRightsOnNode in user_specific_group_rights:
+        % if loGroupRightsOnNode.hasSomeAccess():
           <tr>
-            <td>${loCurrentGroup.getDisplayName()}</td>
+            <td>${loGroupRightsOnNode.display_name}</td>
             <td>
-              % for loRight in loCurrentGroup.rights:
-                % if loRight.node_id==poNode.node_id:
-                  % if loRight.hasReadAccess():
-                    <span class="label label-success">R</span>
-                  % endif
-                  % if loRight.hasWriteAccess():
-                    <span class="label label-warning">W</span>
-                  % endif
-                % endif
-              % endfor
+              % if loGroupRightsOnNode.hasReadAccess():
+                <span class="label label-success">R</span>
+              % endif
+              % if loGroupRightsOnNode.hasWriteAccess():
+                <span class="label label-warning">W</span>
+              % endif
             </td>
           </tr>
         % endif
@@ -178,22 +170,23 @@
                   <th>${_('Access')}</th>
                 </tr>
               </thead>
-              % for loCurrentGroup in real_groups:
-              <tr id='user-${loCurrentGroup.group_id}-rights-row'>
+              % for loGroupRightsOnNode in real_group_rights:
+
+              <tr id='user-${loGroupRightsOnNode.group_id}-rights-row'>
                 <td>
                   <a
                     class="btn btn-mini"
-                    onclick="updateRights(${loCurrentGroup.group_id})"
+                    onclick="updateRights(${loGroupRightsOnNode.group_id})"
                   >
                     <i class="fa fa-key"></i>
                   </a>
                 </td>
                 <td class='pod-highlightable-access-management-cell'>
-                  ${loCurrentGroup.getDisplayName()}
-                  <input type="hidden" id="user-${loCurrentGroup.group_id}-value-read" name="read" value="" />
-                  <input type="hidden" id="user-${loCurrentGroup.group_id}-value-write" name="write" value="" />
+                  ${loGroupRightsOnNode.display_name}
+                  <input type="hidden" id="user-${loGroupRightsOnNode.group_id}-value-read" name="read" value="" />
+                  <input type="hidden" id="user-${loGroupRightsOnNode.group_id}-value-write" name="write" value="" />
                 </td>
-                <td id="user-${loCurrentGroup.group_id}-rights" class="pod-right-cell"></td>
+                <td id="user-${loGroupRightsOnNode.group_id}-rights" class="pod-right-cell"></td>
               </tr>
               % endfor
               
@@ -208,23 +201,23 @@
                   <th>${_('Access')}</th>
                 </tr>
               </thead>
-              % for loCurrentGroup in user_specific_groups:
+              % for loGroupRightsOnNode in user_specific_group_rights:
               
-              <tr id='user-${loCurrentGroup.group_id}-rights-row'>
+              <tr id='user-${loGroupRightsOnNode.group_id}-rights-row'>
                 <td>
                   <a
                     class="btn btn-mini"
-                    onclick="updateRights(${loCurrentGroup.group_id})"
+                    onclick="updateRights(${loGroupRightsOnNode.group_id})"
                   >
                     <i class="fa fa-key"></i>
                   </a>
                 </td>
                 <td class='pod-highlightable-access-management-cell'>
-                  ${loCurrentGroup.getDisplayName()}
-                  <input type="hidden" id="user-${loCurrentGroup.group_id}-value-read" name="read" value="" />
-                  <input type="hidden" id="user-${loCurrentGroup.group_id}-value-write" name="write" value="" />
+                  ${loGroupRightsOnNode.display_name}
+                  <input type="hidden" id="user-${loGroupRightsOnNode.group_id}-value-read" name="read" value="" />
+                  <input type="hidden" id="user-${loGroupRightsOnNode.group_id}-value-write" name="write" value="" />
                 </td>
-                <td id="user-${loCurrentGroup.group_id}-rights" class="pod-right-cell"></td>
+                <td id="user-${loGroupRightsOnNode.group_id}-rights" class="pod-right-cell"></td>
               </tr>
               % endfor
             </table>
@@ -348,18 +341,16 @@
 ## for read/write access management
 ##
 
-      % for loCurrentGroup in real_groups + user_specific_groups:
-        % if loCurrentGroup.hasSomeAccess(poNode)==False:
-              updateRights(${loCurrentGroup.group_id}, 0);
+## FIXME      % for loGroupRightsOnNode in real_group_rights:
+##      % for loCurrentGroup in real_group_rights + user_specific_group_rights:
+      % for loGroupRightsOnNode in real_group_rights + user_specific_group_rights:
+        % if loGroupRightsOnNode.hasSomeAccess()==False:
+          updateRights(${loGroupRightsOnNode.group_id}, 0);
         % else:
-          % for loRight in loCurrentGroup.rights:
-            % if loRight.node_id==poNode.node_id:
 ##
 ## The following line should build some javascript code similar to this:
 ## updateRights(-5, 3);
-              updateRights(${loCurrentGroup.group_id}, ${loRight.rights});
-            % endif
-          % endfor
+          updateRights(${loGroupRightsOnNode.group_id}, ${loGroupRightsOnNode.rights});
         % endif
       % endfor