New Managed_DataObject retrieval: listFind

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

diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php
index 262f83b83ccfb99b137d33099c21d135ff073b61..7689ea979bd14976da7efa8e49902442901c399c 100644 (file)
--- a/classes/Memcached_DataObject.php
+++ b/classes/Memcached_DataObject.php
@@ -74,7 +74,7 @@ class Memcached_DataObject extends Safe_DataObject
      *
      * @return array Array of objects, in order
      */
-    function multiGet($cls, $keyCol, $keyVals, $skipNulls=true)
+    static function multiGetClass($cls, $keyCol, array $keyVals, $skipNulls=true)
     {
         $result = self::pivotGetClass($cls, $keyCol, $keyVals);
 
@@ -264,7 +264,23 @@ class Memcached_DataObject extends Safe_DataObject
         return $pkey;
     }
 
-    static function listGetClass($cls, $keyCol, $keyVals)
+    static function listFindClass($cls, $keyCol, array $keyVals)
+    {
+        if (!is_a($cls, __CLASS__, true)) {
+            throw new Exception('Trying to fetch ' . __CLASS__ . ' into a non-related class');
+        }
+
+        $i = new $cls;
+        $i->whereAddIn($keyCol, $keyVals, $i->columnType($keyCol));
+        if (!$i->find()) {
+            throw new NoResultException($i);
+        }
+
+        sprintf(__CLASS__ . "() got {$i->N} results for class $cls key $keyCol");
+        return $i;
+    }
+
+    static function listGetClass($cls, $keyCol, array $keyVals)
     {
         if (!is_a($cls, __CLASS__, true)) {
             throw new Exception('Trying to fetch ' . __CLASS__ . ' into a non-related class');
@@ -305,10 +321,9 @@ class Memcached_DataObject extends Safe_DataObject
         }
 
         if (count($toFetch) > 0) {
-            $i = new $cls;
-            $i->whereAddIn($keyCol, $toFetch, $i->columnType($keyCol));
-            if ($i->find()) {
-                sprintf(__CLASS__ . "() got {$i->N} results for class $cls key $keyCol");
+            try {
+                $i = self::listFindClass($cls, $keyCol, $toFetch);
+
                 while ($i->fetch()) {
                     $copy = clone($i);
                     $copy->encache();
@@ -319,6 +334,8 @@ class Memcached_DataObject extends Safe_DataObject
                     }
                     $pkeyMap[$i->$keyCol][] = $pkeyVal;
                 }
+            } catch (NoResultException $e) {
+                // no results foudn for our keyVals, so we leave them as empty arrays
             }
             foreach ($toFetch as $keyVal) {
                 self::cacheSet(sprintf("%s:list-ids:%s:%s", strtolower($cls), $keyCol, $keyVal),
@@ -348,7 +365,7 @@ class Memcached_DataObject extends Safe_DataObject
     /**
      * @todo FIXME: Should this return false on lookup fail to match getKV?
      */
-    static function pkeyGetClass($cls, $kv)
+    static function pkeyGetClass($cls, array $kv)
     {
         if (!is_a($cls, __CLASS__, true)) {
             throw new Exception('Trying to fetch ' . __CLASS__ . ' into a non-related class');