pkeyGet is now static and more similar to getKV

Memcached_DataObject now defines
   * pkeyGetClass to avoid collision with Managed_DataObject pkeyGet
   * getClassKV to avoid collision with Managed_DataObject getKV

classes/Avatar.php

@@ -64,11 +64,6 @@ class Avatar extends Managed_DataObject
         }
     }
 
-    function pkeyGet($kv)
-    {
-        return Memcached_DataObject::pkeyGet('Avatar', $kv);
-    }
-
     /**
      * Where should the avatar go for this user?
      */

classes/Config.php

@@ -133,11 +133,6 @@ class Config extends Managed_DataObject
         return $result;
     }
 
-    function pkeyGet($kv)
-    {
-        return Memcached_DataObject::pkeyGet('Config', $kv);
-    }
-
     static function save($section, $setting, $value)
     {
         $result = null;

classes/Fave.php

@@ -99,11 +99,6 @@ class Fave extends Managed_DataObject
         return $result;
     }
 
-    function pkeyGet($kv)
-    {
-        return Memcached_DataObject::pkeyGet('Fave', $kv);
-    }
-
     function stream($user_id, $offset=0, $limit=NOTICES_PER_PAGE, $own=false, $since_id=0, $max_id=0)
     {
         $stream = new FaveNoticeStream($user_id, $own);

classes/File_to_post.php

@@ -84,11 +84,6 @@ class File_to_post extends Managed_DataObject
         }
     }
 
-    function pkeyGet($kv)
-    {
-        return Memcached_DataObject::pkeyGet('File_to_post', $kv);
-    }
-
     function delete()
     {
         $f = File::getKV('id', $this->file_id);

classes/Group_block.php

@@ -55,11 +55,6 @@ class Group_block extends Managed_DataObject
         );
     }
 
-    function pkeyGet($kv)
-    {
-        return Memcached_DataObject::pkeyGet('Group_block', $kv);
-    }
-
     static function isBlocked($group, $profile)
     {
         $block = Group_block::pkeyGet(array('group_id' => $group->id,

classes/Group_inbox.php

@@ -37,9 +37,4 @@ class Group_inbox extends Managed_DataObject
             ),
         );
     }
-
-    function pkeyGet($kv)
-    {
-        return Memcached_DataObject::pkeyGet('Group_inbox', $kv);
-    }
 }

classes/Group_join_queue.php

@@ -14,10 +14,6 @@ class Group_join_queue extends Managed_DataObject
     public $group_id;
     public $created;
 
-    /* Pkey get */
-    function pkeyGet($k)
-    { return Memcached_DataObject::pkeyGet('Group_join_queue',$k); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 

classes/Group_member.php

@@ -48,11 +48,6 @@ class Group_member extends Managed_DataObject
         );
     }
 
-    function pkeyGet($kv)
-    {
-        return Memcached_DataObject::pkeyGet('Group_member', $kv);
-    }
-
     /**
      * Method to add a user to a group.
      * In most cases, you should call Profile->joinGroup() instead.

classes/Managed_DataObject.php

@@ -41,9 +41,25 @@ abstract class Managed_DataObject extends Memcached_DataObject
      */
     static function getKV($k,$v=NULL)
     {
-        return parent::getKV(get_called_class(),$k,$v);
+        return parent::getClassKV(get_called_class(), $k, $v);
     }
 
+    /**
+     * Get an instance by compound key
+     *
+     * This is a utility method to get a single instance with a given set of
+     * key-value pairs. Usually used for the primary key for a compound key; thus
+     * the name.
+     *
+     * @param array $kv array of key-value mappings
+     *
+     * @return get_called_class() object if found, or null for no hits
+     *
+     */
+    static function pkeyGet($kv)
+    {
+        return parent::pkeyGetClass(get_called_class(), $kv);
+    }
 
     /**
      * get/set an associative array of table columns

classes/Memcached_DataObject.php

@@ -30,14 +30,14 @@ 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
      */
-    static function getKV($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?
+                // FIXME: maybe call pkeyGetClass() ourselves?
-                throw new Exception('Use pkeyGet() for compound primary keys');
+                throw new Exception('Use pkeyGetClass() for compound primary keys');
             }
             $k = $keys[0];
         }
