From 63601400e476c6cf43d985f3e7b9864681695ed4 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Fri, 18 Jan 2013 16:46:04 +0100
Subject: Update to MediaWiki 1.20.2

this update includes:
* adjusted Arch Linux skin
* updated FluxBBAuthPlugin
* patch for https://bugzilla.wikimedia.org/show_bug.cgi?id=44024
---
 maintenance/benchmarks/bench_delete_truncate.php | 36 +++++++++++++++++++-----
 1 file changed, 29 insertions(+), 7 deletions(-)

(limited to 'maintenance/benchmarks/bench_delete_truncate.php')

diff --git a/maintenance/benchmarks/bench_delete_truncate.php b/maintenance/benchmarks/bench_delete_truncate.php
index 71385520..d9741496 100644
--- a/maintenance/benchmarks/bench_delete_truncate.php
+++ b/maintenance/benchmarks/bench_delete_truncate.php
@@ -1,11 +1,33 @@
 <?php
 /**
+ * Benchmark SQL DELETE vs SQL TRUNCATE.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
  * @file
  * @ingroup Benchmark
  */
 
-require_once( dirname( __FILE__ ) . '/Benchmarker.php' );
+require_once( __DIR__ . '/Benchmarker.php' );
 
+/**
+ * Maintenance script that benchmarks SQL DELETE vs SQL TRUNCATE.
+ *
+ * @ingroup Benchmark
+ */
 class BenchmarkDeleteTruncate extends Benchmarker {
 
 	public function __construct() {
@@ -24,24 +46,24 @@ class BenchmarkDeleteTruncate extends Benchmarker {
 
 		$this->insertData( $dbw );
 
-		$start = wfTime();
+		$start = microtime( true );
 
 		$this->delete( $dbw );
 
-		$end = wfTime();
+		$end = microtime( true );
 
-		echo "Delete: " . $end - $start;
+		echo "Delete: " . sprintf( "%6.3fms", ( $end - $start ) * 1000 );
 		echo "\r\n";
 
 		$this->insertData( $dbw );
 
-		$start = wfTime();
+		$start = microtime( true );
 
 		$this->truncate( $dbw );
 
-		$end = wfTime();
+		$end = microtime( true );
 
-		echo "Truncate: " . $end - $start;
+		echo "Truncate: " . sprintf( "%6.3fms", ( $end - $start ) * 1000 );
 		echo "\r\n";
 
 		$dbw->dropTable( 'test' );
-- 
cgit v1.2.3-54-g00ecf