]> git.mxchange.org Git - quix0rs-gnu-social.git/blobdiff - classes/Memcached_DataObject.php
Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x
[quix0rs-gnu-social.git] / classes / Memcached_DataObject.php
index 9cedcc6ff604c891a1d5628ac5eaacc3ebd7bcb5..b857ae64b9fdfe79a6a9fdd5417b946963024229 100644 (file)
@@ -105,114 +105,246 @@ class Memcached_DataObject extends Safe_DataObject
      */
     static function pivotGet($cls, $keyCol, $keyVals, $otherCols = array())
     {
-        $result = array_fill_keys($keyVals, null);
-
-        $toFetch = array();
-
-        foreach ($keyVals as $keyVal) {
-
-            $kv = array_merge($otherCols, array($keyCol => $keyVal));
-
-            $i = self::multicache($cls, $kv);
-
-            if ($i !== false) {
-                $result[$keyVal] = $i;
-            } else if (!empty($keyVal)) {
-                $toFetch[] = $keyVal;
+        if (is_array($keyCol)) {
+            foreach ($keyVals as $keyVal) {
+                $result[implode(',', $keyVal)] = null;
             }
+        } else {
+            $result = array_fill_keys($keyVals, null);
         }
+       
+       $toFetch = array();
+       
+       foreach ($keyVals as $keyVal) {
 
-        if (count($toFetch) > 0) {
+            if (is_array($keyCol)) {
+                $kv = array_combine($keyCol, $keyVal);
+            } else {
+                $kv = array($keyCol => $keyVal);
+            }
+
+               $kv = array_merge($otherCols, $kv);
+               
+               $i = self::multicache($cls, $kv);
+               
+               if ($i !== false) {
+                if (is_array($keyCol)) {
+                    $result[implode(',', $keyVal)] = $i;
+                } else {
+                    $result[$keyVal] = $i;
+                }
+               } else if (!empty($keyVal)) {
+                       $toFetch[] = $keyVal;
+               }
+       }
+        
+       if (count($toFetch) > 0) {
             $i = DB_DataObject::factory($cls);
             if (empty($i)) {
-                // TRANS: Exception thrown when a class (%s) could not be instantiated.
-                throw new Exception(sprintf(_('Cannot instantiate class %s.'),$cls));
+               throw new Exception(_('Cannot instantiate class ' . $cls));
             }
             foreach ($otherCols as $otherKeyCol => $otherKeyVal) {
                 $i->$otherKeyCol = $otherKeyVal;
             }
-            $i->whereAddIn($keyCol, $toFetch, $i->columnType($keyCol));
-            if ($i->find()) {
-                while ($i->fetch()) {
-                    $copy = clone($i);
-                    $copy->encache();
-                    $result[$i->$keyCol] = $copy;
-                }
+            if (is_array($keyCol)) {
+                $i->whereAdd(self::_inMultiKey($i, $keyCol, $toFetch));
+            } else {
+                $i->whereAddIn($keyCol, $toFetch, $i->columnType($keyCol));
             }
+               if ($i->find()) {
+                       while ($i->fetch()) {
+                               $copy = clone($i);
+                               $copy->encache();
+                    if (is_array($keyCol)) {
+                        $vals = array();
+                        foreach ($keyCol as $k) {
+                            $vals[] = $i->$k;
+                        }
+                        $result[implode(',', $vals)] = $copy;
+                    } else {
+                        $result[$i->$keyCol] = $copy;
+                    }
+                       }
+               }
+               
+               // Save state of DB misses
+               
+               foreach ($toFetch as $keyVal) {
+                $r = null;
+                if (is_array($keyCol)) {
+                    $r = $result[implode(',', $keyVal)];
+                } else {
+                    $r = $result[$keyVal];
+                }
+                       if (empty($r)) {
+                    if (is_array($keyCol)) {
+                        $kv = array_combine($keyCol, $keyVal);
+                    } else {
+                        $kv = array($keyCol => $keyVal);
+                    }
+                    $kv = array_merge($otherCols, $kv);
+                       // save the fact that no such row exists
+                       $c = self::memcache();
+                       if (!empty($c)) {
+                       $ck = self::multicacheKey($cls, $kv);
+                       $c->set($ck, null);
+                       }       
+                       }
+               }
+       }
+
+       return $result;
+    }
 
-            // Save state of DB misses
+    static function _inMultiKey($i, $cols, $values)
+    {
+        $types = array();
 
-            foreach ($toFetch as $keyVal) {
-                if (empty($result[$keyVal])) {
-                    $kv = array_merge($otherCols, array($keyCol => $keyVal));
-                    // save the fact that no such row exists
-                    $c = self::memcache();
-                    if (!empty($c)) {
-                        $ck = self::multicacheKey($cls, $kv);
-                        $c->set($ck, null);
-                    }
+        foreach ($cols as $col) {
+            $types[$col] = $i->columnType($col);
+        }
+
+        $first = true;
+
+        $query = '';
+
+        foreach ($values as $value) {
+            if ($first) {
+                $query .= '( ';
+                $first = false;
+            } else {
+                $query .= ' OR ';
+            }
+            $query .= '( ';
+            $i = 0;
+            $firstc = true;
+            foreach ($cols as $col) {
+                if (!$firstc) {
+                    $query .= ' AND ';
+                } else {
+                    $firstc = false;
+                }
+                switch ($types[$col]) {
+                case 'string':
+                case 'datetime':
+                    $query .= sprintf("%s = %s", $col, $i->_quote($value[$i]));
+                    break;
+                default:
+                    $query .= sprintf("%s = %s", $col, $value[$i]);
+                    break;
                 }
             }
+            $query .= ') ';
         }
 
-        return $result;
+        if (!$first) {
+            $query .= ' )';
+        }
+
+        return $query;
+    }
+
+    static function pkeyCols($cls)
+    {
+        $i = DB_DataObject::factory($cls);
+        if (empty($i)) {
+            throw new Exception(_('Cannot instantiate a ' . $cls));
+        }
+        $types = $i->keyTypes();
+        ksort($types);
+
+        $pkey = array();
+
+        foreach ($types as $key => $type) {
+            if ($type == 'K' || $type == 'N') {
+                $pkey[] = $key;
+            }
+        }
+
+        return $pkey;
     }
 
     function listGet($cls, $keyCol, $keyVals)
     {
+       $pkeyMap = array_fill_keys($keyVals, array());
         $result = array_fill_keys($keyVals, array());
 
-        $toFetch = array();
+        $pkeyCols = self::pkeyCols($cls);
 
-        foreach ($keyVals as $keyVal) {
-            $l = self::cacheGet(sprintf("%s:list:%s:%s", $cls, $keyCol, $keyVal));
-            if ($l !== false) {
-                $result[$keyVal] = $l;
-            } else {
-                $toFetch[] = $keyVal;
+       $toFetch = array();
+        $allPkeys = array();
+
+        // We only cache keys -- not objects!
+
+       foreach ($keyVals as $keyVal) {
+           $l = self::cacheGet(sprintf("%s:list-ids:%s:%s", $cls, $keyCol, $keyVal));
+           if ($l !== false) {
+               $pkeyMap[$keyVal] = $l;
+                foreach ($l as $pkey) {
+                    $allPkeys[] = $pkey;
+                }
+           } else {
+               $toFetch[] = $keyVal;
+           }
+       }
+
+        if (count($allPkeys) > 0) {
+            $keyResults = self::pivotGet($cls, $pkeyCols, $allPkeys);
+
+            foreach ($pkeyMap as $keyVal => $pkeyList) {
+                foreach ($pkeyList as $pkeyVal) {
+                    $i = $keyResults[implode(',',$pkeyVal)];
+                    if (!empty($i)) {
+                        $result[$keyVal][] = $i;
+                    }
+                }
             }
         }
 
         if (count($toFetch) > 0) {
-            $i = DB_DataObject::factory($cls);
-            if (empty($i)) {
-                // TRANS: Exception thrown when a class (%s) could not be instantiated.
-                throw new Exception(sprintf(_('Cannot instantiate class %s.'),$cls));
-            }
+               $i = DB_DataObject::factory($cls);
+               if (empty($i)) {
+                       throw new Exception(_('Cannot instantiate class ' . $cls));
+               }
             $i->whereAddIn($keyCol, $toFetch, $i->columnType($keyCol));
             if ($i->find()) {
+                sprintf("listGet() got {$i->N} results for class $cls key $keyCol");
                 while ($i->fetch()) {
                     $copy = clone($i);
                     $copy->encache();
                     $result[$i->$keyCol][] = $copy;
+                    $pkeyVal = array();
+                    foreach ($pkeyCols as $pkeyCol) {
+                        $pkeyVal[] = $i->$pkeyCol;
+                    }
+                    $pkeyMap[$i->$keyCol][] = $pkeyVal;
                 }
-            }
-            foreach ($toFetch as $keyVal)
-            {
-                self::cacheSet(sprintf("%s:list:%s:%s", $cls, $keyCol, $keyVal),
-                               $result[$keyVal]);
-            }
-        }
-
-        return $result;
-    }
-
-    function columnType($columnName)
-    {
-        $keys = $this->table();
-        if (!array_key_exists($columnName, $keys)) {
-            throw new Exception('Unknown key column ' . $columnName . ' in ' . join(',', array_keys($keys)));
-        }
-
-        $def = $keys[$columnName];
-
-        if ($def & DB_DATAOBJECT_INT) {
-            return 'integer';
-        } else {
-            return 'string';
-        }
-    }
-
+            }       
+               foreach ($toFetch as $keyVal) {
+                self::cacheSet(sprintf("%s:list-ids:%s:%s", $cls, $keyCol, $keyVal),
+                               $pkeyMap[$keyVal]);
+            }      
+        }
+
+       return $result;        
+    }
+
+       function columnType($columnName)
+       {
+               $keys = $this->table();
+               if (!array_key_exists($columnName, $keys)) {
+                       throw new Exception('Unknown key column ' . $columnName . ' in ' . join(',', array_keys($keys)));
+               }
+               
+               $def = $keys[$columnName];
+               
+               if ($def & DB_DATAOBJECT_INT) {
+                       return 'integer';
+               } else {
+                       return 'string';
+               }
+       }
+       
     /**
      * @todo FIXME: Should this return false on lookup fail to match staticGet?
      */