Merge branch 'testing' into 1.0.x

[quix0rs-gnu-social.git] / classes / Memcached_DataObject.php

diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php
index f1336e582fc528f987f50cc500b0d0e943b65187..0eae9fb42a835e79087a0845f2449f85afd52e28 100644 (file)
--- a/classes/Memcached_DataObject.php
+++ b/classes/Memcached_DataObject.php
@@ -64,7 +64,17 @@ class Memcached_DataObject extends Safe_DataObject
         return $i;
     }
     
-    function multiGet($cls, $keyCol, $keyVals)
+    /**
+     * Get multiple items from the database by key
+     * 
+     * @param string  $cls       Class to fetch
+     * @param string  $keyCol    name of column for key
+     * @param array   $keyVals   key values to fetch
+     * @param boolean $skipNulls return only non-null results?
+     * 
+     * @return array Array of objects, in order
+     */
+    function multiGet($cls, $keyCol, $keyVals, $skipNulls=true)
     {
        $result = array_fill_keys($keyVals, null);
        
@@ -92,9 +102,34 @@ class Memcached_DataObject extends Safe_DataObject
                                $result[$i->$keyCol] = $copy;
                        }
                }
+               
+               // Save state of DB misses
+               
+               foreach ($toFetch as $keyVal) {
+                       if (empty($result[$keyVal])) {
+                       // save the fact that no such row exists
+                       $c = self::memcache();
+                       if (!empty($c)) {
+                       $ck = self::cachekey($cls, $keyCol, $keyVal);
+                       $c->set($ck, null);
+                       }       
+                       }
+               }
+       }
+       
+       $values = array_values($result);
+       
+       if ($skipNulls) {
+               $tmp = array();
+               foreach ($values as $value) {
+                       if (!empty($value)) {
+                               $tmp[] = $value;
+                       }
+               }
+               $values = $tmp;
        }
        
-       return new ArrayWrapper(array_values($result));
+       return new ArrayWrapper($values);
     }
 
        function columnType($columnName)