@@ -352,7 +352,7 @@ class Memcached_DataObject extends Safe_DataObject
     /**
      * @todo FIXME: Should this return false on lookup fail to match getKV?
      */
-    function pkeyGet($cls, $kv)
+    static function pkeyGetClass($cls, $kv)
     {
         $i = Memcached_DataObject::multicache($cls, $kv);
         if ($i !== false) { // false == cache miss
@@ -681,7 +681,9 @@ class Memcached_DataObject extends Safe_DataObject
                         'update',
                         'find');
         $ignoreStatic = array('getKV',
+                              'getClassKV',
                               'pkeyGet',
+                              'pkeyGetClass',
                               'cachedQuery');
         $here = get_class($this); // if we get confused
         $bt = debug_backtrace();

classes/Notice_inbox.php

@@ -76,11 +76,6 @@ class Notice_inbox extends Managed_DataObject
         throw new Exception('Notice_inbox no longer used; use Inbox');
     }
 
-    function &pkeyGet($kv)
-    {
-        return Memcached_DataObject::pkeyGet('Notice_inbox', $kv);
-    }
-
     static function gc($user_id)
     {
         throw new Exception('Notice_inbox no longer used; use Inbox');

classes/Notice_tag.php

@@ -68,11 +68,6 @@ class Notice_tag extends Managed_DataObject
         }
     }
 
-    function pkeyGet($kv)
-    {
-        return Memcached_DataObject::pkeyGet('Notice_tag', $kv);
-    }
-
 	static function url($tag)
 	{
 		if (common_config('singleuser', 'enabled')) {

classes/Profile.php

@@ -1242,9 +1242,8 @@ class Profile extends Managed_DataObject
     {
         // XXX: not really a pkey, but should work
 
-        $notice = Memcached_DataObject::pkeyGet('Notice',
+        $notice = Notice::pkeyGet(array('profile_id' => $this->id,
-                                                array('profile_id' => $this->id,
+                                        'repeat_of' => $notice_id));
-                                                      'repeat_of' => $notice_id));
 
         return !empty($notice);
     }

classes/Profile_block.php

@@ -56,8 +56,7 @@ class Profile_block extends Managed_DataObject
 
     function get($blocker, $blocked)
     {
-        return Memcached_DataObject::pkeyGet('Profile_block',
+        return Profile_block::pkeyGet(array('blocker' => $blocker,
-                                             array('blocker' => $blocker,
+                                            'blocked' => $blocked));
-                                                   'blocked' => $blocked));
      }
 }

classes/Profile_list.php

@@ -86,19 +86,6 @@ class Profile_list extends Managed_DataObject
         );
     }
 
-    /**
-     * return a profile_list record, given its tag and tagger.
-     *
-     * @param array $kv ideally array('tag' => $tag, 'tagger' => $tagger)
-     *
-     * @return Profile_list a Profile_list object with the given tag and tagger.
-     */
-
-    function pkeyGet($kv)
-    {
-        return Memcached_DataObject::pkeyGet('Profile_list', $kv);
-    }
-
     /**
      * get the tagger of this profile_list object
      *

classes/Profile_role.php

@@ -56,11 +56,6 @@ class Profile_role extends Managed_DataObject
         );
     }
 
-    function pkeyGet($kv)
-    {
-        return Memcached_DataObject::pkeyGet('Profile_role', $kv);
-    }
-
     const OWNER         = 'owner';
     const MODERATOR     = 'moderator';
     const ADMINISTRATOR = 'administrator';

classes/Profile_tag.php

@@ -42,10 +42,6 @@ class Profile_tag extends Managed_DataObject
         );
     }
 
-    function pkeyGet($kv) {
-        return Memcached_DataObject::pkeyGet('Profile_tag', $kv);
-    }
-
     function links()
     {
         return array('tagger,tag' => 'profile_list:tagger,tag');

classes/Profile_tag_subscription.php

@@ -41,11 +41,6 @@ class Profile_tag_subscription extends Managed_DataObject
         );
     }
 
-    function pkeyGet($kv)
-    {
-        return Memcached_DataObject::pkeyGet('Profile_tag_subscription', $kv);
-    }
-
     static function add($peopletag, $profile)
     {
         if ($peopletag->private) {

classes/Reply.php

@@ -41,11 +41,6 @@ class Reply extends Managed_DataObject
         );
     }    
 	
-	function pkeyGet($kv)
-	{
-		return Memcached_DataObject::pkeyGet('Reply',$kv);   
-	}
-	
     /**
      * Wrapper for record insertion to update related caches
      */

