From 5abcfd06099a044ae2b1b8b9d09e292963ce0092 Mon Sep 17 00:00:00 2001
From: Derick Alangi <alangiderick@gmail.com>
Date: Sat, 23 Mar 2019 13:24:18 +0100
Subject: [PATCH] Avoid using calls to freeResults() and allow object go out of
 scope

Bug: T26712
Change-Id: Ie97b6f3e3cfc4dc010900ebde5ff8e5afec10727
---
 .../libs/rdbms/database/resultwrapper/ResultWrapper.php    | 1 -
 maintenance/convertLinks.php                               | 3 ---
 maintenance/storage/checkStorage.php                       | 7 -------
 3 files changed, 11 deletions(-)

diff --git a/includes/libs/rdbms/database/resultwrapper/ResultWrapper.php b/includes/libs/rdbms/database/resultwrapper/ResultWrapper.php
index 1355e2263e..a9befc2bae 100644
--- a/includes/libs/rdbms/database/resultwrapper/ResultWrapper.php
+++ b/includes/libs/rdbms/database/resultwrapper/ResultWrapper.php
@@ -69,7 +69,6 @@ class ResultWrapper implements IResultWrapper {
 
 	public function free() {
 		if ( $this->db ) {
-			$this->db->freeResult( $this );
 			$this->db = null;
 		}
 		$this->result = null;
diff --git a/maintenance/convertLinks.php b/maintenance/convertLinks.php
index af60eaa2ba..59820a5a8f 100644
--- a/maintenance/convertLinks.php
+++ b/maintenance/convertLinks.php
@@ -126,7 +126,6 @@ class ConvertLinks extends Maintenance {
 		$res = $dbw->query( "SELECT COUNT(*) AS count FROM $links" );
 		$row = $dbw->fetchObject( $res );
 		$numRows = $row->count;
-		$dbw->freeResult( $res );
 
 		if ( $numRows == 0 ) {
 			$this->output( "Updating schema (no rows to convert)...\n" );
@@ -168,7 +167,6 @@ class ConvertLinks extends Maintenance {
 					}
 				}
 			}
-			$dbw->freeResult( $res );
 			$dbw->bufferResults( true );
 			$this->output( "Finished loading IDs.\n\n" );
 			$this->performanceLog(
@@ -214,7 +212,6 @@ class ConvertLinks extends Maintenance {
 						$numBadLinks++;
 					}
 				}
-				$dbw->freeResult( $res );
 				# $this->output( "rowOffset: $rowOffset\ttuplesAdded: "
 				# 	. "$tuplesAdded\tnumBadLinks: $numBadLinks\n" );
 				if ( $tuplesAdded != 0 ) {
diff --git a/maintenance/storage/checkStorage.php b/maintenance/storage/checkStorage.php
index a95789d366..26d4e79787 100644
--- a/maintenance/storage/checkStorage.php
+++ b/maintenance/storage/checkStorage.php
@@ -86,7 +86,6 @@ class CheckStorage {
 			foreach ( $res as $row ) {
 				$this->oldIdMap[$row->rev_id] = $row->rev_text_id;
 			}
-			$dbr->freeResult( $res );
 
 			if ( !count( $this->oldIdMap ) ) {
 				continue;
@@ -147,7 +146,6 @@ class CheckStorage {
 					$this->addError( 'unfixable', "Error: invalid flags field \"$flags\"", $id );
 				}
 			}
-			$dbr->freeResult( $res );
 
 			// Output errors for any missing text rows
 			foreach ( $missingTextRows as $oldId => $revId ) {
@@ -187,7 +185,6 @@ class CheckStorage {
 						$externalNormalBlobs[$cluster][$id][] = $row->old_id;
 					}
 				}
-				$dbr->freeResult( $res );
 			}
 
 			// Check external concat blobs for the right header
@@ -210,7 +207,6 @@ class CheckStorage {
 					foreach ( $res as $row ) {
 						unset( $xBlobIds[$row->blob_id] );
 					}
-					$extDb->freeResult( $res );
 					// Print errors for missing blobs rows
 					foreach ( $xBlobIds as $blobId => $oldId ) {
 						$this->addError(
@@ -279,7 +275,6 @@ class CheckStorage {
 							$this->addError( 'unfixable', "Error: unrecognised object class \"$className\"", $oldId );
 					}
 				}
-				$dbr->freeResult( $res );
 			}
 
 			// Check local concat blob validity
@@ -333,7 +328,6 @@ class CheckStorage {
 
 					unset( $concatBlobs[$row->old_id] );
 				}
-				$dbr->freeResult( $res );
 			}
 
 			// Check targets of unresolved stubs
@@ -421,7 +415,6 @@ class CheckStorage {
 				}
 				unset( $oldIds[$row->blob_id] );
 			}
-			$extDb->freeResult( $res );
 
 			// Print errors for missing blobs rows
 			foreach ( $oldIds as $blobId => $oldIds2 ) {
-- 
2.20.1