Page MenuHomePhabricator
Create Task
Maniphest T279532

FederatedProperties and WikibaseCirrusSearch are incompatible
Closed, ResolvedPublic
Actions

Description

Currently both FederatedProperties and WikibaseCirrusSearch use the WikibaseRepoEntityTypes hook to alter the entity type definitions.

Specifically they both alter Def::ENTITY_SEARCH_CALLBACK

Given that we have no control over when the extension registration code runs these hooks we can't control which takes precidence.

The proposed solution to this is to no-longer make the changes that federated properties requires as a hook but instead call it after the hook has fired so that it will always be the last thing and therefore take precedence.

This highlights the need to be more careful about our entity type definitions.

Details

SubjectRepoBranchLines +/-
FedProps: ensure FedProps EntityTypeDefinitions are loaded lastmediawiki/extensions/WikibaseREL1_36+196 -119
FedProps: ensure FedProps EntityTypeDefinitions are loaded lastmediawiki/extensions/Wikibasemaster+196 -119
Customize query in gerrit

Related Objects
Search...

Event Timeline

Tarrow created this task.Apr 7 2021, 12:26 PM
Restricted Application added a subscriber: Aklapper. · View Herald TranscriptApr 7 2021, 12:26 PM
gerritbot added a comment.Apr 7 2021, 12:27 PM

Change 677561 had a related patch set uploaded (by Tarrow; author: Tarrow):

[mediawiki/extensions/Wikibase@master] FedProps: ensure FedProps EntityTypeDefinitions are loaded last

https://gerrit.wikimedia.org/r/677561

gerritbot added a project: Patch-For-Review.Apr 7 2021, 12:27 PM
Tarrow claimed this task.Apr 13 2021, 1:06 PM
Tarrow added a project: Wikibase Release Strategy (Hike 2, Sprint 3).
Tarrow moved this task from To do to Peer Review on the Wikibase Release Strategy (Hike 2, Sprint 3) board.
• toan subscribed.Apr 14 2021, 7:20 AM

Is this ready for review or was there another patch somewhere?

17:24:13 Time: 3.93 minutes, Memory: 1.47 GB
17:24:13 
17:24:13 There were 3 failures:
17:24:13 
17:24:13 1) Wikibase\Repo\Tests\Unit\ServiceWiring\EntityTypeDefinitionsTest::testConstruction
17:24:13 Service WikibaseRepo.Settings must be mocked
17:24:13 Failed asserting that an array has the key 'WikibaseRepo.Settings'.
17:24:13 
17:24:13 /workspace/src/extensions/Wikibase/repo/tests/phpunit/unit/ServiceWiringTestCase.php:52
17:24:13 /workspace/src/extensions/Wikibase/repo/includes/WikibaseRepo.php:752
17:24:13 /workspace/src/extensions/Wikibase/repo/WikibaseRepo.ServiceWiring.php:603
17:24:13 /workspace/src/extensions/Wikibase/repo/tests/phpunit/unit/ServiceWiringTestCase.php:84
17:24:13 /workspace/src/extensions/Wikibase/repo/tests/phpunit/unit/ServiceWiring/EntityTypeDefinitionsTest.php:21
17:24:13 
17:24:13 2) Wikibase\Repo\Tests\Unit\ServiceWiring\EntityTypeDefinitionsTest::testRunsHook
17:24:13 Service WikibaseRepo.Settings must be mocked
17:24:13 Failed asserting that an array has the key 'WikibaseRepo.Settings'.
17:24:13 
17:24:13 /workspace/src/extensions/Wikibase/repo/tests/phpunit/unit/ServiceWiringTestCase.php:52
17:24:13 /workspace/src/extensions/Wikibase/repo/includes/WikibaseRepo.php:752
17:24:13 /workspace/src/extensions/Wikibase/repo/WikibaseRepo.ServiceWiring.php:603
17:24:13 /workspace/src/extensions/Wikibase/repo/tests/phpunit/unit/ServiceWiringTestCase.php:84
17:24:13 /workspace/src/extensions/Wikibase/repo/tests/phpunit/unit/ServiceWiring/EntityTypeDefinitionsTest.php:33
17:24:13 
17:24:13 3) Wikibase\Lib\Tests\PHPUnitTestsHaveGroupWikibaseTest::testTestsHaveGroup with data set #3 ('repo')
17:24:13 All Wikibase repo PHPUnit tests should have "@group Wikibase" on them.
17:24:13 Failed asserting that two arrays are identical.
17:24:13 --- Expected
17:24:13 +++ Actual
17:24:13 @@ @@
17:24:13 -Array &0 ()
17:24:13 +Array &0 (
17:24:13 +    0 => '/workspace/src/extensions/Wikibase/lib/tests/phpunit/../../../repo/tests/phpunit/includes/EntityTypeDefinitionsIntegrationTest.php'
17:24:13 +)
17:24:13 
17:24:13 /workspace/src/extensions/Wikibase/lib/tests/phpunit/PHPUnitTestsHaveGroupWikibaseTest.php:32
17:24:13 
17:24:13 FAILURES!
17:24:13 Tests: 20762, Assertions: 70482, Failures: 3, Skipped: 95.
Tarrow mentioned this in T280153: Specify More Precise way to extend or alter EntityTypes.Apr 14 2021, 3:30 PM
gerritbot added a comment.Apr 15 2021, 9:22 AM

Change 677561 merged by jenkins-bot:

[mediawiki/extensions/Wikibase@master] FedProps: ensure FedProps EntityTypeDefinitions are loaded last

https://gerrit.wikimedia.org/r/677561

ReleaseTaggerBot added a project: MW-1.37-notes (1.37.0-wmf.3; 2021-04-27).Apr 15 2021, 10:00 AM
Maintenance_bot removed a project: Patch-For-Review.Apr 15 2021, 10:10 AM
• toan moved this task from Peer Review to Done on the Wikibase Release Strategy (Hike 2, Sprint 3) board.Apr 15 2021, 12:24 PM
gerritbot added a comment.Apr 23 2021, 9:19 AM

Change 682103 had a related patch set uploaded (by Tobias Andersson; author: Tarrow):

[mediawiki/extensions/Wikibase@REL1_36] FedProps: ensure FedProps EntityTypeDefinitions are loaded last

https://gerrit.wikimedia.org/r/682103

gerritbot added a project: Patch-For-Review.Apr 23 2021, 9:19 AM
gerritbot added a comment.May 3 2021, 10:55 AM

Change 682103 merged by jenkins-bot:

[mediawiki/extensions/Wikibase@REL1_36] FedProps: ensure FedProps EntityTypeDefinitions are loaded last

https://gerrit.wikimedia.org/r/682103

Maintenance_bot removed a project: Patch-For-Review.May 3 2021, 11:11 AM
Addshore closed this task as Resolved.Jun 18 2021, 8:47 AM
Addshore closed subtask T280663: FederatedProperties and WikibaseCirrusSearch are incompatible REL1_36 Backport as Resolved.
Addshore closed subtask T280124: FederatedProperties and WikibaseCirrusSearch are incompatible REL1_35 Backport as Resolved.
Content licensed under Creative Commons Attribution-ShareAlike (CC BY-SA) 4.0 unless otherwise noted; code licensed under GNU General Public License (GPL) 2.0 or later and other open source licenses. By using this site, you agree to the Terms of Use, Privacy Policy, and Code of Conduct. · Wikimedia Foundation · Privacy Policy · Code of Conduct · Terms of Use · Disclaimer · CC-BY-SA · GPL