<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[12092] trunk/wp-admin/maint/repair.php: Add option to optimize tables</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12092">12092</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2009-10-22 20:23:19 +0000 (Thu, 22 Oct 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add option to optimize tables</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminmaintrepairphp">trunk/wp-admin/maint/repair.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminmaintrepairphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/maint/repair.php (12091 => 12092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/maint/repair.php        2009-10-22 20:15:54 UTC (rev 12091)
+++ trunk/wp-admin/maint/repair.php        2009-10-22 20:23:19 UTC (rev 12092)
</span><span class="lines">@@ -24,6 +24,13 @@
</span><span class="cx">         $problems = array();
</span><span class="cx">         check_admin_referer('repair_db');
</span><span class="cx">
</span><ins>+        if ( 2 == $_GET['repair'] )
+                $optimize = true;
+        else
+                $optimize = false;
+
+        $okay = true;
+
</ins><span class="cx">         // Loop over the WP tables, checking and repairing as needed.
</span><span class="cx">         foreach ($wpdb->tables as $table) {
</span><span class="cx">                 if ( in_array($table, $wpdb->old_tables) )
</span><span class="lines">@@ -31,17 +38,31 @@
</span><span class="cx">
</span><span class="cx">                 $check = $wpdb->get_row("CHECK TABLE {$wpdb->prefix}$table");
</span><span class="cx">                 if ( 'OK' == $check->Msg_text ) {
</span><del>-                        echo "<p>The {$wpdb->prefix}$table table is okay.</p>";
</del><ins>+                        echo "<p>The {$wpdb->prefix}$table table is okay.";
</ins><span class="cx">                 } else {
</span><del>-                        echo "<p>The {$wpdb->prefix}$table table is not okay. It is reporting the following error: <code>$check->Msg_text</code>. WordPress will attempt to repair this table&hellip;<br/>";
</del><ins>+                        echo "<p>The {$wpdb->prefix}$table table is not okay. It is reporting the following error: <code>$check->Msg_text</code>. WordPress will attempt to repair this table&hellip;";
</ins><span class="cx">                         $repair = $wpdb->get_row("REPAIR TABLE {$wpb->prefix}$table");
</span><span class="cx">                         if ( 'OK' == $check->Msg_text ) {
</span><del>-                                echo "&nbsp;&nbsp;&nbsp;&nbsp;Sucessfully repaired the {$wpb->prefix}$table table.<br />";
</del><ins>+                                echo "<br />&nbsp;&nbsp;&nbsp;&nbsp;Sucessfully repaired the {$wpb->prefix}$table table.";
</ins><span class="cx">                         } else {
</span><del>-                                echo "&nbsp;&nbsp;&nbsp;&nbsp;Failed to repair the {$wpdb->prefix}$table table. Error: $check->Msg_text<br />";
</del><ins>+                                echo "<br />&nbsp;&nbsp;&nbsp;&nbsp;Failed to repair the {$wpdb->prefix}$table table. Error: $check->Msg_text<br />";
</ins><span class="cx">                                 $problems["{$wpdb->prefix}$table"] = $check->Msg_text;
</span><ins>+                                $okay = false;
</ins><span class="cx">                         }
</span><span class="cx">                 }
</span><ins>+                if ( $okay && $optimize ) {
+                        $check = $wpdb->get_row("ANALYZE TABLE {$wpdb->prefix}$table");
+                        if ( 'Table is already up to date' == $check->Msg_text ) {
+                                echo "<br />&nbsp;&nbsp;&nbsp;&nbsp;The {$wpb->prefix}$table table is already optimized.";
+                        } else {
+                                $check = $wpdb->get_row("OPTIMIZE TABLE {$wpdb->prefix}$table");
+                                if ( 'OK' == $check->Msg_text || 'Table is already up to date' == $check->Msg_text )
+                                        echo "<br />&nbsp;&nbsp;&nbsp;&nbsp;Sucessfully optimized the {$wpb->prefix}$table table.";
+                                else
+                                        echo "<br />&nbsp;&nbsp;&nbsp;&nbsp;Failed to optimize the {$wpdb->prefix}$table table. Error: $check->Msg_text";
+                        }
+                }
+                echo '</p>';
</ins><span class="cx">         }
</span><span class="cx">
</span><span class="cx">         if ( !empty($problems) ) {
</span><span class="lines">@@ -60,9 +81,10 @@
</span><span class="cx">                 _e('WordPress can automatically look for some common database problems and repair them. Repairing can take awhile, so please be patient.')
</span><span class="cx"> ?>
</span><span class="cx">         <p class="step"><a class="button" href="<?php echo wp_nonce_url('repair.php?repair=1', 'repair_db') ?>"><?php _e( 'Repair Database' ); ?></a></p>
</span><ins>+        <?php _e('WordPress can also attempt to optimize the database. This improves performance in some situations. Repairing and optimizing the database can take a long time and the database will be locked while optimizing.'); ?>
+        <p class="step"><a class="button" href="<?php echo wp_nonce_url('repair.php?repair=2', 'repair_db') ?>"><?php _e( 'Repair and Optimize Database' ); ?></a></p>
</ins><span class="cx"> <?php
</span><span class="cx"> }
</span><del>-
</del><span class="cx"> ?>
</span><span class="cx"> </body>
</span><span class="cx"> </html>
</span><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>