Skip to content

Commit 670464a

Browse files
Ladsgroupjenkins-bot
authored andcommitted
Remove groups from DomainDb and co
We are fully deprecating concept of groups in rdbms library Bug: T405087 Change-Id: I20450a1f2c28ab443ee198939e7ee4aaddff556c
1 parent 04fcc09 commit 670464a

File tree

6 files changed

+11
-43
lines changed

6 files changed

+11
-43
lines changed

client/WikibaseClient.ServiceWiring.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@
102102
use Wikibase\Lib\MessageInLanguageProvider;
103103
use Wikibase\Lib\PropertyInfoDataTypeLookup;
104104
use Wikibase\Lib\Rdbms\ClientDomainDbFactory;
105-
use Wikibase\Lib\Rdbms\DomainDb;
106105
use Wikibase\Lib\Rdbms\RepoDomainDbFactory;
107106
use Wikibase\Lib\Rdbms\TermsDomainDbFactory;
108107
use Wikibase\Lib\Rdbms\VirtualTermsDomainDb;
@@ -203,8 +202,7 @@
203202
$lbFactory = $services->getDBLoadBalancerFactory();
204203

205204
return new ClientDomainDbFactory(
206-
$lbFactory,
207-
[ DomainDb::LOAD_GROUP_FROM_CLIENT ]
205+
$lbFactory
208206
);
209207
},
210208

@@ -832,8 +830,7 @@ function ( EntityNamespaceLookup $nsLookup, DatabaseEntitySource $source ): Enti
832830

833831
return new RepoDomainDbFactory(
834832
$lbFactory,
835-
WikibaseClient::getItemAndPropertySource( $services )->getDatabaseName() ?: $lbFactory->getLocalDomainID(),
836-
[ DomainDb::LOAD_GROUP_FROM_CLIENT ]
833+
WikibaseClient::getItemAndPropertySource( $services )->getDatabaseName() ?: $lbFactory->getLocalDomainID()
837834
);
838835
},
839836

client/tests/phpunit/integration/includes/Usage/Sql/EntityUsageTableBuilderTest.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
use Wikibase\Client\Usage\Sql\EntityUsageTableBuilder;
1111
use Wikibase\DataModel\Entity\ItemIdParser;
1212
use Wikibase\Lib\Rdbms\ClientDomainDbFactory;
13-
use Wikibase\Lib\Rdbms\DomainDb;
1413
use Wikibase\Lib\Reporting\ExceptionHandler;
1514
use Wikimedia\Rdbms\LBFactorySingle;
1615

@@ -38,8 +37,7 @@ public function testFillUsageTable(): void {
3837
] );
3938

4039
$domainDbFactory = new ClientDomainDbFactory(
41-
LBFactorySingle::newFromConnection( $this->db ),
42-
[ DomainDb::LOAD_GROUP_FROM_CLIENT ]
40+
LBFactorySingle::newFromConnection( $this->db )
4341
);
4442

