In Database::getLag(): Add some more I/O thread states.

[lhc/web/wiklou.git] / includes / HistoryBlob.php

diff --git a/includes/HistoryBlob.php b/includes/HistoryBlob.php
index 323d107..664ceb4 100644 (file)
--- a/includes/HistoryBlob.php
+++ b/includes/HistoryBlob.php
@@ -355,7 +355,7 @@ class DiffHistoryBlob implements HistoryBlob {
        }
 
        function compress() {
-               if ( !function_exists( 'xdiff_string_bdiff' ) ){ 
+               if ( !function_exists( 'xdiff_string_rabdiff' ) ){ 
                        throw new MWException( "Need xdiff 1.5+ support to write DiffHistoryBlob\n" );
                }
                if ( isset( $this->mDiffs ) ) {
@@ -430,7 +430,7 @@ class DiffHistoryBlob implements HistoryBlob {
                # Need to do a null concatenation with warnings off, due to bugs in the current version of xdiff
                # "String is not zero-terminated"
                wfSuppressWarnings();
-               $diff = xdiff_string_bdiff( $t1, $t2 ) . '';
+               $diff = xdiff_string_rabdiff( $t1, $t2 ) . '';
                wfRestoreWarnings();
                return $diff;
        }
@@ -456,7 +456,7 @@ class DiffHistoryBlob implements HistoryBlob {
                        }
                }
                if ( $header['csize'] != strlen( $base ) ) {
-                       wfDebug( __METHOD__. ": incorrect base length {$header['csize']} -> {strlen($base)}\n" );
+                       wfDebug( __METHOD__. ": incorrect base length\n" );
                        return false;
                }
                
@@ -547,14 +547,23 @@ class DiffHistoryBlob implements HistoryBlob {
                if ( isset( $info['default'] ) ) {
                        $this->mDefaultKey = $info['default'];
                }
-               $map = explode( ',', $info['map'] );
-               $cur = 0;
-               $this->mDiffMap = array();
-               foreach ( $map as $i ) {
-                       $cur += $i;
-                       $this->mDiffMap[] = $cur;
-               }
                $this->mDiffs = $info['diffs'];
+               if ( isset( $info['base'] ) ) {
+                       // Old format
+                       $this->mDiffMap = range( 0, count( $this->mDiffs ) - 1 );
+                       array_unshift( $this->mDiffs, 
+                               pack( 'VVCV', 0, 0, self::XDL_BDOP_INSB, strlen( $info['base'] ) ) .
+                               $info['base'] );
+               } else {
+                       // New format
+                       $map = explode( ',', $info['map'] );
+                       $cur = 0;
+                       $this->mDiffMap = array();
+                       foreach ( $map as $i ) {
+                               $cur += $i;
+                               $this->mDiffMap[] = $cur;
+                       }
+               }
                $this->uncompress();
        }