make ORMRow compatible with load balancer, replace usage of wfGetDB( DB_MASTER )

[lhc/web/wiklou.git] / includes / BacklinkCache.php

diff --git a/includes/BacklinkCache.php b/includes/BacklinkCache.php
index 824c38a..ba8691b 100644 (file)
--- a/includes/BacklinkCache.php
+++ b/includes/BacklinkCache.php
@@ -91,14 +91,16 @@ class BacklinkCache {
        }
 
        /**
-        * Create a new BacklinkCache or reuse any existing one
+        * Create a new BacklinkCache or reuse any existing one.
+        * Currently, only one cache instance can exist; callers that
+        * need multiple backlink cache objects should keep them in scope.
         *
         * @param Title $title : Title object to get a backlink cache for
         * @return BacklinkCache
         */
        public static function get( Title $title ) {
                if ( !self::$cache ) { // init cache
-                       self::$cache = new ProcessCacheLRU( 2 );
+                       self::$cache = new ProcessCacheLRU( 1 );
                }
                $dbKey = $title->getPrefixedDBkey();
                if ( !self::$cache->has( $dbKey, 'obj' ) ) {
@@ -215,6 +217,7 @@ class BacklinkCache {
        /**
         * Get the field name prefix for a given table
         * @param $table String
+        * @throws MWException
         * @return null|string
         */
        protected function getPrefix( $table ) {
@@ -243,6 +246,7 @@ class BacklinkCache {
         * Get the SQL condition array for selecting backlinks, with a join
         * on the page table.
         * @param $table String
+        * @throws MWException
         * @return array|null
         */
        protected function getConditions( $table ) {
@@ -285,8 +289,9 @@ class BacklinkCache {
                        default:
                                $conds = null;
                                wfRunHooks( 'BacklinkCacheGetConditions', array( $table, $this->title, &$conds ) );
-                               if( !$conds )
+                               if( !$conds ) {
                                        throw new MWException( "Invalid table \"$table\" in " . __CLASS__ );
+                               }
                }
 
                return $conds;
@@ -378,6 +383,7 @@ class BacklinkCache {
         * Partition a DB result with backlinks in it into batches
         * @param $res ResultWrapper database result
         * @param $batchSize integer
+        * @throws MWException
         * @return array @see
         */
        protected function partitionResult( $res, $batchSize ) {