classes/Status_network_tag.php

@@ -60,9 +60,9 @@ class Status_network_tag extends Safe_DataObject
         return $i;
     }
 
-    function pkeyGet($kv)
+    static function pkeyGet($kv)
     {
-        return Memcached_DataObject::pkeyGet('Status_network_tag', $kv);
+        return Memcached_DataObject::pkeyGetClass('Status_network_tag', $kv);
     }
 
     /**

classes/Subscription.php

@@ -69,14 +69,6 @@ class Subscription extends Managed_DataObject
         );
     }
 
-    /* the code above is auto generated do not remove the tag below */
-    ###END_AUTOCODE
-
-    function pkeyGet($kv)
-    {
-        return Memcached_DataObject::pkeyGet('Subscription', $kv);
-    }
-
     /**
      * Make a new subscription
      *

classes/Subscription_queue.php

@@ -14,10 +14,6 @@ class Subscription_queue extends Managed_DataObject
     public $subscribed;
     public $created;
 
-    /* Pkey get */
-    function pkeyGet($k)
-    { return Memcached_DataObject::pkeyGet('Subscription_queue',$k); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 

classes/User_im_prefs.php

@@ -45,11 +45,6 @@ class User_im_prefs extends Managed_DataObject
     public $created;                         // datetime   not_null default_0000-00-00%2000%3A00%3A00
     public $modified;                        // timestamp   not_null default_CURRENT_TIMESTAMP
 
-    function pkeyGet($kv)
-    {
-        return Memcached_DataObject::pkeyGet('User_im_prefs', $kv);
-    }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 

plugins/AnonymousFave/Fave_tally.php

@@ -118,18 +118,6 @@ class Fave_tally extends Managed_DataObject
         return array(false, false, false);
     }
 
