X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=classes%2FMemcached_DataObject.php;h=0df9164b40c81217636137dca29f948132c0a7a3;hb=2770ef9718fb29110b6ab43ea6cffffa8cc4c27b;hp=51b1556d77a7144af412e7370c2779bcb1d3c2d9;hpb=ce5b44158e691346739739e8ba465453d7af41ea;p=quix0rs-gnu-social.git

diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php
index 51b1556d77..0df9164b40 100644
--- a/classes/Memcached_DataObject.php
+++ b/classes/Memcached_DataObject.php
@@ -30,24 +30,20 @@ class Memcached_DataObject extends Safe_DataObject
      * @param mixed $v key field value, or leave out for primary key lookup
      * @return mixed Memcached_DataObject subtype or false
      */
-    function &staticGet($cls, $k, $v=null)
+    static function getClassKV($cls, $k, $v=null)
     {
         if (is_null($v)) {
             $v = $k;
             $keys = self::pkeyCols($cls);
             if (count($keys) > 1) {
-            	// FIXME: maybe call pkeyGet() ourselves?
-                throw new Exception('Use pkeyGet() for compound primary keys');
+                // FIXME: maybe call pkeyGetClass() ourselves?
+                throw new Exception('Use pkeyGetClass() for compound primary keys');
             }
             $k = $keys[0];
         }
-        $i = Memcached_DataObject::getcached($cls, $k, $v);
+        $i = self::getcached($cls, $k, $v);
         if ($i === false) { // false == cache miss
-            $i = DB_DataObject::factory($cls);
-            if (empty($i)) {
-                $i = false;
-                return $i;
-            }
+            $i = new $cls;
             $result = $i->get($k, $v);
             if ($result) {
                 // Hit!
@@ -75,9 +71,9 @@ 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::pivotGet($cls, $keyCol, $keyVals);
+        $result = self::pivotGetClass($cls, $keyCol, $keyVals);
 
         $values = array_values($result);
 
@@ -104,7 +100,7 @@ class Memcached_DataObject extends Safe_DataObject
      *
      * @return array Array mapping $keyVals to objects, or null if not found
      */
-    static function pivotGet($cls, $keyCol, $keyVals, $otherCols = array())
+    static function pivotGetClass($cls, $keyCol, array $keyVals, array $otherCols = array())
     {
         if (is_array($keyCol)) {
             foreach ($keyVals as $keyVal) {
@@ -113,10 +109,10 @@ class Memcached_DataObject extends Safe_DataObject
         } else {
             $result = array_fill_keys($keyVals, null);
         }
-    	
-    	$toFetch = array();
-    	
-    	foreach ($keyVals as $keyVal) {
+
+        $toFetch = array();
+
+        foreach ($keyVals as $keyVal) {
 
             if (is_array($keyCol)) {
                 $kv = array_combine($keyCol, $keyVal);
@@ -124,26 +120,23 @@ class Memcached_DataObject extends Safe_DataObject
                 $kv = array($keyCol => $keyVal);
             }
 
-    		$kv = array_merge($otherCols, $kv);
-    		
-        	$i = self::multicache($cls, $kv);
-        	
-        	if ($i !== false) {
+            $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)) {
-            	throw new Exception(_('Cannot instantiate class ' . $cls));
+            } else if (!empty($keyVal)) {
+                $toFetch[] = $keyVal;
             }
+        }
+
+        if (count($toFetch) > 0) {
+            $i = new $cls;
             foreach ($otherCols as $otherKeyCol => $otherKeyVal) {
                 $i->$otherKeyCol = $otherKeyVal;
             }
@@ -152,10 +145,10 @@ class Memcached_DataObject extends Safe_DataObject
             } else {
                 $i->whereAddIn($keyCol, $toFetch, $i->columnType($keyCol));
             }
-    		if ($i->find()) {
-    			while ($i->fetch()) {
-    				$copy = clone($i);
-    				$copy->encache();
+            if ($i->find()) {
+                while ($i->fetch()) {
+                    $copy = clone($i);
+                    $copy->encache();
                     if (is_array($keyCol)) {
                         $vals = array();
                         foreach ($keyCol as $k) {
@@ -165,36 +158,36 @@ class Memcached_DataObject extends Safe_DataObject
                     } else {
                         $result[$i->$keyCol] = $copy;
                     }
-    			}
-    		}
-    		
-    		// Save state of DB misses
-    		
-    		foreach ($toFetch as $keyVal) {
+                }
+            }
+
+            // 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 (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);
-                	}	
-    			}
-    		}
-    	}
+                    // 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;
+        return $result;
     }
 
     static function _inMultiKey($i, $cols, $values)
@@ -247,10 +240,7 @@ class Memcached_DataObject extends Safe_DataObject
 
     static function pkeyCols($cls)
     {
-        $i = DB_DataObject::factory($cls);
-        if (empty($i)) {
-            throw new Exception(_('Cannot instantiate a ' . $cls));
-        }
+        $i = new $cls;
         $types = $i->keyTypes();
         ksort($types);
 
@@ -265,32 +255,43 @@ class Memcached_DataObject extends Safe_DataObject
         return $pkey;
     }
 
-    function listGet($cls, $keyCol, $keyVals)
+    static function listFindClass($cls, $keyCol, array $keyVals)
+    {
+        $i = new $cls;
+        $i->whereAddIn($keyCol, $keyVals, $i->columnType($keyCol));
+        if (!$i->find()) {
+            throw new NoResultException($i);
+        }
+
+        return $i;
+    }
+
+    static function listGetClass($cls, $keyCol, array $keyVals)
     {
-    	$pkeyMap = array_fill_keys($keyVals, array());
+        $pkeyMap = array_fill_keys($keyVals, array());
         $result = array_fill_keys($keyVals, array());
 
         $pkeyCols = self::pkeyCols($cls);
 
-    	$toFetch = array();
+        $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 ($keyVals as $keyVal) {
+            $l = self::cacheGet(sprintf("%s:list-ids:%s:%s", strtolower($cls), $keyCol, $keyVal));
+            if ($l !== false) {
+                $pkeyMap[$keyVal] = $l;
                 foreach ($l as $pkey) {
                     $allPkeys[] = $pkey;
                 }
-    	    } else {
-    	        $toFetch[] = $keyVal;
-    	    }
-    	}
+            } else {
+                $toFetch[] = $keyVal;
+            }
+        }
 
         if (count($allPkeys) > 0) {
-            $keyResults = self::pivotGet($cls, $pkeyCols, $allPkeys);
+            $keyResults = self::pivotGetClass($cls, $pkeyCols, $allPkeys);
 
             foreach ($pkeyMap as $keyVal => $pkeyList) {
                 foreach ($pkeyList as $pkeyVal) {
@@ -303,13 +304,9 @@ class Memcached_DataObject extends Safe_DataObject
         }
 
         if (count($toFetch) > 0) {
-	        $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");
+            try {
+                $i = self::listFindClass($cls, $keyCol, $toFetch);
+
                 while ($i->fetch()) {
                     $copy = clone($i);
                     $copy->encache();
@@ -320,45 +317,44 @@ class Memcached_DataObject extends Safe_DataObject
                     }
                     $pkeyMap[$i->$keyCol][] = $pkeyVal;
                 }
-            }       
-	    	foreach ($toFetch as $keyVal) {
-                self::cacheSet(sprintf("%s:list-ids:%s:%s", $cls, $keyCol, $keyVal),
+            } catch (NoResultException $e) {
+                // no results found 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),
                                $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';
-		}
-	}
-	
+            }
+        }
+
+        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?
+     * @todo FIXME: Should this return false on lookup fail to match getKV?
      */
-    function pkeyGet($cls, $kv)
+    static function pkeyGetClass($cls, array $kv)
     {
         $i = Memcached_DataObject::multicache($cls, $kv);
         if ($i !== false) { // false == cache miss
             return $i;
         } else {
-            $i = DB_DataObject::factory($cls);
-            if (empty($i) || PEAR::isError($i)) {
-                return false;
-            }
+            $i = new $cls;
             foreach ($kv as $k => $v) {
                 if (is_null($v)) {
                     // XXX: possible SQL injection...? Don't
@@ -539,7 +535,7 @@ class Memcached_DataObject extends Safe_DataObject
         return $ckeys;
     }
 
-    function multicache($cls, $kv)
+    static function multicache($cls, $kv)
     {
         ksort($kv);
         $c = self::memcache();
@@ -677,8 +673,10 @@ class Memcached_DataObject extends Safe_DataObject
                         'delete',
                         'update',
                         'find');
-        $ignoreStatic = array('staticGet',
+        $ignoreStatic = array('getKV',
+                              'getClassKV',
                               'pkeyGet',
+                              'pkeyGetClass',
                               'cachedQuery');
         $here = get_class($this); // if we get confused
         $bt = debug_backtrace();
@@ -733,12 +731,12 @@ class Memcached_DataObject extends Safe_DataObject
 
     function _connect()
     {
-        global $_DB_DATAOBJECT;
+        global $_DB_DATAOBJECT, $_PEAR;
 
         $sum = $this->_getDbDsnMD5();
 
         if (!empty($_DB_DATAOBJECT['CONNECTIONS'][$sum]) &&
-            !PEAR::isError($_DB_DATAOBJECT['CONNECTIONS'][$sum])) {
+            !$_PEAR->isError($_DB_DATAOBJECT['CONNECTIONS'][$sum])) {
             $exists = true;
         } else {
             $exists = false;