X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2FCategory.php;h=46b86d8cd8583e0bd28990d6e003c3bdc3442c9c;hp=9241730a04de63f96de79ec5b237524a2319c8b9;hb=478a58f63101f2b47d18a618296b5e7970fa3f24;hpb=5405fd880e914e7d460a9148477688770aeb7d1a

diff --git a/includes/Category.php b/includes/Category.php
index 9241730a04..46b86d8cd8 100644
--- a/includes/Category.php
+++ b/includes/Category.php
@@ -328,25 +328,35 @@ class Category {
 		$dbw = wfGetDB( DB_MASTER );
 		# Avoid excess contention on the same category (T162121)
 		$name = __METHOD__ . ':' . md5( $this->mName );
-		$scopedLock = $dbw->getScopedLockAndFlush( $name, __METHOD__, 1 );
+		$scopedLock = $dbw->getScopedLockAndFlush( $name, __METHOD__, 0 );
 		if ( !$scopedLock ) {
 			return false;
 		}
 
 		$dbw->startAtomic( __METHOD__ );
 
-		$cond1 = $dbw->conditional( [ 'page_namespace' => NS_CATEGORY ], 1, 'NULL' );
-		$cond2 = $dbw->conditional( [ 'page_namespace' => NS_FILE ], 1, 'NULL' );
-		$result = $dbw->selectRow(
+		// Lock all the `categorylinks` records and gaps for this category;
+		// this is a separate query due to postgres/oracle limitations
+		$dbw->selectRowCount(
 			[ 'categorylinks', 'page' ],
-			[ 'pages' => 'COUNT(*)',
-				'subcats' => "COUNT($cond1)",
-				'files' => "COUNT($cond2)"
-			],
+			'*',
 			[ 'cl_to' => $this->mName, 'page_id = cl_from' ],
 			__METHOD__,
 			[ 'LOCK IN SHARE MODE' ]
 		);
+		// Get the aggregate `categorylinks` row counts for this category
+		$catCond = $dbw->conditional( [ 'page_namespace' => NS_CATEGORY ], 1, 'NULL' );
+		$fileCond = $dbw->conditional( [ 'page_namespace' => NS_FILE ], 1, 'NULL' );
+		$result = $dbw->selectRow(
+			[ 'categorylinks', 'page' ],
+			[
+				'pages' => 'COUNT(*)',
+				'subcats' => "COUNT($catCond)",
+				'files' => "COUNT($fileCond)"
+			],
+			[ 'cl_to' => $this->mName, 'page_id = cl_from' ],
+			__METHOD__
+		);
 
 		$shouldExist = $result->pages > 0 || $this->getTitle()->exists();