use EXISTS (SELECT 1. when looking for un-suite'd binaries and source exclude...

use EXISTS (SELECT 1.  when looking for un-suite'd binaries and source exclude stuff with an existent last_used.

rhona

 #!/usr/bin/env python
 
 # rhona, cleans up unassociated binary and source packages
-# Copyright (C) 2000, 2001, 2002  James Troup <james@nocrew.org>
-# $Id: rhona,v 1.26 2003-01-02 18:13:41 troup Exp $
+# Copyright (C) 2000, 2001, 2002, 2003  James Troup <james@nocrew.org>
+# $Id: rhona,v 1.27 2003-09-07 13:52:20 troup Exp $
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -60,10 +60,10 @@ def check_binaries():
 
     # Get the list of binary packages not in a suite and mark them for
     # deletion.
-
     q = projectB.query("""
-SELECT b.file FROM binaries b WHERE NOT EXISTS
-        (SELECT ba.bin FROM bin_associations ba WHERE ba.bin = b.id)""");
+SELECT b.file FROM binaries b, files f
+ WHERE f.last_used IS NULL AND b.file = f.id
+   AND NOT EXISTS (SELECT 1 FROM bin_associations ba WHERE ba.bin = b.id)""");
     ql = q.getresult();
 
     projectB.query("BEGIN WORK");
@@ -74,30 +74,32 @@ SELECT b.file FROM binaries b WHERE NOT EXISTS
 
     # Check for any binaries which are marked for eventual deletion
     # but are now used again.
-
     q = projectB.query("""
 SELECT b.file FROM binaries b, files f
-   WHERE f.last_used IS NOT NULL AND f.id = b.file AND
-      EXISTS (SELECT suite FROM bin_associations ba WHERE ba.bin = b.id)""");
+   WHERE f.last_used IS NOT NULL AND f.id = b.file
+    AND EXISTS (SELECT 1 FROM bin_associations ba WHERE ba.bin = b.id)""");
     ql = q.getresult();
+
     projectB.query("BEGIN WORK");
     for i in ql:
         file_id = i[0];
         projectB.query("UPDATE files SET last_used = NULL WHERE id = %s" % (file_id));
     projectB.query("COMMIT WORK");
 
+########################################
+
 def check_sources():
     global delete_date, now_date;
 
     print "Checking for orphaned source packages..."
 
-    # Get the list of source packages not in a suite.
-
+    # Get the list of source packages not in a suite and not used by
+    # any binaries.
     q = projectB.query("""
-SELECT s.id, s.file FROM source s
-  WHERE NOT EXISTS
-   (SELECT sa.suite FROM src_associations sa WHERE sa.source = s.id)
-  AND NOT EXISTS (SELECT b.id FROM binaries b WHERE b.source = s.id)""");
+SELECT s.id, s.file FROM source s, files f
+  WHERE f.last_used IS NULL AND s.file = f.id
+    AND NOT EXISTS (SELECT 1 FROM src_associations sa WHERE sa.source = s.id)
+    AND NOT EXISTS (SELECT 1 FROM binaries b WHERE b.source = s.id)""");
 
     #### XXX: this should ignore cases where the files for the binary b
     ####      have been marked for deletion (so the delay between bins go
@@ -127,8 +129,8 @@ SELECT s.id, s.file FROM source s
     q = projectB.query("""
 SELECT f.id FROM source s, files f, dsc_files df
   WHERE f.last_used IS NOT NULL AND s.id = df.source AND df.file = f.id
-    AND ((EXISTS (SELECT sa.suite FROM src_associations sa WHERE sa.source = s.id))
-      OR (EXISTS (SELECT b.id FROM binaries b WHERE b.source = s.id)))""");
+    AND ((EXISTS (SELECT 1 FROM src_associations sa WHERE sa.source = s.id))
+      OR (EXISTS (SELECT 1 FROM binaries b WHERE b.source = s.id)))""");
 
     #### XXX: this should also handle deleted binaries specially (ie, not
     ####      reinstate sources because of them
