jenkins-bot has submitted this change and it was merged.

Change subject: Fix change handling for site link changes
......................................................................


Fix change handling for site link changes

these still need parse, since refresh links does
not yet handle updating the site links in the client.

(part 1 of bug fix)

Bug: T86765
Change-Id: I22c23f017a49e8b4cf531fd87bad09558c934210
(cherry picked from commit 2140eda78fb6e18f737f6663e697177055eb4881)
---
M client/includes/Changes/ChangeHandler.php
M client/tests/phpunit/includes/Changes/ChangeHandlerTest.php
2 files changed, 16 insertions(+), 10 deletions(-)

Approvals:
  Aude: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/client/includes/Changes/ChangeHandler.php 
b/client/includes/Changes/ChangeHandler.php
index 9fe6ff6..cb3c116 100644
--- a/client/includes/Changes/ChangeHandler.php
+++ b/client/includes/Changes/ChangeHandler.php
@@ -206,8 +206,14 @@
                $all = isset( $aspects[EntityUsage::ALL_USAGE] );
 
                if ( isset( $aspects[EntityUsage::SITELINK_USAGE] ) || $all ) {
-                       // Link updates might be optimized to bypass parsing
-                       $actions[self::LINKS_UPDATE_ACTION] = true;
+                       // @fixme: LinksUpdate doesn't seem to work to refresh 
site links
+                       // when used on it's own with out parsing.
+                       // LinksUpdate or our interaction with it should be 
changed
+                       // so that site links can be updated without parse.
+                       // For now, we need to still do parse for site link 
changes.
+                       //
+                       // $actions[self::LINKS_UPDATE_ACTION] = true;
+                       $actions[self::PARSER_PURGE_ACTION] = true;
                }
 
                if ( isset( $aspects[EntityUsage::LABEL_USAGE] ) || $all ) {
diff --git a/client/tests/phpunit/includes/Changes/ChangeHandlerTest.php 
b/client/tests/phpunit/includes/Changes/ChangeHandlerTest.php
index 9ed0ca7..5adc7d6 100644
--- a/client/tests/phpunit/includes/Changes/ChangeHandlerTest.php
+++ b/client/tests/phpunit/includes/Changes/ChangeHandlerTest.php
@@ -199,8 +199,8 @@
                        ),
                        'sitelink usage' => array( // #1
                                array( EntityUsage::SITELINK_USAGE ),
-                               array( ChangeHandler::LINKS_UPDATE_ACTION, 
ChangeHandler::WEB_PURGE_ACTION, ChangeHandler::RC_ENTRY_ACTION ),
-                               array( ChangeHandler::PARSER_PURGE_ACTION )
+                               array( ChangeHandler::PARSER_PURGE_ACTION, 
ChangeHandler::WEB_PURGE_ACTION, ChangeHandler::RC_ENTRY_ACTION ),
+                               array( ChangeHandler::LINKS_UPDATE_ACTION )
                        ),
                        'label usage' => array(
                                array( EntityUsage::LABEL_USAGE ),
@@ -521,15 +521,15 @@
                );
 
                $emmyUpdateLinks = array(
-                       'purgeParserCache' => array(),
-                       'scheduleRefreshLinks' => array( 'Emmy' => true ),
+                       'purgeParserCache' => array( 'Emmy' => true ),
+                       'scheduleRefreshLinks' => array(),
                        'purgeWebCache' => array( 'Emmy' => true ),
                        'injectRCRecord' => array( 'Emmy' => true ),
                );
 
                $emmy2UpdateLinks = array(
-                       'purgeParserCache' => array( ),
-                       'scheduleRefreshLinks' => array( 'Emmy2' => true ),
+                       'purgeParserCache' => array( 'Emmy2' => true ),
+                       'scheduleRefreshLinks' => array(),
                        'purgeWebCache' => array( 'Emmy2' => true ),
                        'injectRCRecord' => array( 'Emmy2' => true ),
                );
@@ -619,8 +619,8 @@
                                $changes['change-enwiki-sitelink'],
                                array( 'q100' => array( 'enwiki' => 'Emmy' ), 
'q200' => array( 'enwiki' => 'Emmy2' ) ),
                                array(
-                                       'purgeParserCache' => array(),
-                                       'scheduleRefreshLinks' => array( 'Emmy' 
=> true, 'Emmy2' => true ),
+                                       'purgeParserCache' => array( 'Emmy' => 
true, 'Emmy2' => true ),
+                                       'scheduleRefreshLinks' => array(),
                                        'purgeWebCache' => array( 'Emmy' => 
true, 'Emmy2' => true ),
                                        'injectRCRecord' => array( 'Emmy' => 
true, 'Emmy2' => true ),
                                )

-- 
To view, visit https://gerrit.wikimedia.org/r/184918
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I22c23f017a49e8b4cf531fd87bad09558c934210
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: wmf/1.25wmf14
Gerrit-Owner: Aude <aude.w...@gmail.com>
Gerrit-Reviewer: Aude <aude.w...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to