From: Brion Vibber <brion@users.mediawiki.org>
Date: Fri, 12 May 2006 11:14:40 +0000 (+0000)
Subject: * dumpTextPass can now use 7zip files for prefetch
X-Git-Tag: 1.31.0-rc.0~57172
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=aa3aab547deaba08d3936bd665c320672e6a7107;p=lhc%2Fweb%2Fwiklou.git

* dumpTextPass can now use 7zip files for prefetch
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index bef7e38a81..baf0f23bdb 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -244,6 +244,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * dumpTextPass now skips goes to database for entries that were blank in the
   previous dump, as this may indicate a broken dump.
 * dumpTextPass progress includes percentage of items prefetched
+* dumpTextPass can now use 7zip files for prefetch
 
 
 == Compatibility ==
diff --git a/maintenance/dumpTextPass.php b/maintenance/dumpTextPass.php
index 7d662c4ac4..78367c0b10 100644
--- a/maintenance/dumpTextPass.php
+++ b/maintenance/dumpTextPass.php
@@ -28,6 +28,74 @@ require_once( 'commandLine.inc' );
 require_once( 'SpecialExport.php' );
 require_once( 'maintenance/backup.inc' );
 
+/**
+ * Stream wrapper around 7za filter program.
+ * Required since we can't pass an open file resource to XMLReader->open()
+ * which is used for the text prefetch.
+ */
+class SevenZipStream {
+	var $stream;
+	
+	private function stripPath( $path ) {
+		$prefix = 'mediawiki.compress.7z://';
+		return substr( $path, strlen( $prefix ) );
+	}
+	
+	function stream_open( $path, $mode, $options, &$opened_path ) {
+		if( $mode{0} == 'r' ) {
+			$options = 'e -bd -so';
+		} elseif( $mode{0} == 'w' ) {
+			$options = 'a -bd -si';
+		} else {
+			return false;
+		}
+		$arg = wfEscapeShellArg( $this->stripPath( $path ) );
+		$command = "7za $options $arg";
+		if( !wfIsWindows() ) {
+			// Suppress the stupid messages on stderr
+			$command .= ' 2>/dev/null';
+		}
+		$this->stream = popen( $command, $mode );
+		return ($this->stream !== false);
+	}
+	
+	function url_stat( $path, $flags ) {
+		return stat( $this->stripPath( $path ) );
+	}
+	
+	// This is all so lame; there should be a default class we can extend
+	
+	function stream_close() {
+		return fclose( $this->stream );
+	}
+	
+	function stream_flush() {
+		return fflush( $this->stream );
+	}
+	
+	function stream_read( $count ) {
+		return fread( $this->stream, $count );
+	}
+	
+	function stream_write( $data ) {
+		return fwrite( $this->stream, $data );
+	}
+	
+	function stream_tell() {
+		return ftell( $this->stream );
+	}
+	
+	function stream_eof() {
+		return feof( $this->stream );
+	}
+	
+	function stream_seek( $offset, $whence ) {
+		return fseek( $this->stream, $offset, $whence );
+	}
+}
+stream_wrapper_register( 'mediawiki.compress.7z', 'SevenZipStream' );
+
+
 class TextPassDumper extends BackupDumper {
 	var $prefetch = null;
 	var $input = "php://stdin";
@@ -87,6 +155,8 @@ class TextPassDumper extends BackupDumper {
 			return "compress.zlib://$param";
 		case "bzip2":
 			return "compress.bzip2://$param";
+		case "7zip":
+			return "mediawiki.compress.7z://$param";
 		default:
 			return $val;
 		}