From c3b4fabcd65e68135969f2b2e33ad41300c03465 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Mon, 12 Jan 2015 13:39:24 -0800 Subject: [PATCH] Made SqlDataUpdate use lazy DB connections Change-Id: Ic041f620f27e1e8012586542ac6dc60657461d04 --- includes/deferred/LinksUpdate.php | 6 ------ includes/deferred/SqlDataUpdate.php | 6 ++---- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/includes/deferred/LinksUpdate.php b/includes/deferred/LinksUpdate.php index 822c964b8d..9c377dff41 100644 --- a/includes/deferred/LinksUpdate.php +++ b/includes/deferred/LinksUpdate.php @@ -58,12 +58,6 @@ class LinksUpdate extends SqlDataUpdate { /** @var array Map of arbitrary name to value */ public $mProperties; - /** @var DatabaseBase Database connection reference */ - public $mDb; - - /** @var array SELECT options to be used */ - public $mOptions; - /** @var bool Whether to queue jobs for recursive updates */ public $mRecursive; diff --git a/includes/deferred/SqlDataUpdate.php b/includes/deferred/SqlDataUpdate.php index 7ec61ea704..5823b2e56f 100644 --- a/includes/deferred/SqlDataUpdate.php +++ b/includes/deferred/SqlDataUpdate.php @@ -31,7 +31,7 @@ * the beginTransaction() and commitTransaction() methods. */ abstract class SqlDataUpdate extends DataUpdate { - /** @var DatabaseBase Database connection reference */ + /** @var IDatabase Database connection reference */ protected $mDb; /** @var array SELECT options to be used (array) */ @@ -53,9 +53,7 @@ abstract class SqlDataUpdate extends DataUpdate { public function __construct( $withTransaction = true ) { parent::__construct(); - // @todo Get connection only when it's needed? Make sure that doesn't - // break anything, especially transactions! - $this->mDb = wfGetDB( DB_MASTER ); + $this->mDb = wfGetLB()->getLazyConnectionRef( DB_MASTER ); $this->mWithTransaction = $withTransaction; $this->mHasTransaction = false; -- 2.20.1