From 370e83bb0dfd0c70de268c93bf07ad5ee0897192 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Fri, 15 Aug 2008 01:29:47 +0200 Subject: Update auf 1.13.0 --- includes/LinkCache.php | 121 ++++++++++++++++++++++++++++--------------------- 1 file changed, 69 insertions(+), 52 deletions(-) (limited to 'includes/LinkCache.php') diff --git a/includes/LinkCache.php b/includes/LinkCache.php index 7c49d88e..79727615 100644 --- a/includes/LinkCache.php +++ b/includes/LinkCache.php @@ -1,13 +1,13 @@ mForUpdate = false; $this->mPageLinks = array(); $this->mGoodLinks = array(); + $this->mGoodLinkFields = array(); $this->mBadLinks = array(); } - /* private */ function getKey( $title ) { - return wfMemcKey( 'lc', 'title', $title ); - } - /** * General accessor to get/set whether SELECT FOR UPDATE should be used */ - function forUpdate( $update = NULL ) { + public function forUpdate( $update = NULL ) { return wfSetVar( $this->mForUpdate, $update ); } - function getGoodLinkID( $title ) { + public function getGoodLinkID( $title ) { if ( array_key_exists( $title, $this->mGoodLinks ) ) { return $this->mGoodLinks[$title]; } else { @@ -50,17 +47,41 @@ class LinkCache { } } - function isBadLink( $title ) { + /** + * Get a field of a title object from cache. + * If this link is not good, it will return NULL. + * @param Title $title + * @param string $field ('length','redirect') + * @return mixed + */ + public function getGoodLinkFieldObj( $title, $field ) { + $dbkey = $title->getPrefixedDbKey(); + if ( array_key_exists( $dbkey, $this->mGoodLinkFields ) ) { + return $this->mGoodLinkFields[$dbkey][$field]; + } else { + return NULL; + } + } + + public function isBadLink( $title ) { return array_key_exists( $title, $this->mBadLinks ); } - function addGoodLinkObj( $id, $title ) { + /** + * Add a link for the title to the link cache + * @param int $id + * @param Title $title + * @param int $len + * @param int $redir + */ + public function addGoodLinkObj( $id, $title, $len = -1, $redir = NULL ) { $dbkey = $title->getPrefixedDbKey(); $this->mGoodLinks[$dbkey] = $id; + $this->mGoodLinkFields[$dbkey] = array( 'length' => $len, 'redirect' => $redir ); $this->mPageLinks[$dbkey] = $title; } - function addBadLinkObj( $title ) { + public function addBadLinkObj( $title ) { $dbkey = $title->getPrefixedDbKey(); if ( ! $this->isBadLink( $dbkey ) ) { $this->mBadLinks[$dbkey] = 1; @@ -68,30 +89,28 @@ class LinkCache { } } - function clearBadLink( $title ) { + public function clearBadLink( $title ) { unset( $this->mBadLinks[$title] ); - $this->clearLink( $title ); } - function clearLink( $title ) { - global $wgMemc, $wgLinkCacheMemcached; - if( $wgLinkCacheMemcached ) - $wgMemc->delete( $this->getKey( $title ) ); - } + /* obsolete, for old $wgLinkCacheMemcached stuff */ + public function clearLink( $title ) {} - function getPageLinks() { return $this->mPageLinks; } - function getGoodLinks() { return $this->mGoodLinks; } - function getBadLinks() { return array_keys( $this->mBadLinks ); } + public function getPageLinks() { return $this->mPageLinks; } + public function getGoodLinks() { return $this->mGoodLinks; } + public function getBadLinks() { return array_keys( $this->mBadLinks ); } /** * Add a title to the link cache, return the page_id or zero if non-existent * @param $title String: title to add + * @param $len int, page size + * @param $redir bool, is redirect? * @return integer */ - function addLink( $title ) { + public function addLink( $title, $len = -1, $redir = NULL ) { $nt = Title::newFromDBkey( $title ); if( $nt ) { - return $this->addLinkObj( $nt ); + return $this->addLinkObj( $nt, $len, $redir ); } else { return 0; } @@ -100,18 +119,20 @@ class LinkCache { /** * Add a title to the link cache, return the page_id or zero if non-existent * @param $nt Title to add. + * @param $len int, page size + * @param $redir bool, is redirect? * @return integer */ - function addLinkObj( &$nt ) { - global $wgMemc, $wgLinkCacheMemcached, $wgAntiLockFlags; + public function addLinkObj( &$nt, $len = -1, $redirect = NULL ) { + global $wgAntiLockFlags, $wgProfiler; + $title = $nt->getPrefixedDBkey(); if ( $this->isBadLink( $title ) ) { return 0; } $id = $this->getGoodLinkID( $title ); if ( 0 != $id ) { return $id; } $fname = 'LinkCache::addLinkObj'; - global $wgProfiling, $wgProfiler; - if ( $wgProfiling && isset( $wgProfiler ) ) { + if ( isset( $wgProfiler ) ) { $fname .= ' (' . $wgProfiler->getCurrentSection() . ')'; } @@ -125,36 +146,32 @@ class LinkCache { return 0; } - $id = NULL; - if( $wgLinkCacheMemcached ) - $id = $wgMemc->get( $key = $this->getKey( $title ) ); - if( ! is_integer( $id ) ) { - if ( $this->mForUpdate ) { - $db = wfGetDB( DB_MASTER ); - if ( !( $wgAntiLockFlags & ALF_NO_LINK_LOCK ) ) { - $options = array( 'FOR UPDATE' ); - } else { - $options = array(); - } + # Some fields heavily used for linking... + if ( $this->mForUpdate ) { + $db = wfGetDB( DB_MASTER ); + if ( !( $wgAntiLockFlags & ALF_NO_LINK_LOCK ) ) { + $options = array( 'FOR UPDATE' ); } else { - $db = wfGetDB( DB_SLAVE ); $options = array(); } - - $id = $db->selectField( 'page', 'page_id', - array( 'page_namespace' => $ns, 'page_title' => $t ), - $fname, $options ); - if ( !$id ) { - $id = 0; - } - if( $wgLinkCacheMemcached ) - $wgMemc->add( $key, $id, 3600*24 ); + } else { + $db = wfGetDB( DB_SLAVE ); + $options = array(); } + $s = $db->selectRow( 'page', + array( 'page_id', 'page_len', 'page_is_redirect' ), + array( 'page_namespace' => $ns, 'page_title' => $t ), + $fname, $options ); + # Set fields... + $id = $s ? $s->page_id : 0; + $len = $s ? $s->page_len : -1; + $redirect = $s ? $s->page_is_redirect : 0; + if( 0 == $id ) { $this->addBadLinkObj( $nt ); } else { - $this->addGoodLinkObj( $id, $nt ); + $this->addGoodLinkObj( $id, $nt, $len, $redirect ); } wfProfileOut( $fname ); return $id; @@ -163,10 +180,10 @@ class LinkCache { /** * Clears cache */ - function clear() { + public function clear() { $this->mPageLinks = array(); $this->mGoodLinks = array(); + $this->mGoodLinkFields = array(); $this->mBadLinks = array(); } } - -- cgit v1.2.2