From: Aaron Schulz <aschulz@wikimedia.org>
Date: Mon, 6 Apr 2015 22:13:07 +0000 (-0700)
Subject: Made Block::insert handle expired rows
X-Git-Tag: 1.31.0-rc.0~11814^2
X-Git-Url: http://git.cyclocoop.org//%27http:/code.google.com/p/ie7-js//%27?a=commitdiff_plain;h=f68e3864ba03277807e1655627600313080378e7;p=lhc%2Fweb%2Fwiklou.git

Made Block::insert handle expired rows

Bug: T90780
Change-Id: Ife9bcc0ec329156dac0bd033de35b25430234764
---

diff --git a/includes/Block.php b/includes/Block.php
index 4698f457d6..873a26d86f 100644
--- a/includes/Block.php
+++ b/includes/Block.php
@@ -442,19 +442,33 @@ class Block {
 			$dbw = wfGetDB( DB_MASTER );
 		}
 
-		# Don't collide with expired blocks
-		Block::purgeExpired();
+		# Periodic purge via commit hooks
+		if ( mt_rand( 0, 9 ) == 0 ) {
+			Block::purgeExpired();
+		}
 
 		$row = $this->getDatabaseArray();
 		$row['ipb_id'] = $dbw->nextSequenceValue( "ipblocks_ipb_id_seq" );
 
-		$dbw->insert(
-			'ipblocks',
-			$row,
-			__METHOD__,
-			array( 'IGNORE' )
-		);
+		$dbw->insert( 'ipblocks', $row, __METHOD__, array( 'IGNORE' ) );
 		$affected = $dbw->affectedRows();
+
+		# Don't collide with expired blocks.
+		# Do this after trying to insert to avoid pointless gap locks.
+		if ( !$affected ) {
+			$dbw->delete( 'ipblocks',
+				array(
+					'ipb_address' => $row['ipb_address'],
+					'ipb_user' => $row['ipb_user'],
+					'ipb_expiry < ' . $dbw->addQuotes( $dbw->timestamp() )
+				),
+				__METHOD__
+			);
+
+			$dbw->insert( 'ipblocks', $row, __METHOD__, array( 'IGNORE' ) );
+			$affected = $dbw->affectedRows();
+		}
+
 		$this->mId = $dbw->insertId();
 
 		if ( $affected ) {