Changeset 2742

Timestamp:

02/21/06 19:42:25 (19 years ago)

Author:

jerome

Message:

Now ouputs some timing info even when debug:no is used.
Also uses psyco, which halves the time spent before deletion begins.
The storagecaching:yes directive is not at fault.

Location:

pykota/trunk

Files:

• bin/edpykota (modified) (3 diffs)
• pykota/storages/sql.py (modified) (1 diff)

pykota/trunk/bin/edpykota

@@ -29 +29 @@
 import pwd
 import grp
+import time
 from pykota.tool import PyKotaTool, PyKotaToolError, PyKotaCommandLineError, crashed, N_
 from pykota.config import PyKotaConfigError
@@ -162 +163 @@
         if options["delete"] :    
             self.display("%s...\n" % _("Deletion"))
-            printers = self.storage.getMatchingPrinters(options["printer"])
-            entries = getattr(self.storage, "getMatching%ss" % suffix)(",".join(names))
-            nbtotal = len(entries) * len(printers)
-            i = 0
-            for printer in printers :
-                for entry in entries :
-                    pqentry = getattr(self.storage, "get%sPQuota" % suffix)(entry, printer)
-                    if pqentry.Exists :
-                        pqentry.delete()
-                    i += 1    
-                    percent = 100.0 * float(i) / float(nbtotal)
-                    self.display("\r%.02f%%" % percent)
+            #printers = self.storage.getMatchingPrinters(options["printer"])
+            #entries = getattr(self.storage, "getMatching%ss" % suffix)(",".join(names))
+            before = time.time()
+            (printers, entries, pqentries) = getattr(self.storage, "getPrinters%ssAndPQuotas" % suffix)(printernames, names)
+            after = time.time()
+            self.printInfo("Data extraction took %.4f seconds" % (after - before))
+            nbtotal = len(pqentries)
+            for i in range(nbtotal) :
+                (pqkey, pqentry) = pqentries.popitem()
+                if pqentry.Exists :
+                    pqentry.delete()
+                percent = 100.0 * float(i) / float(nbtotal)
+                self.display("\r%.02f%%" % percent)
         else :
             if not names :
@@ -317 +319 @@
                      
 if __name__ == "__main__" : 
+    try : 
+       import psyco
+       psyco.profile()
+    except :   
+       pass
     retcode = 0
     try :

pykota/trunk/pykota/storages/sql.py

@@ -467 +467 @@
         users = {}
         upquotas = {}
+        import time
+        before = time.time()
         result = self.doSearch("SELECT users.id AS uid, users.description AS udesc, printers.id AS pid, printers.description AS pdesc, printers.maxjobsize AS pmaxjobsize, userpquota.id AS upqid, userpquota.maxjobsize AS upqmaxjobsize, users.*, printers.*, userpquota.* FROM users, printers, userpquota WHERE users.id=userpquota.userid AND printers.id=userpquota.printerid;")
+        after = time.time()
+        self.tool.printInfo("SELECT took %.4f seconds." % (after - before))
         if result :
             for record in result :