Changeset 2707

Timestamp:

02/18/06 11:56:29 (18 years ago)

Author:

jerome

Message:

Improved user modification speed by around 15%.

Location:

pykota/trunk

Files:

• bin/pkusers (modified) (1 diff)
• pykota/storage.py (modified) (1 diff)
• pykota/storages/ldapstorage.py (modified) (2 diffs)
• pykota/storages/sql.py (modified) (2 diffs)

pykota/trunk/bin/pkusers

@@ -308 +308 @@
                 for i in range(nbtotal) :        
                     entry = entries[i]
-                    if description is not None : # NB : "" is allowed !
-                        entry.setDescription(description)
-                    if limitby :    
-                        entry.setLimitBy(limitby)
+                    
+                    # We need a transaction because we may have to create a record
+                    # in the payments' table at the same time we modify the user's balance.
+                    self.storage.beginTransaction()
+                    try :
+                        if description is not None : # NB : "" is allowed !
+                            entry.setDescription(description)
+                        if limitby :    
+                            entry.setLimitBy(limitby)
+                            
+                        if suffix == "User" :    
+                            if overcharge is not None : # NB : 0 is allowed !     
+                                entry.setOverChargeFactor(overcharge)
                         
-                    if suffix == "User" :    
-                        if overcharge is not None : # NB : 0 is allowed !     
-                            entry.setOverChargeFactor(overcharge)
-                            
-                    entry.save()    
-                    
-                    if suffix == "User" :
-                        if balance :
-                            if balance.startswith("+") or balance.startswith("-") :
-                                newbalance = float(entry.AccountBalance or 0.0) + balancevalue
-                                newlifetimepaid = float(entry.LifeTimePaid or 0.0) + balancevalue
-                                entry.setAccountBalance(newbalance, newlifetimepaid, comment)
-                            else :
-                                diff = balancevalue - float(entry.AccountBalance or 0.0)
-                                newlifetimepaid = float(entry.LifeTimePaid or 0.0) + diff
-                                entry.setAccountBalance(balancevalue, newlifetimepaid, comment)
-                                        
-                        for ugroup in usersgroups :
-                            if options["remove"] :
-                                ugroup.delUserFromGroup(entry)
-                            else :
-                                ugroup.addUserToGroup(entry)
-                                
+                        if suffix == "User" :
+                            if balance :
+                                if balance.startswith("+") or balance.startswith("-") :
+                                    newbalance = float(entry.AccountBalance or 0.0) + balancevalue
+                                    newlifetimepaid = float(entry.LifeTimePaid or 0.0) + balancevalue
+                                    entry.setAccountBalance(newbalance, newlifetimepaid, comment)
+                                else :
+                                    diff = balancevalue - float(entry.AccountBalance or 0.0)
+                                    newlifetimepaid = float(entry.LifeTimePaid or 0.0) + diff
+                                    entry.setAccountBalance(balancevalue, newlifetimepaid, comment)
+                                            
+                            for ugroup in usersgroups :
+                                if options["remove"] :
+                                    ugroup.delUserFromGroup(entry)
+                                else :
+                                    ugroup.addUserToGroup(entry)
+                        entry.save()    
+                    except :
+                        self.storage.rollbackTransaction()
+                        raise
+                    else :    
+                        self.storage.commitTransaction()
+
                     percent = 100.0 * float(i) / float(nbtotal)
                     self.display("\r%.02f%%" % percent)

pykota/trunk/pykota/storage.py

@@ -76 +76 @@
         """Sets the user's account balance in case he pays more money."""
         diff = float(lifetimepaid or 0.0) - float(self.LifeTimePaid or 0.0)
-        self.parent.beginTransaction()
-        try :
-            self.parent.writeUserAccountBalance(self, balance, lifetimepaid)
-            self.parent.writeNewPayment(self, diff, comment)
-        except PyKotaStorageError, msg :    
-            self.parent.rollbackTransaction()
-            raise PyKotaStorageError, msg
-        else :    
-            self.parent.commitTransaction()
-            self.AccountBalance = balance
-            self.LifeTimePaid = lifetimepaid
+        self.AccountBalance = balance
+        self.LifeTimePaid = lifetimepaid
+        self.parent.writeNewPayment(self, diff, comment)
+        self.isDirty = True
         
     def setLimitBy(self, limitby) :    

pykota/trunk/pykota/storages/ldapstorage.py

@@ -1048 +1048 @@
         self.doModify(user.ident, newfields)
         
+        newfields = { "pykotaBalance" : str(user.AccountBalance or 0.0),
+                      "pykotaLifeTimePaid" : str(user.LifeTimePaid or 0.0), 
+                    }
+        self.doModify(user.idbalance, newfields)
+        
     def saveGroup(self, group) :
         """Saves the group to the database in a single operation."""
@@ -1096 +1101 @@
         return self.doModify(user.idbalance, fields, flushcache=1)         
        
-    def writeUserAccountBalance(self, user, newbalance, newlifetimepaid=None) :    
-        """Sets the new account balance and eventually new lifetime paid."""
-        fields = {
-                   "pykotaBalance" : str(newbalance),
-                 }
-        if newlifetimepaid is not None :
-            fields.update({ "pykotaLifeTimePaid" : str(newlifetimepaid) })
-        return self.doModify(user.idbalance, fields)         
-            
     def writeNewPayment(self, user, amount, comment="") :
         """Adds a new payment to the payments history."""

pykota/trunk/pykota/storages/sql.py

@@ -572 +572 @@
     def saveUser(self, user) :        
         """Saves the user to the database in a single operation."""
-        self.doModify("UPDATE users SET limitby=%s, email=%s, overcharge=%s, description=%s WHERE id=%s" \
+        self.doModify("UPDATE users SET limitby=%s, balance=%s, lifetimepaid=%s, email=%s, overcharge=%s, description=%s WHERE id=%s" \
                                % (self.doQuote(user.LimitBy or 'quota'), \
+                                  self.doQuote(user.AccountBalance or 0.0), \
+                                  self.doQuote(user.LifeTimePaid or 0.0), \
                                   self.doQuote(user.Email), \
                                   self.doQuote(user.OverCharge), \
@@ -618 +620 @@
         self.doModify("UPDATE users SET balance=balance - %s WHERE id=%s" % (self.doQuote(amount), self.doQuote(user.ident)))
        
-    def writeUserAccountBalance(self, user, newbalance, newlifetimepaid=None) :    
-        """Sets the new account balance and eventually new lifetime paid."""
-        if newlifetimepaid is not None :
-            self.doModify("UPDATE users SET balance=%s, lifetimepaid=%s WHERE id=%s" % (self.doQuote(newbalance), self.doQuote(newlifetimepaid), self.doQuote(user.ident)))
-        else :    
-            self.doModify("UPDATE users SET balance=%s WHERE id=%s" % (self.doQuote(newbalance), self.doQuote(user.ident)))
-            
     def writeNewPayment(self, user, amount, comment="") :
         """Adds a new payment to the payments history."""