Changeset 1137

Timestamp:

10/06/03 15:12:28 (21 years ago)

Author:

jalet

Message:

More work on caching

Location:

pykota/trunk/pykota

Files:

• storage.py (modified) (2 diffs)
• storages/ldapstorage.py (modified) (5 diffs)
• storages/pgstorage.py (modified) (3 diffs)

pykota/trunk/pykota/storage.py

@@ -21 +21 @@
 #
 # $Log$
+# Revision 1.22  2003/10/06 13:12:27  jalet
+# More work on caching
+#
 # Revision 1.21  2003/10/03 09:02:20  jalet
 # Logs cache store actions too
@@ -385 +388 @@
         return lastjob    
         
+    def getGroupMembers(self, group) :        
+        """Returns the group's members list from in-group cache."""
+        if self.usecache :
+            if not hasattr(group, "Members") :
+                self.tool.logdebug("Cache miss (%s->Members)" % group.Name)
+                group.Members = self.getGroupMembersFromBackend(group)
+                self.tool.logdebug("Cache store (%s->Members)" % group.Name)
+            else :
+                self.tool.logdebug("Cache hit (%s->Members)" % group.Name)
+        else :        
+            group.Members = self.getGroupMembersFromBackend(group)
+        return group.Members    
+        
+    def getUserGroups(self, user) :        
+        """Returns the user's groups list from in-user cache."""
+        if self.usecache :
+            if not hasattr(user, "Groups") :
+                self.tool.logdebug("Cache miss (%s->Groups)" % user.Name)
+                user.Groups = self.getUserGroupsFromBackend(user)
+                self.tool.logdebug("Cache store (%s->Groups)" % user.Name)
+            else :
+                self.tool.logdebug("Cache hit (%s->Groups)" % user.Name)
+        else :        
+            user.Groups = self.getUserGroupsFromBackend(user)
+        return user.Groups   
+        
 def openConnection(pykotatool) :
     """Returns a connection handle to the appropriate Quota Storage Database."""

pykota/trunk/pykota/storages/ldapstorage.py

@@ -21 +21 @@
 #
 # $Log$
+# Revision 1.29  2003/10/06 13:12:28  jalet
+# More work on caching
+#
 # Revision 1.28  2003/10/03 12:27:02  jalet
 # Several optimizations, especially with LDAP backend
@@ -266 +269 @@
             group.AccountBalance = 0.0
             group.LifeTimePaid = 0.0
-            group.Members = self.getGroupMembers(group)
-            for member in group.Members :
+            for member in self.getGroupMembers(group) :
                 if member.Exists :
                     group.AccountBalance += member.AccountBalance
@@ -346 +348 @@
                 grouppquota.PageCounter = 0
                 grouppquota.LifePageCounter = 0
-                if (not hasattr(group, "Members")) or (group.Members is None) :
-                    group.Members = self.getGroupMembers(group)
                 usernamesfilter = "".join(["(pykotaUserName=%s)" % member.Name for member in group.Members])
                 result = self.doSearch("(&(objectClass=pykotaUserPQuota)(pykotaPrinterName=%s)(|%s))" % (printer.Name, usernamesfilter), ["pykotaPageCounter", "pykotaLifePageCounter"], base=self.info["userquotabase"])
@@ -384 +384 @@
         return lastjob
         
-    def getUserGroups(self, user) :        
+    def getGroupMembersFromBackend(self, group) :        
+        """Returns the group's members list."""
+        groupmembers = []
+        result = self.doSearch("(&(objectClass=pykotaGroup)(|(pykotaGroupName=%s)(%s=%s)))" % (group.Name, self.info["grouprdn"], group.Name), [self.info["groupmembers"]], base=self.info["groupbase"])
+        if result :
+            for username in result[0][1].get(self.info["groupmembers"], []) :
+                groupmembers.append(self.getUser(username))
+        return groupmembers        
+        
+    def getUserGroupsFromBackend(self, user) :        
         """Returns the user's groups list."""
         groups = []
@@ -392 +401 @@
                 groups.append(self.getGroup(fields.get(self.info["grouprdn"])[0]))
         return groups        
-        
-    def getGroupMembers(self, group) :        
-        """Returns the group's members list."""
-        groupmembers = []
-        result = self.doSearch("(&(objectClass=pykotaGroup)(|(pykotaGroupName=%s)(%s=%s)))" % (group.Name, self.info["grouprdn"], group.Name), [self.info["groupmembers"]], base=self.info["groupbase"])
-        if result :
-            for username in result[0][1].get(self.info["groupmembers"], []) :
-                groupmembers.append(self.getUser(username))
-        return groupmembers        
         
     def getMatchingPrinters(self, printerpattern) :

pykota/trunk/pykota/storages/pgstorage.py

@@ -21 +21 @@
 #
 # $Log$
+# Revision 1.17  2003/10/06 13:12:28  jalet
+# More work on caching
+#
 # Revision 1.16  2003/10/03 18:01:49  jalet
 # Nothing interesting...
@@ -256 +259 @@
         return lastjob
             
-    def getUserGroups(self, user) :        
-        """Returns the user's groups list."""
-        groups = []
-        result = self.doSearch("SELECT groupname FROM groupsmembers JOIN groups ON groupsmembers.groupid=groups.id WHERE userid=%s" % self.doQuote(user.ident))
-        if result :
-            for record in result :
-                groups.append(self.getGroup(record.get("groupname")))
-        return groups        
-        
-    def getGroupMembers(self, group) :        
+    def getGroupMembersFromBackend(self, group) :        
         """Returns the group's members list."""
         groupmembers = []
@@ -281 +275 @@
                 self.cacheEntry("USERS", user.Name, user)
         return groupmembers        
+        
+    def getUserGroupsFromBackend(self, user) :        
+        """Returns the user's groups list."""
+        groups = []
+        result = self.doSearch("SELECT groupname FROM groupsmembers JOIN groups ON groupsmembers.groupid=groups.id WHERE userid=%s" % self.doQuote(user.ident))
+        if result :
+            for record in result :
+                groups.append(self.getGroup(record.get("groupname")))
+        return groups        
         
     def getMatchingPrinters(self, printerpattern) :