Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rdbms: override sanitizeConnectionFlags() in LoadBalancerSingle

Browse source 
Change-Id: I1d4ade28762e199f99fe80ae1ff9ef70e74264fe
This commit is contained in:
Aaron Schulz 2024-08-23 14:40:53 -07:00
parent ccf94e31c1
commit 0cb0f0ba7a
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
includes/libs/rdbms/loadbalancer/LoadBalancer.php
View file

@ -313,7 +313,7 @@ class LoadBalancer implements ILoadBalancerForOwner {
* @param string $domain Database domain
* @return int Sanitized bitfield
*/
private function sanitizeConnectionFlags( $flags, $domain ) {
protected function sanitizeConnectionFlags( $flags, $domain ) {
if ( self::fieldHasBit( $flags, self::CONN_TRX_AUTOCOMMIT ) ) {
// Callers use CONN_TRX_AUTOCOMMIT to bypass REPEATABLE-READ staleness without
// resorting to row locks (e.g. FOR UPDATE) or to make small out-of-band commits

9
includes/libs/rdbms/loadbalancer/LoadBalancerSingle.php
View file

@ -79,6 +79,15 @@ class LoadBalancerSingle extends LoadBalancer {
) );
}
protected function sanitizeConnectionFlags( $flags, $domain ) {
// There is only one underlying connection handle. Also, this class is only meant to
// be used during situations like site installation, where there should be no contenting
// connections, and integration testing, where everything uses temporary tables.
$flags &= ~self::CONN_TRX_AUTOCOMMIT;
return $flags;
}
protected function reallyOpenConnection( $i, DatabaseDomain $domain, array $lbInfo ) {
foreach ( $lbInfo as $k => $v ) {
$this->conn->setLBInfo( $k, $v );