4543
$primer = new EntityUsageTableBuilder(

lib/includes/Rdbms/ClientDomainDbFactory.php

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,16 @@ class ClientDomainDbFactory {
1313

1414
private ILBFactory $lbFactory;
1515

16-
/**
17-
* @var string[]
18-
*/
19-
private array $loadGroups;
20-
21-
public function __construct( ILBFactory $lbFactory, array $loadGroups = [] ) {
16+
public function __construct( ILBFactory $lbFactory ) {
2217
$this->lbFactory = $lbFactory;
23-
$this->loadGroups = $loadGroups;
2418
}
2519

2620
public function newLocalDb(): ClientDomainDb {
2721
$localDomain = $this->lbFactory->getLocalDomainID();
2822

2923
return new ClientDomainDb(
3024
$this->lbFactory,
31-
$localDomain,
32-
$this->loadGroups
25+
$localDomain
3326
);
3427
}
3528

lib/includes/Rdbms/DomainDb.php

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@
2121
* @license GPL-2.0-or-later
2222
*/
2323
abstract class DomainDb {
24-
25-
public const LOAD_GROUP_FROM_CLIENT = 'from-client';
26-
public const LOAD_GROUP_FROM_REPO = 'from-repo';
27-
2824
private ILBFactory $lbFactory;
2925
private string $domainId;
3026
private ReplicationWaiter $replicationWaiter;
@@ -37,10 +33,9 @@ abstract class DomainDb {
3733
private ?SessionConsistentConnectionManager $sessionConsistentConnectionManager = null;
3834
private ?ConnectionManager $connectionManager = null;
3935

40-
public function __construct( ILBFactory $lbFactory, string $domainId, array $loadGroups = [] ) {
36+
public function __construct( ILBFactory $lbFactory, string $domainId ) {
4137
$this->lbFactory = $lbFactory;
4238
$this->domainId = $domainId;
43-
$this->loadGroups = $loadGroups;
4439

4540
$this->replicationWaiter = new ReplicationWaiter(
4641
$lbFactory,
@@ -56,8 +51,7 @@ public function sessionConsistentConnections(): SessionConsistentConnectionManag
5651
if ( $this->sessionConsistentConnectionManager === null ) {
5752
$this->sessionConsistentConnectionManager = new SessionConsistentConnectionManager(
5853
$this->lbFactory->getMainLB( $this->domainId ),
59-
$this->domainId,
60-
$this->loadGroups
54+
$this->domainId
6155
);
6256
}
6357
return $this->sessionConsistentConnectionManager;
@@ -71,8 +65,7 @@ public function connections(): ConnectionManager {
7165
if ( $this->connectionManager === null ) {
7266
$this->connectionManager = new ConnectionManager(
7367
$this->lbFactory->getMainLB( $this->domainId ),
74-
$this->domainId,
75-
$this->loadGroups
68+
$this->domainId
7669
);
7770
}
7871
return $this->connectionManager;

lib/includes/Rdbms/RepoDomainDbFactory.php

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,12 @@ class RepoDomainDbFactory {
1515
private string $repoDomain;
1616
private ILBFactory $lbFactory;
1717

18-
/**
19-
* @var string[]
20-
*/
21-
private array $loadGroups;
22-
2318
public function __construct(
2419
ILBFactory $lbFactory,
25-
string $repoDomain,
26-
array $loadGroups = []
20+
string $repoDomain
2721
) {
2822
$this->lbFactory = $lbFactory;
2923
$this->repoDomain = $repoDomain;
30-
$this->loadGroups = $loadGroups;
3124
}
3225

3326
/**
@@ -46,11 +39,7 @@ public function newForEntitySource( DatabaseEntitySource $entitySource ): RepoDo
4639
}
4740

4841
private function newForDomain( string $domainId ): RepoDomainDb {
49-
return new RepoDomainDb(
50-
$this->lbFactory,
51-
$domainId,
52-
$this->loadGroups
53-
);
42+
return new RepoDomainDb( $this->lbFactory, $domainId );
5443
}
5544

5645
}

repo/WikibaseRepo.ServiceWiring.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@
8989
use Wikibase\Lib\Normalization\SnakNormalizer;
9090
use Wikibase\Lib\Normalization\StatementNormalizer;
9191
use Wikibase\Lib\Normalization\StringValueNormalizer;
92-
use Wikibase\Lib\Rdbms\DomainDb;
9392
use Wikibase\Lib\Rdbms\RepoDomainDbFactory;
9493
use Wikibase\Lib\Rdbms\TermsDomainDbFactory;
9594
use Wikibase\Lib\Rdbms\VirtualTermsDomainDb;
@@ -1761,8 +1760,7 @@ function ( $types, $localTypeName ) use ( $subEntityTypes ) {
17611760

17621761
return new RepoDomainDbFactory(
17631762
$lbFactory,
1764-
$lbFactory->getLocalDomainID(),
1765-
[ DomainDb::LOAD_GROUP_FROM_REPO ]
1763+
$lbFactory->getLocalDomainID()
17661764
);
17671765
},
17681766

0 commit comments

Comments
 (0)