@@ -142,6 +144,8 @@ SELECT f.id FROM source s, files f, dsc_files df
         projectB.query("UPDATE files SET last_used = NULL WHERE id = %s" % (file_id));
     projectB.query("COMMIT WORK");
 
+########################################
+
 def check_files():
     global delete_date, now_date;
 
@@ -151,11 +155,10 @@ def check_files():
     return;
 
     print "Checking for unused files..."
-
     q = projectB.query("""
 SELECT id FROM files f
-  WHERE NOT EXISTS (SELECT id FROM binaries b WHERE b.file = f.id)
-    AND NOT EXISTS (SELECT id FROM dsc_files df WHERE df.file = f.id)""");
+  WHERE NOT EXISTS (SELECT 1 FROM binaries b WHERE b.file = f.id)
+    AND NOT EXISTS (SELECT 1 FROM dsc_files df WHERE df.file = f.id)""");
 
     projectB.query("BEGIN WORK");
     for i in q.getresult():
@@ -175,9 +178,11 @@ def clean_binaries():
     if not Options["No-Action"]:
         before = time.time();
         sys.stdout.write("[Deleting from binaries table... ");
-        projectB.query("DELETE FROM binaries WHERE EXISTS (SELECT id FROM files WHERE binaries.file = files.id AND files.last_used <= '%s')" % (delete_date));
+        projectB.query("DELETE FROM binaries WHERE EXISTS (SELECT 1 FROM files WHERE binaries.file = files.id AND files.last_used <= '%s')" % (delete_date));
         sys.stdout.write("done. (%d seconds)]\n" % (int(time.time()-before)));
 
+########################################
+
 def clean():
     global delete_date, now_date;
     count = 0;
@@ -194,8 +199,8 @@ def clean():
     if not Options["No-Action"]:
         before = time.time();
         sys.stdout.write("[Deleting from source table... ");
-        projectB.query("DELETE FROM dsc_files WHERE EXISTS (SELECT df.id FROM source s, files f, dsc_files df WHERE f.last_used <= '%s' AND s.file = f.id AND s.id = df.source AND df.id = dsc_files.id)" % (delete_date));
-        projectB.query("DELETE FROM source WHERE EXISTS (SELECT id FROM files WHERE source.file = files.id AND files.last_used <= '%s')" % (delete_date));
+        projectB.query("DELETE FROM dsc_files WHERE EXISTS (SELECT 1 FROM source s, files f, dsc_files df WHERE f.last_used <= '%s' AND s.file = f.id AND s.id = df.source AND df.id = dsc_files.id)" % (delete_date));
+        projectB.query("DELETE FROM source WHERE EXISTS (SELECT 1 FROM files WHERE source.file = files.id AND files.last_used <= '%s')" % (delete_date));
         sys.stdout.write("done. (%d seconds)]\n" % (int(time.time()-before)));
 
     # Delete files from the pool
@@ -244,8 +249,8 @@ def clean_maintainers():
 
     q = projectB.query("""
 SELECT m.id FROM maintainer m
-  WHERE NOT EXISTS (SELECT id FROM binaries b WHERE b.maintainer = m.id)
-    AND NOT EXISTS (SELECT id FROM source s WHERE s.maintainer = m.id)""");
+  WHERE NOT EXISTS (SELECT 1 FROM binaries b WHERE b.maintainer = m.id)
+    AND NOT EXISTS (SELECT 1 FROM source s WHERE s.maintainer = m.id)""");
     ql = q.getresult();
 
     count = 0;
@@ -267,8 +272,8 @@ def clean_fingerprints():
 
     q = projectB.query("""
 SELECT f.id FROM fingerprint f
-  WHERE NOT EXISTS (SELECT id FROM binaries b WHERE b.sig_fpr = f.id)
-    AND NOT EXISTS (SELECT id FROM source s WHERE s.sig_fpr = f.id)""");
+  WHERE NOT EXISTS (SELECT 1 FROM binaries b WHERE b.sig_fpr = f.id)
+    AND NOT EXISTS (SELECT 1 FROM source s WHERE s.sig_fpr = f.id)""");
     ql = q.getresult();
 
     count = 0;