Renamed new BagOStuff getBatch() function to getMulti() for consistency.

Change-Id: Icfe673919f65192565aa114c165c90d97d33785a

diff --git a/includes/filerepo/backend/FileBackendStore.php b/includes/filerepo/backend/FileBackendStore.php
index 1a7bd06..5f49b01 100644 (file)
--- a/includes/filerepo/backend/FileBackendStore.php
+++ b/includes/filerepo/backend/FileBackendStore.php
@@ -1327,7 +1327,7 @@ abstract class FileBackendStore extends FileBackend {
 
                $contInfo = array(); // (resolved container name => cache value)
                // Get all cache entries for these container cache keys...
-               $values = $this->memCache->getBatch( array_keys( $contNames ) );
+               $values = $this->memCache->getMulti( array_keys( $contNames ) );
                foreach ( $values as $cacheKey => $val ) {
                        $contInfo[$contNames[$cacheKey]] = $val;
                }
@@ -1412,7 +1412,7 @@ abstract class FileBackendStore extends FileBackend {
                        }
                }
                // Get all cache entries for these container cache keys...
-               $values = $this->memCache->getBatch( array_keys( $pathNames ) );
+               $values = $this->memCache->getMulti( array_keys( $pathNames ) );
                foreach ( $values as $cacheKey => $val ) {
                        if ( is_array( $val ) ) {
                                $this->trimCache(); // limit memory

diff --git a/includes/objectcache/BagOStuff.php b/includes/objectcache/BagOStuff.php
index 4b06256..2b26640 100644 (file)
--- a/includes/objectcache/BagOStuff.php
+++ b/includes/objectcache/BagOStuff.php
@@ -66,7 +66,7 @@ abstract class BagOStuff {
         * @param $keys Array List of strings
         * @return Array
         */
-       public function getBatch( array $keys ) {
+       public function getMulti( array $keys ) {
                $res = array();
                foreach ( $keys as $key ) {
                        $res[$key] = $this->get( $key );

diff --git a/includes/objectcache/MemcachedPeclBagOStuff.php b/includes/objectcache/MemcachedPeclBagOStuff.php
index 2f88407..c3ba9ea 100644 (file)
--- a/includes/objectcache/MemcachedPeclBagOStuff.php
+++ b/includes/objectcache/MemcachedPeclBagOStuff.php
@@ -192,8 +192,8 @@ class MemcachedPeclBagOStuff extends MemcachedBagOStuff {
         * @param $keys Array
         * @return Array
         */
-       public function getBatch( array $keys ) {
-               $this->debugLog( 'getBatch(' . implode( ', ', $keys ) . ')' );
+       public function getMulti( array $keys ) {
+               $this->debugLog( 'getMulti(' . implode( ', ', $keys ) . ')' );
                $callback = array( $this, 'encodeKey' );
                $result = $this->client->getMulti( array_map( $callback, $keys ) );
                return $this->checkResult( false, $result );

diff --git a/includes/objectcache/MemcachedPhpBagOStuff.php b/includes/objectcache/MemcachedPhpBagOStuff.php
index eefbb17..c562134 100644 (file)
--- a/includes/objectcache/MemcachedPhpBagOStuff.php
+++ b/includes/objectcache/MemcachedPhpBagOStuff.php
@@ -60,7 +60,7 @@ class MemcachedPhpBagOStuff extends MemcachedBagOStuff {
         * @param $keys Array
         * @return Array
         */
-       public function getBatch( array $keys ) {
+       public function getMulti( array $keys ) {
                $callback = array( $this, 'encodeKey' );
                return $this->client->get_multi( array_map( $callback, $keys ) );
        }

diff --git a/includes/objectcache/SqlBagOStuff.php b/includes/objectcache/SqlBagOStuff.php
index 54a67e0..e504887 100644 (file)
--- a/includes/objectcache/SqlBagOStuff.php
+++ b/includes/objectcache/SqlBagOStuff.php
@@ -139,11 +139,11 @@ class SqlBagOStuff extends BagOStuff {
        }
 
        public function get( $key ) {
-               $values = $this->getBatch( array( $key ) );
+               $values = $this->getMulti( array( $key ) );
                return $values[$key];
        }
 
-       public function getBatch( array $keys ) {
+       public function getMulti( array $keys ) {
                $values = array(); // array of (key => value)
 
                $keysByTableName = array();