Live fixes: lots of scary magic runes; php 5 fixes; reporting; etc

[lhc/web/wiklou.git] / maintenance / storage / moveToExternal.php

diff --git a/maintenance/storage/moveToExternal.php b/maintenance/storage/moveToExternal.php
index aabc5e6..0b46f70 100644 (file)
--- a/maintenance/storage/moveToExternal.php
+++ b/maintenance/storage/moveToExternal.php
@@ -1,7 +1,6 @@
 <?php
 
 define( 'REPORTING_INTERVAL', 100 );
-define( 'STUB_HEADER', 'O:15:"historyblobstub"' );
 
 if ( !defined( 'MEDIAWIKI' ) ) {
        $optionsWithArgs = array( 'm' );
@@ -53,24 +52,42 @@ function moveToExternal( $cluster, $maxID ) {
                }
 
                # Resolve stubs
-               $flags = explode( ',', $row->old_flags );
-               if ( in_array( 'object', $flags )
-                       && substr( $row->old_text, 0, strlen( STUB_HEADER ) ) === STUB_HEADER )
-               {
-                       resolveStub( $id, $row->old_text, $row->old_flags );
+               $text = $row->old_text;
+               if ( $row->old_flags === '' ) {
+                       $flags = 'external';
+               } else {
+                       $flags = "{$row->old_flags},external";
+               }
+               
+               if ( strpos( $flags, 'object' ) !== false ) {
+                       $obj = unserialize( $text );
+                       $className = strtolower( get_class( $obj ) );
+                       if ( $className == 'historyblobstub' ) {
+                               resolveStub( $id, $row->old_text, $row->old_flags );
+                               continue;
+                       } elseif ( $className == 'historyblobcurstub' ) {
+                               $text = gzdeflate( $obj->getText() );
+                               $flags = 'utf-8,gzip,external';
+                       } elseif ( $className == 'concatenatedgziphistoryblob' ) {
+                               // Do nothing
+                       } else {
+                               print "Warning: unrecognised object class \"$className\"\n";
+                               continue;
+                       }
+               }
+
+               if ( strlen( $text ) < 100 ) {
+                       // Don't move tiny revisions
                        continue;
                }
 
-               $url = $ext->store( $cluster, $row->old_text );
+               #print "Storing "  . strlen( $text ) . " bytes to $url\n";
+
+               $url = $ext->store( $cluster, $text );
                if ( !$url ) {
                        print "Error writing to external storage\n";
                        exit;
                }
-               if ( $row->old_flags === '' ) {
-                       $flags = 'external';
-               } else {
-                       $flags = "{$row->old_flags},external";
-               }
                $dbw->update( 'text',
                        array( 'old_flags' => $flags, 'old_text' => $url ),
                        array( 'old_id' => $id ), $fname );