-    /**
-     * Get a single object with multiple keys
-     *
-     * @param array $kv Map of key-value pairs
-     *
-     * @return User_flag_profile found object or null
-     */
-    function pkeyGet($kv)
-    {
-        return Memcached_DataObject::pkeyGet('Fave_tally', $kv);
-    }
-
     /**
      * Increment a notice's tally
      *

plugins/Event/RSVP.php

@@ -56,19 +56,6 @@ class RSVP extends Managed_DataObject
     public $response;            // tinyint
     public $created;           // datetime
 
-    /**
-     * Get an instance by compound key
-     *
-     * @param array $kv array of key-value mappings
-     *
-     * @return Bookmark object found, or null for no hits
-     */
-
-    function pkeyGet($kv)
-    {
-        return Memcached_DataObject::pkeyGet('RSVP', $kv);
-    }
-
     /**
      * Add the compound profile_id/event_id index to our cache keys
      * since the DB_DataObject stuff doesn't understand compound keys

plugins/ExtendedProfile/classes/Profile_detail.php

@@ -69,23 +69,6 @@ class Profile_detail extends Managed_DataObject
     public $created;
     public $modified;
 
-    /**
-     * Get an instance by compound key
-     *
-     * This is a utility method to get a single instance with a given set of
-     * key-value pairs. Usually used for the primary key for a compound key; thus
-     * the name.
-     *
-     * @param array $kv array of key-value mappings
-     *
-     * @return Bookmark object found, or null for no hits
-     *
-     */
-    function pkeyGet($kv)
-    {
-        return Memcached_DataObject::pkeyGet('Profile_detail', $kv);
-    }
-
     static function schemaDef()
     {
         return array(

plugins/ModLog/ModLog.php

@@ -55,19 +55,6 @@ class ModLog extends Managed_DataObject
     public $grant;        // 1 = grant, 0 = revoke
     public $created;      // datetime
 
-    /**
-     * Get an instance by compound key
-     *
-     * @param array $kv array of key-value mappings
-     *
-     * @return TagSub object found, or null for no hits
-     *
-     */
-    function pkeyGet($kv)
-    {
-        return Managed_DataObject::pkeyGet('ModLog', $kv);
-    }
-
     /**
      * The One True Thingy that must be defined and declared.
      */

plugins/OpenID/User_openid_trustroot.php

@@ -21,11 +21,6 @@ class User_openid_trustroot extends Managed_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
-    function pkeyGet($kv)
-    {
-        return Memcached_DataObject::pkeyGet('User_openid_trustroot', $kv);
-    }
-
     function table()
     {
         $db = $this->getDatabaseConnection();

plugins/Poll/Poll.php

@@ -53,23 +53,6 @@ class Poll extends Managed_DataObject
     public $options;     // text; newline(?)-delimited
     public $created;     // datetime
 
-    /**
-     * Get an instance by compound key
-     *
-     * This is a utility method to get a single instance with a given set of
-     * key-value pairs. Usually used for the primary key for a compound key; thus
-     * the name.
-     *
-     * @param array $kv array of key-value mappings
-     *
-     * @return Bookmark object found, or null for no hits
-     *
-     */
-    function pkeyGet($kv)
-    {
-        return Memcached_DataObject::pkeyGet('Poll', $kv);
-    }
-
     /**
      * The One True Thingy that must be defined and declared.
      */

plugins/Poll/Poll_response.php

@@ -52,23 +52,6 @@ class Poll_response extends Managed_DataObject
     public $selection;   // int -> choice #
     public $created;     // datetime
 
-    /**
-     * Get an instance by compound key
-     *
-     * This is a utility method to get a single instance with a given set of
-     * key-value pairs. Usually used for the primary key for a compound key; thus
-     * the name.
-     *
-     * @param array $kv array of key-value mappings
-     *
-     * @return Bookmark object found, or null for no hits
-     *
-     */
-    function pkeyGet($kv)
-    {
-        return Memcached_DataObject::pkeyGet('Poll_response', $kv);
-    }
-
     /**
      * The One True Thingy that must be defined and declared.
      */

plugins/QnA/classes/QnA_Answer.php

@@ -55,23 +55,6 @@ class QnA_Answer extends Managed_DataObject
     public $content;     // text -> response text
     public $created;     // datetime
 
-    /**
-     * Get an instance by compound key
-     *
-     * This is a utility method to get a single instance with a given set of
-     * key-value pairs. Usually used for the primary key for a compound key; thus
-     * the name.
-     *
-     * @param array $kv array of key-value mappings
-     *
-     * @return QA_Answer object found, or null for no hits
-     *
-     */
-    function pkeyGet($kv)
-    {
-        return Memcached_DataObject::pkeyGet('QnA_Answer', $kv);
-    }
-
     /**
      * The One True Thingy that must be defined and declared.
      */

plugins/QnA/classes/QnA_Question.php

@@ -55,23 +55,6 @@ class QnA_Question extends Managed_DataObject
     public $closed;      // int (boolean) whether a question is closed
     public $created;     // datetime
 
-    /**
-     * Get an instance by compound key
-     *
-     * This is a utility method to get a single instance with a given set of
-     * key-value pairs. Usually used for the primary key for a compound key; thus
-     * the name.
-     *
-     * @param array $kv array of key-value mappings
-     *
-     * @return Bookmark object found, or null for no hits
-     *
-     */
-    function pkeyGet($kv)
-    {
-        return Memcached_DataObject::pkeyGet('QnA_Question', $kv);
-    }
-
     /**
      * The One True Thingy that must be defined and declared.
      */

plugins/QnA/classes/QnA_Vote.php

@@ -55,23 +55,6 @@ class QnA_Vote extends Managed_DataObject
     public $profile_id;  // int -> question.id
     public $created;     // datetime
 
-    /**
-     * Get an instance by compound key
-     *
-     * This is a utility method to get a single instance with a given set of
-     * key-value pairs. Usually used for the primary key for a compound key; thus
-     * the name.
-     *
-     * @param array $kv array of key-value mappings
-     *
-     * @return QnA_Vote object found, or null for no hits
-     *
-     */
-    function pkeyGet($kv)
-    {
-        return Memcached_DataObject::pkeyGet('QnA_Vote', $kv);
-    }
-
     /**
      * The One True Thingy that must be defined and declared.
      */

plugins/Realtime/Realtime_channel.php

@@ -61,18 +61,6 @@ class Realtime_channel extends Managed_DataObject
     public $created;       // created date
     public $modified;      // modified date
 
-    /**
-     * Get an instance by compound key
-     *
-     * @param array $kv array of key-value mappings
-     *
-     * @return Realtime_channel object found, or null for no hits
-     */
-    function pkeyGet($kv)
-    {
-        return Managed_DataObject::pkeyGet('Realtime_channel', $kv);
-    }
-
     /**
      * The One True Thingy that must be defined and declared.
      */

plugins/SearchSub/SearchSub.php

@@ -50,23 +50,6 @@ class SearchSub extends Managed_DataObject
     public $profile_id;  // int -> profile.id
     public $created;     // datetime
 
-    /**
-     * Get an instance by compound key
-     *
-     * This is a utility method to get a single instance with a given set of
-     * key-value pairs. Usually used for the primary key for a compound key; thus
-     * the name.
-     *
-     * @param array $kv array of key-value mappings
-     *
-     * @return SearchSub object found, or null for no hits
-     *
-     */
-    function pkeyGet($kv)
-    {
-        return Memcached_DataObject::pkeyGet('SearchSub', $kv);
-    }
-
     /**
      * The One True Thingy that must be defined and declared.
      */

plugins/SubMirror/classes/SubMirror.php

@@ -204,11 +204,6 @@ class SubMirror extends Managed_DataObject
         return $saved;
     }
 
-    public /*static*/ function pkeyGet($v)
-    {
-        return parent::pkeyGet(__CLASS__, $v);
-    }
-
     /**
      * Get the mirroring setting for a pair of profiles, if existing.
      *

plugins/TagSub/TagSub.php

@@ -49,23 +49,6 @@ class TagSub extends Managed_DataObject
     public $profile_id;  // int -> profile.id
     public $created;     // datetime
 
-    /**
-     * Get an instance by compound key
-     *
-     * This is a utility method to get a single instance with a given set of
-     * key-value pairs. Usually used for the primary key for a compound key; thus
-     * the name.
-     *
-     * @param array $kv array of key-value mappings
-     *
-     * @return TagSub object found, or null for no hits
-     *
-     */
-    function pkeyGet($kv)
-    {
-        return Memcached_DataObject::pkeyGet('TagSub', $kv);
-    }
-
     /**
      * The One True Thingy that must be defined and declared.
      */

plugins/TwitterBridge/Twitter_synch_status.php

@@ -57,32 +57,6 @@ class Twitter_synch_status extends Managed_DataObject
     public $created;                         // datetime not_null
     public $modified;                        // datetime not_null
 
-    /**
-     * Get an instance by key
-     *
-     * @param string $k Key to use to lookup (usually 'foreign_id' for this class)
-     * @param mixed  $v Value to lookup
-     *
-     * @return Twitter_synch_status object found, or null for no hits
-     */
-    static function staticGet($k, $v=null)
-    {
-        throw new Exception("Use pkeyGet() for this class.");
-    }
-
-    /**
-     * Get an instance by compound primary key
-     *
-     * @param array $kv key-value pair array
-     *
-     * @return Twitter_synch_status object found, or null for no hits
-     *
-     */
-    function pkeyGet($kv)
-    {
-        return Memcached_DataObject::pkeyGet('Twitter_synch_status', $kv);
-    }
-
     /**
      * return table definition for DB_DataObject
      *

plugins/UserFlag/User_flag_profile.php

@@ -108,18 +108,6 @@ class User_flag_profile extends Managed_DataObject
         return array(false, false, false);
     }
 
-    /**
-     * Get a single object with multiple keys
-     *
-     * @param array $kv Map of key-value pairs
-     *
-     * @return User_flag_profile found object or null
-     */
-    function pkeyGet($kv)
-    {
-        return Memcached_DataObject::pkeyGet('User_flag_profile', $kv);
-    }
-
     /**
      * Check if a flag exists for given profile and user
      *

plugins/YammerImport/classes/Yammer_common.php

@@ -133,13 +133,13 @@ class Yammer_common extends Managed_DataObject
      */
     protected static function doRecord($class, $field, $orig_id, $local_id)
     {
-        $map = Memcached_DataObject::staticGet($class, 'id', $orig_id);
+        $map = Memcached_DataObject::getClassKV($class, 'id', $orig_id);
 
         if (!empty($map)) {
             return $map;
         }
 
-        $map = Memcached_DataObject::staticGet($class, $field, $local_id);
+        $map = Memcached_DataObject::getClassKV($class, $field, $local_id);
 
         if (!empty($map)) {
             return $map;