From a0c583e408b0ba0190be1d8bcd46cd04b0d06349 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Mon, 18 Nov 2013 05:31:31 +0100 Subject: [PATCH] Remove unused classes Title[List]Dependency Classes TitleListDependency and TitleDependency that are currently not used. Searched core and extensions in Gerrit. Change-Id: I51404ce36c4ef55393588817d1673fd17c81b4a2 --- RELEASE-NOTES-1.23 | 2 + includes/AutoLoader.php | 2 - includes/cache/CacheDependency.php | 177 ----------------------------- 3 files changed, 2 insertions(+), 179 deletions(-) diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23 index c5791ba0fd..e8af684a75 100644 --- a/RELEASE-NOTES-1.23 +++ b/RELEASE-NOTES-1.23 @@ -52,6 +52,8 @@ production. disappear, such as file description pages loaded via $wgUseInstantCommons or pages transcluded cross-wiki via $wgEnableScaryTranscluding. * (bug 56912) Show correct link color on cached result of Special:DeadendPages. +* Classes TitleListDependency and TitleDependency have been removed, as they + have been found unused in core and extensions for a long time. === API changes in 1.23 === * (bug 54884) action=parse&prop=categories now indicates hidden and missing diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php index 6afd164e6c..cd634c2766 100644 --- a/includes/AutoLoader.php +++ b/includes/AutoLoader.php @@ -394,8 +394,6 @@ $wgAutoloadLocalClasses = array( 'ObjectFileCache' => 'includes/cache/ObjectFileCache.php', 'ProcessCacheLRU' => 'includes/cache/ProcessCacheLRU.php', 'ResourceFileCache' => 'includes/cache/ResourceFileCache.php', - 'TitleDependency' => 'includes/cache/CacheDependency.php', - 'TitleListDependency' => 'includes/cache/CacheDependency.php', # includes/changes 'ChangesList' => 'includes/changes/ChangesList.php', diff --git a/includes/cache/CacheDependency.php b/includes/cache/CacheDependency.php index 3b98f770c6..b7d0a7cc7d 100644 --- a/includes/cache/CacheDependency.php +++ b/includes/cache/CacheDependency.php @@ -219,183 +219,6 @@ class FileDependency extends CacheDependency { } } -/** - * @ingroup Cache - */ -class TitleDependency extends CacheDependency { - private $titleObj; - private $ns; - private $dbk; - private $touched; - - /** - * Construct a title dependency - * @param $title Title - */ - function __construct( Title $title ) { - $this->titleObj = $title; - $this->ns = $title->getNamespace(); - $this->dbk = $title->getDBkey(); - } - - function loadDependencyValues() { - $this->touched = $this->getTitle()->getTouched(); - } - - /** - * Get rid of bulky Title object for sleep - * - * @return array - */ - function __sleep() { - return array( 'ns', 'dbk', 'touched' ); - } - - /** - * @return Title - */ - function getTitle() { - if ( !isset( $this->titleObj ) ) { - $this->titleObj = Title::makeTitle( $this->ns, $this->dbk ); - } - - return $this->titleObj; - } - - /** - * @return bool - */ - function isExpired() { - $touched = $this->getTitle()->getTouched(); - - if ( $this->touched === false ) { - if ( $touched === false ) { - # Still missing - return false; - } else { - # Created - return true; - } - } elseif ( $touched === false ) { - # Deleted - return true; - } elseif ( $touched > $this->touched ) { - # Updated - return true; - } else { - # Unmodified - return false; - } - } -} - -/** - * @ingroup Cache - */ -class TitleListDependency extends CacheDependency { - private $linkBatch; - private $timestamps; - - /** - * Construct a dependency on a list of titles - * @param $linkBatch LinkBatch - */ - function __construct( LinkBatch $linkBatch ) { - $this->linkBatch = $linkBatch; - } - - /** - * @return array - */ - function calculateTimestamps() { - # Initialise values to false - $timestamps = array(); - - foreach ( $this->getLinkBatch()->data as $ns => $dbks ) { - if ( count( $dbks ) > 0 ) { - $timestamps[$ns] = array(); - - foreach ( $dbks as $dbk => $value ) { - $timestamps[$ns][$dbk] = false; - } - } - } - - # Do the query - if ( count( $timestamps ) ) { - $dbr = wfGetDB( DB_SLAVE ); - $where = $this->getLinkBatch()->constructSet( 'page', $dbr ); - $res = $dbr->select( - 'page', - array( 'page_namespace', 'page_title', 'page_touched' ), - $where, - __METHOD__ - ); - - foreach ( $res as $row ) { - $timestamps[$row->page_namespace][$row->page_title] = $row->page_touched; - } - } - - return $timestamps; - } - - function loadDependencyValues() { - $this->timestamps = $this->calculateTimestamps(); - } - - /** - * @return array - */ - function __sleep() { - return array( 'timestamps' ); - } - - /** - * @return LinkBatch - */ - function getLinkBatch() { - if ( !isset( $this->linkBatch ) ) { - $this->linkBatch = new LinkBatch; - $this->linkBatch->setArray( $this->timestamps ); - } - - return $this->linkBatch; - } - - /** - * @return bool - */ - function isExpired() { - $newTimestamps = $this->calculateTimestamps(); - - foreach ( $this->timestamps as $ns => $dbks ) { - foreach ( $dbks as $dbk => $oldTimestamp ) { - $newTimestamp = $newTimestamps[$ns][$dbk]; - - if ( $oldTimestamp === false ) { - if ( $newTimestamp === false ) { - # Still missing - } else { - # Created - return true; - } - } elseif ( $newTimestamp === false ) { - # Deleted - return true; - } elseif ( $newTimestamp > $oldTimestamp ) { - # Updated - return true; - } else { - # Unmodified - } - } - } - - return false; - } -} - /** * @ingroup Cache */ -- 2.20.1