* Fixed notice when accessing special page without read permission and whitelist...

[lhc/web/wiklou.git] / maintenance / backup.inc

diff --git a/maintenance/backup.inc b/maintenance/backup.inc
index 0e5d89d..ee44954 100644 (file)
--- a/maintenance/backup.inc
+++ b/maintenance/backup.inc
@@ -15,13 +15,17 @@
  *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  * http://www.gnu.org/copyleft/gpl.html
  *
- * @package MediaWiki
- * @subpackage SpecialPage
+ * @addtogroup SpecialPage
  */
 
+class DumpDBZip2Output extends DumpPipeOutput {
+       function DumpDBZip2Output( $file ) {
+               parent::DumpPipeOutput( "dbzip2", $file );
+       }
+}
 
 class BackupDumper {
        var $reportingInterval = 100;
@@ -44,6 +48,7 @@ class BackupDumper {
                $this->registerOutput( 'file', 'DumpFileOutput' );
                $this->registerOutput( 'gzip', 'DumpGZipOutput' );
                $this->registerOutput( 'bzip2', 'DumpBZip2Output' );
+               $this->registerOutput( 'dbzip2', 'DumpDBZip2Output' );
                $this->registerOutput( '7zip', 'Dump7ZipOutput' );
 
                $this->registerFilter( 'latest', 'DumpLatestFilter' );
@@ -92,8 +97,9 @@ class BackupDumper {
                $sink = null;
                $sinks = array();
                foreach( $args as $arg ) {
+                       $matches = array();
                        if( preg_match( '/^--(.+?)(?:=(.+?)(?::(.+?))?)?$/', $arg, $matches ) ) {
-                               @list( $full, $opt, $val, $param ) = $matches;
+                               @list( /* $full */ , $opt, $val, $param ) = $matches;
                                switch( $opt ) {
                                case "plugin":
                                        $this->loadPlugin( $val, $param );
@@ -123,6 +129,21 @@ class BackupDumper {
                                        unset( $sink );
                                        $sink = $filter;
 
+                                       break;
+                               case "report":
+                                       $this->reportingInterval = intval( $val );
+                                       break;
+                               case "server":
+                                       $this->server = $val;
+                                       break;
+                               case "force-normal":
+                                       if( !function_exists( 'utf8_normalize' ) ) {
+                                               dl( "php_utfnormal.so" );
+                                               if( !function_exists( 'utf8_normalize' ) ) {
+                                                       wfDie( "Failed to load UTF-8 normalization extension. " .
+                                                               "Install or remove --force-normal parameter to use slower code.\n" );
+                                               }
+                                       }
                                        break;
                                default:
                                        $this->processOption( $opt, $val, $param );
@@ -147,21 +168,14 @@ class BackupDumper {
        }
 
        function dump( $history, $text = MW_EXPORT_TEXT ) {
-               # This shouldn't happen if on console... ;)
-               header( 'Content-type: text/html; charset=UTF-8' );
-
                # Notice messages will foul up your XML output even if they're
                # relatively harmless.
                ini_set( 'display_errors', false );
 
-               $this->startTime = wfTime();
-
-               $dbr =& wfGetDB( DB_SLAVE );
-               $this->maxCount = $dbr->selectField( 'page', 'MAX(page_id)', '', 'BackupDumper::dump' );
-               $this->startTime = wfTime();
+               $this->initProgress( $history );
 
-               $db =& $this->backupDb();
-               $exporter = new WikiExporter( $db, $history, MW_EXPORT_STREAM, $text );
+               $db = $this->backupDb();
+               $exporter = new WikiExporter( $db, $history, WikiExporter::STREAM, $text );
 
                $wrapper = new ExportProgressFilter( $this->sink, $this );
                $exporter->setOutputSink( $wrapper );
@@ -184,14 +198,34 @@ class BackupDumper {
 
                $this->report( true );
        }
+       
+       /**
+        * Initialise starting time and maximum revision count.
+        * We'll make ETA calculations based an progress, assuming relatively
+        * constant per-revision rate.
+        * @param int $history WikiExporter::CURRENT or WikiExporter::FULL
+        */
+       function initProgress( $history = WikiExporter::FULL ) {
+               $table = ($history == WikiExporter::CURRENT) ? 'page' : 'revision';
+               $field = ($history == WikiExporter::CURRENT) ? 'page_id' : 'rev_id';
+               
+               $dbr = wfGetDB( DB_SLAVE );
+               $this->maxCount = $dbr->selectField( $table, "MAX($field)", '', 'BackupDumper::dump' );
+               $this->startTime = wfTime();
+       }
 
-       function &backupDb() {
+       function backupDb() {
                global $wgDBadminuser, $wgDBadminpassword;
-               global $wgDBname;
-               $db =& new Database( $this->backupServer(), $wgDBadminuser, $wgDBadminpassword, $wgDBname );
-               $timeout = 3600 * 24;
-               $db->query( "SET net_read_timeout=$timeout" );
-               $db->query( "SET net_write_timeout=$timeout" );
+               global $wgDBname, $wgDebugDumpSql, $wgDBtype;
+               $flags = ($wgDebugDumpSql ? DBO_DEBUG : 0) | DBO_DEFAULT; // god-damn hack
+
+               $class = 'Database' . ucfirst($wgDBtype);
+               $db = new $class( $this->backupServer(), $wgDBadminuser, $wgDBadminpassword, $wgDBname, false, $flags );
+               
+               // Discourage the server from disconnecting us if it takes a long time
+               // to read out the big ol' batch query.
+               $db->setTimeout( 3600 * 24 );
+               
                return $db;
        }
 
@@ -204,15 +238,15 @@ class BackupDumper {
 
        function reportPage() {
                $this->pageCount++;
-               $this->report();
        }
 
        function revCount() {
                $this->revCount++;
+               $this->report();
        }
 
        function report( $final = false ) {
-               if( $final xor ( $this->pageCount % $this->reportingInterval == 0 ) ) {
+               if( $final xor ( $this->revCount % $this->reportingInterval == 0 ) ) {
                        $this->showReport();
                }
        }
@@ -224,7 +258,7 @@ class BackupDumper {
                        if( $delta ) {
                                $rate = $this->pageCount / $delta;
                                $revrate = $this->revCount / $delta;
-                               $portion = $this->pageCount / $this->maxCount;
+                               $portion = $this->revCount / $this->maxCount;
                                $eta = $this->startTime + $delta / $portion;
                                $etats = wfTimestamp( TS_DB, intval( $eta ) );
                        } else {
@@ -232,8 +266,8 @@ class BackupDumper {
                                $revrate = '-';
                                $etats = '-';
                        }
-                       global $wgDBname;
-                       $this->progress( "$now: $wgDBname $this->pageCount, ETA $etats ($rate pages/sec $revrate revs/sec)" );
+                       $this->progress( sprintf( "%s: %s %d pages (%0.3f/sec), %d revs (%0.3f/sec), ETA %s [max %d]",
+                               $now, wfWikiID(), $this->pageCount, $rate, $this->revCount, $revrate, $etats, $this->maxCount ) );
                }
        }