jenkins-bot has submitted this change and it was merged.
Change subject: BSBlog: Cache invalidation
......................................................................
BSBlog: Cache invalidation
* Also added cache invalidation on article delete in blog namespace
* Removed caching when blog type is not default
=> Use cache only in NS_BLOG - there is curently no functionality to figure out
in what type of blog tag a entry is showen and why (coditions). Possible blog
by categories or subpages...
Needs rework.
Change-Id: I76dd5ecdc2b5f936d225e2087241667b92bdb232
---
M Blog/Blog.class.php
1 file changed, 68 insertions(+), 28 deletions(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Blog/Blog.class.php b/Blog/Blog.class.php
index d2c4975..6413026 100644
--- a/Blog/Blog.class.php
+++ b/Blog/Blog.class.php
@@ -75,6 +75,7 @@
$this->setHook( 'BeforePageDisplay' );
$this->setHook( 'BSTopMenuBarCustomizerRegisterNavigationSites'
);
$this->setHook( 'PageContentSaveComplete' );
+ $this->setHook( 'ArticleDeleteComplete' );
// Trackback is not fully functional in MW and thus disabled.
BsConfig::registerVar( 'MW::Blog::ShowTrackback', false,
BsConfig::LEVEL_PRIVATE|BsConfig::TYPE_BOOL );
@@ -222,6 +223,36 @@
// Invalidate blog tag cache
BsCacheHelper::invalidateCache( $sTagsKey );
+ return true;
+ }
+
+ /**
+ * Invalidate blog cache
+ * @param WikiPage $article
+ * @param User $user
+ * @param String $reason
+ * @param Integer $id
+ * @param Content $content
+ * @param type $logEntry
+ * @return boolean
+ */
+ public function onArticleDeleteComplete( &$article, User &$user,
$reason, $id, $content, $logEntry ) {
+ # TODO: Cache must also be invalidated on other occasions like
blog tags
+ # for subpages or categories.
+ if ( !in_array($article->getTitle()->getNamespace(), array(
+ NS_BLOG,
+ NS_BLOG_TALK
+ )) ){
+ return true;
+ }
+
+ $sTagsKey = BsCacheHelper::getCacheKey( 'BlueSpice', 'Blog',
'Tags' );
+ $aTagsData = BsCacheHelper::get( $sTagsKey );
+
+ // Invalidate all blog tag caches
+ BsCacheHelper::invalidateCache( $aTagsData );
+ // Invalidate blog tag cache
+ BsCacheHelper::invalidateCache( $sTagsKey );
return true;
}
@@ -400,7 +431,6 @@
return $aData;
}
// initialize local variables
- $sOut = '';
$oErrorListView = new ViewTagErrorList( $this );
BsExtensionManager::setContext( 'MW::Blog::ShowBlog' );
@@ -588,11 +618,11 @@
$iLoop = 0;
foreach( $res as $row ) {
// prepare data for view class
- $oTitle = Title::newFromID( $row->entry_page_id );
- if ( !$oTitle->userCan( 'read' ) ) {
$iNumberOfEntries--; continue; }
+ $oEntryTitle = Title::newFromID( $row->entry_page_id );
+ if ( !$oEntryTitle->userCan( 'read' ) ) {
$iNumberOfEntries--; continue; }
$bMore = false;
- $aContent = preg_split( '#<(bs:blog:)?more */>#',
BsPageContentProvider::getInstance()->getContentFromTitle( $oTitle ) );
+ $aContent = preg_split( '#<(bs:blog:)?more */>#',
BsPageContentProvider::getInstance()->getContentFromTitle( $oEntryTitle ) );
if ( sizeof( $aContent ) > 1 ) $bMore = true;
$aContent = trim( $aContent[0] );
// Prevent recursive rendering of blog tag
@@ -627,7 +657,7 @@
$resComment = $dbr->selectRow(
'revision',
'COUNT( rev_id ) AS cnt',
- array( 'rev_page' =>
$oTitle->getTalkPage()->getArticleID() )
+ array( 'rev_page' =>
$oEntryTitle->getTalkPage()->getArticleID() )
);
$iCount = $resComment->cnt;
@@ -647,26 +677,26 @@
//TODO: magic_call?
if ( $argsModeNamespace === 'ns' ) {
- $sTitle = substr( $oTitle->getText(), 5 );
+ $sTitle = substr( $oEntryTitle->getText(), 5 );
} else {
- $sTitle = $oTitle->getText();
+ $sTitle = $oEntryTitle->getText();
}
$aTalkParams = array();
- if ( !$oTitle->getTalkPage()->exists() ) {
+ if ( !$oEntryTitle->getTalkPage()->exists() ) {
$aTalkParams = array( 'action' => 'edit' );
}
- $oRevision = Revision::newFromTitle( $oTitle );
+ $oRevision = Revision::newFromTitle( $oEntryTitle );
$oBlogItemView->setTitle( $sTitle );
$oBlogItemView->setRevId( $oRevision->getId() );
- $oBlogItemView->setURL( $oTitle->getLocalURL() );
- $oBlogItemView->setTalkURL(
$oTitle->getTalkPage()->getLocalURL( $aTalkParams ) );
+ $oBlogItemView->setURL( $oEntryTitle->getLocalURL() );
+ $oBlogItemView->setTalkURL(
$oEntryTitle->getTalkPage()->getLocalURL( $aTalkParams ) );
$oBlogItemView->setTalkCount( $iCount );
- $oBlogItemView->setTrackbackUrl( $oTitle->getLocalURL()
);
+ $oBlogItemView->setTrackbackUrl(
$oEntryTitle->getLocalURL() );
if ( $bShowInfo ) {
- $oFirstRevision = $oTitle->getFirstRevision();
+ $oFirstRevision =
$oEntryTitle->getFirstRevision();
$sTimestamp = $oFirstRevision->getTimestamp();
$sLocalDateTimeString =
BsFormatConverter::timestampToAgeString( wfTimestamp( TS_UNIX,$sTimestamp ) );
$oBlogItemView->setEntryDate(
$sLocalDateTimeString );
@@ -700,23 +730,33 @@
$oBlogView->setOption( 'parentpage', 'Blog/' );
}
- $aKey = array( $sKey );
- $sTagsKey = BsCacheHelper::getCacheKey( 'BlueSpice', 'Blog',
'Tags' );
- $aTagsData = BsCacheHelper::get( $sTagsKey );
-
- if ( $aTagsData !== false ) {
- if ( !in_array( $sKey, $aTagsData ) ) {
- $aTagsData = array_merge( $aTagsData, $aKey );
- }
- } else {
- $aTagsData = $aKey;
- }
-
- BsCacheHelper::set( $sTagsKey, $aTagsData, 86400 ); // one day
-
// actually create blog output
$sOut = $oBlogView->execute();
- BsCacheHelper::set( $sKey, $sOut, 86400 ); // one day
+
+ //Use cache only in NS_BLOG - there is curently no
functionality to
+ //figure out in what type of blog tag a entry is showen and why
+ //(coditions). Possible blog by categories or subpages...
+ //Needs rework.
+ if ( in_array($oTitle->getNamespace(),
array(NS_BLOG,NS_BLOG_TALK)) ) {
+ $aKey = array( $sKey );
+ $sTagsKey = BsCacheHelper::getCacheKey(
+ 'BlueSpice',
+ 'Blog',
+ 'Tags'
+ );
+ $aTagsData = BsCacheHelper::get( $sTagsKey );
+
+ if ( $aTagsData !== false ) {
+ if ( !in_array( $sKey, $aTagsData ) ) {
+ $aTagsData = array_merge( $aTagsData,
$aKey );
+ }
+ } else {
+ $aTagsData = $aKey;
+ }
+
+ BsCacheHelper::set( $sTagsKey, $aTagsData, 60*1440 );
// one day
+ BsCacheHelper::set( $sKey, $sOut, 60*1440 ); // one day
+ }
return $sOut;
}
--
To view, visit https://gerrit.wikimedia.org/r/212513
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I76dd5ecdc2b5f936d225e2087241667b92bdb232
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_23
Gerrit-Owner: Robert Vogel <vo...@hallowelt.biz>
Gerrit-Reviewer: Pwirth <wi...@hallowelt.biz>
Gerrit-Reviewer: Robert Vogel <vo...@hallowelt.biz>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
