From 002c0977ea9d37879f00a699cf891bdca6418929 Mon Sep 17 00:00:00 2001
From: Yifei He <eflyjason@gmail.com>
Date: Tue, 12 Dec 2017 19:27:54 +0800
Subject: [PATCH] maintenance: Replace manual IN query with select wrapper

Bug: T182208
Change-Id: I4c410bc1f7a57efacda4ac71a074a8a8ee2d1d98
---
 maintenance/storage/checkStorage.php | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/maintenance/storage/checkStorage.php b/maintenance/storage/checkStorage.php
index acf0103bfa..4071a06b4c 100644
--- a/maintenance/storage/checkStorage.php
+++ b/maintenance/storage/checkStorage.php
@@ -100,8 +100,12 @@ class CheckStorage {
 			$missingTextRows = array_flip( $this->oldIdMap );
 			$externalRevs = [];
 			$objectRevs = [];
-			$res = $dbr->select( 'text', [ 'old_id', 'old_flags' ],
-				'old_id IN (' . implode( ',', $this->oldIdMap ) . ')', __METHOD__ );
+			$res = $dbr->select(
+				'text',
+				[ 'old_id', 'old_flags' ],
+				[ 'old_id' => $this->oldIdMap ],
+				__METHOD__
+			);
 			foreach ( $res as $row ) {
 				/**
 				 * @var $flags int
@@ -158,8 +162,12 @@ class CheckStorage {
 			$externalConcatBlobs = [];
 			$externalNormalBlobs = [];
 			if ( count( $externalRevs ) ) {
-				$res = $dbr->select( 'text', [ 'old_id', 'old_flags', 'old_text' ],
-					[ 'old_id IN (' . implode( ',', $externalRevs ) . ')' ], __METHOD__ );
+				$res = $dbr->select(
+					'text',
+					[ 'old_id', 'old_flags', 'old_text' ],
+					[ 'old_id' => $externalRevs ],
+					__METHOD__
+				);
 				foreach ( $res as $row ) {
 					$urlParts = explode( '://', $row->old_text, 2 );
 					if ( count( $urlParts ) !== 2 || $urlParts[1] == '' ) {
@@ -224,7 +232,7 @@ class CheckStorage {
 				$res = $dbr->select(
 					'text',
 					[ 'old_id', 'old_flags', "LEFT(old_text, $headerLength) AS header" ],
-					[ 'old_id IN (' . implode( ',', $objectRevs ) . ')' ],
+					[ 'old_id' => $objectRevs ],
 					__METHOD__
 				);
 				foreach ( $res as $row ) {
@@ -283,7 +291,7 @@ class CheckStorage {
 				$res = $dbr->select(
 					'text',
 					[ 'old_id', 'old_flags', "LEFT(old_text, $headerLength) AS header" ],
-					[ 'old_id IN (' . implode( ',', array_keys( $concatBlobs ) ) . ')' ],
+					[ 'old_id' => array_keys( $concatBlobs ) ],
 					__METHOD__
 				);
 				foreach ( $res as $row ) {
-- 
2.20.1