diff options
author | Amir Sarabadani <ladsgroup@gmail.com> | 2024-05-29 13:57:58 +0200 |
---|---|---|
committer | Aaron Schulz <aschulz@wikimedia.org> | 2024-06-03 14:17:57 -0700 |
commit | f33b5515b53d73785044abbe0f0d76e7ce09d716 (patch) | |
tree | 19c4b8a8407db223b8ed13c5808f2921d8c29cfc /maintenance | |
parent | a84b7814fef016613b77f608f777f34842c9c2b8 (diff) | |
download | mediawikicore-f33b5515b53d73785044abbe0f0d76e7ce09d716.tar.gz mediawikicore-f33b5515b53d73785044abbe0f0d76e7ce09d716.zip |
rdbms: Remove ILoadBalancer::getWriterIndex()
It doesn't need to have its own method, We can just use the constant
instead.
Bug: T363839
Change-Id: Iaec5a8e88dc3e5ae4eaf1f24aebf4c5d73f4b350
Diffstat (limited to 'maintenance')
-rw-r--r-- | maintenance/mysql.php | 3 | ||||
-rw-r--r-- | maintenance/sql.php | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/maintenance/mysql.php b/maintenance/mysql.php index fca4d7caedec..8291ac7d83d0 100644 --- a/maintenance/mysql.php +++ b/maintenance/mysql.php @@ -25,6 +25,7 @@ use MediaWiki\Shell\Shell; use Wikimedia\IPUtils; +use Wikimedia\Rdbms\ServerInfo; require_once __DIR__ . '/Maintenance.php'; @@ -93,7 +94,7 @@ class MysqlMaintenance extends Maintenance { $this->fatalError( "Error: Host not configured: \"$host\"" ); } } elseif ( $this->hasOption( 'write' ) ) { - $index = $lb->getWriterIndex(); + $index = ServerInfo::WRITER_INDEX; } else { $group = $this->getOption( 'group', false ); $index = $lb->getReaderIndex( $group ); diff --git a/maintenance/sql.php b/maintenance/sql.php index faa5bf531a54..99711f87ef87 100644 --- a/maintenance/sql.php +++ b/maintenance/sql.php @@ -28,6 +28,7 @@ use MediaWiki\Installer\DatabaseUpdater; use Wikimedia\Rdbms\DBQueryError; use Wikimedia\Rdbms\IDatabase; use Wikimedia\Rdbms\IResultWrapper; +use Wikimedia\Rdbms\ServerInfo; /** * Maintenance script that sends SQL queries from the specified file to the database. @@ -77,7 +78,8 @@ class MwSql extends Maintenance { break; } } - if ( $index === null || $index === $lb->getWriterIndex() ) { + // @phan-suppress-next-line PhanSuspiciousValueComparison + if ( $index === null || $index === ServerInfo::WRITER_INDEX ) { $this->fatalError( "No replica DB server configured with the name '$replicaDB'." ); } } else { |