From 04dc7c0b1ae09393a597419e93a76f9389428da3 Mon Sep 17 00:00:00 2001
From: Patrick Donelan <pat@patspam.com>
Date: Tue, 13 Oct 2009 19:29:05 +1100
Subject: [PATCH] Speed up upgrade_7.7.18-7.7.19.pl - better late than never?

---
 docs/upgrades/upgrade_7.7.18-7.7.19.pl | 40 +++++++++++++++++++-------
 1 file changed, 30 insertions(+), 10 deletions(-)

diff --git a/docs/upgrades/upgrade_7.7.18-7.7.19.pl b/docs/upgrades/upgrade_7.7.18-7.7.19.pl
index e9f3e3a2e..bd59859b3 100644
--- a/docs/upgrades/upgrade_7.7.18-7.7.19.pl
+++ b/docs/upgrades/upgrade_7.7.18-7.7.19.pl
@@ -137,18 +137,38 @@ sub moveCalendarFeedsToJSON {
 sub removeOrphanedVersionTags {
     my $session = shift;
     print "\tRemoving orphan version tags (this may take a while)... " unless $quiet;
+    
+    # Get all Version Tag ids
+    my %tags = map { $_ => 1 } @{$session->db->buildArrayRef("SELECT tagId FROM assetVersionTag")};
+    #print "\nSite has " . keys(%tags) . " Version Tags in total\n" unless $quiet;
+    
+    # Get all Version Tags with associated assetData
+    my %tags_with_data = map { $_ => 1 } @{$session->db->buildArrayRef("SELECT tagId FROM assetData")};
+    #print "* " . keys(%tags_with_data) . " with associated assetData\n" unless $quiet;
+    
+    # Figure out the set of ophans
+    my @orphans = grep { !$tags_with_data{$_} } keys %tags;
+    #print "* " . scalar(@orphans) . " orphans\n" unless $quiet;
+    
+    # Sanity check
+    if (keys(%tags) - keys(%tags_with_data) != scalar(@orphans)) { die "Something is broken in your Version Tag table" }
 
-    my $sth = $session->db->read(
-        "SELECT tagId FROM assetVersionTag",
-    );
-    while ( my ($tagId) = $sth->array ) {
-        if ( !$session->db->quickScalar( 
-            "SELECT COUNT(*) FROM assetData WHERE tagId=?", 
-            [ $tagId ] 
-        ) ) {
-            my $tag = WebGUI::VersionTag->new( $session, $tagId );
-            $tag->rollback;
+    # Remove the orphans
+    my $count = 0;
+    for my $tagId (@orphans) {
+        
+        # Progress
+        if ($count % 100 == 0) { print '*' unless $quiet; }
+        
+        # Double-check on reduced set (remove to speed up even further)
+        if ( $session->db->quickScalar("SELECT COUNT(*) FROM assetData WHERE tagId=?", [ $tagId ]) ) {
+            die "Version Tag was supposed to be an orphan, but had assetData: $tagId";
         }
+        
+        my $tag = WebGUI::VersionTag->new( $session, $tagId );
+        $tag->rollback;
+        
+        $count++;
     }
 
     print "DONE!\n" unless $quiet;