From a319b40c97c2fd6527eeb81d7d2f2d703756ef80 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 6 Sep 2010 10:07:43 -0400 Subject: [PATCH] common_cache_key() -> Cache::key() --- actions/getfile.php | 2 +- classes/Config.php | 6 +++--- classes/Memcached_DataObject.php | 10 +++++----- classes/Notice.php | 10 +++++----- classes/Profile.php | 24 ++++++++++++------------ classes/User.php | 8 ++++---- lib/util.php | 5 ----- plugins/GeonamesPlugin.php | 2 +- plugins/LdapCommon/LdapCommon.php | 2 +- plugins/Minify/MinifyPlugin.php | 4 ++-- plugins/Minify/minify.php | 2 +- scripts/clearcache.php | 2 +- scripts/fixup_inboxes.php | 2 +- scripts/showcache.php | 2 +- scripts/uncache_users.php | 4 ++-- 15 files changed, 40 insertions(+), 45 deletions(-) diff --git a/actions/getfile.php b/actions/getfile.php index 17cca13f4c..a45506ce2a 100644 --- a/actions/getfile.php +++ b/actions/getfile.php @@ -131,7 +131,7 @@ class GetfileAction extends Action $cache = Cache::instance(); if($cache) { - $key = common_cache_key('attachments:etag:' . $this->path); + $key = Cache::key('attachments:etag:' . $this->path); $etag = $cache->get($key); if($etag === false) { $etag = crc32(file_get_contents($this->path)); diff --git a/classes/Config.php b/classes/Config.php index 43b99587fa..e14730438e 100644 --- a/classes/Config.php +++ b/classes/Config.php @@ -58,7 +58,7 @@ class Config extends Memcached_DataObject $c = self::memcache(); if (!empty($c)) { - $settings = $c->get(common_cache_key(self::settingsKey)); + $settings = $c->get(Cache::key(self::settingsKey)); if ($settings !== false) { return $settings; } @@ -77,7 +77,7 @@ class Config extends Memcached_DataObject $config->free(); if (!empty($c)) { - $c->set(common_cache_key(self::settingsKey), $settings); + $c->set(Cache::key(self::settingsKey), $settings); } return $settings; @@ -154,7 +154,7 @@ class Config extends Memcached_DataObject $c = self::memcache(); if (!empty($c)) { - $c->delete(common_cache_key(self::settingsKey)); + $c->delete(Cache::key(self::settingsKey)); } } } diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php index 1c5245b7a2..6feb59c341 100644 --- a/classes/Memcached_DataObject.php +++ b/classes/Memcached_DataObject.php @@ -134,7 +134,7 @@ class Memcached_DataObject extends Safe_DataObject str_replace("\n", " ", $e->getTraceAsString())); } $vstr = self::valueString($v); - return common_cache_key(strtolower($cls).':'.$k.':'.$vstr); + return Cache::key(strtolower($cls).':'.$k.':'.$vstr); } static function getcached($cls, $k, $v) { @@ -303,7 +303,7 @@ class Memcached_DataObject extends Safe_DataObject return $inst; } $key_part = Cache::keyize($cls).':'.md5($qry); - $ckey = common_cache_key($key_part); + $ckey = Cache::key($key_part); $stored = $c->get($ckey); if ($stored !== false) { @@ -550,7 +550,7 @@ class Memcached_DataObject extends Safe_DataObject $keyPart = vsprintf($format, $args); - $cacheKey = common_cache_key($keyPart); + $cacheKey = Cache::key($keyPart); return $c->delete($cacheKey); } @@ -592,7 +592,7 @@ class Memcached_DataObject extends Safe_DataObject return false; } - $cacheKey = common_cache_key($keyPart); + $cacheKey = Cache::key($keyPart); return $c->get($cacheKey); } @@ -605,7 +605,7 @@ class Memcached_DataObject extends Safe_DataObject return false; } - $cacheKey = common_cache_key($keyPart); + $cacheKey = Cache::key($keyPart); return $c->set($cacheKey, $value, $flag, $expiry); } diff --git a/classes/Notice.php b/classes/Notice.php index 7ca1605095..e3d1e85cb1 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -759,7 +759,7 @@ class Notice extends Memcached_DataObject $c = self::memcache(); if (!empty($c)) { - $ni = $c->get(common_cache_key('notice:who_gets:'.$this->id)); + $ni = $c->get(Cache::key('notice:who_gets:'.$this->id)); if ($ni !== false) { return $ni; } @@ -811,7 +811,7 @@ class Notice extends Memcached_DataObject if (!empty($c)) { // XXX: pack this data better - $c->set(common_cache_key('notice:who_gets:'.$this->id), $ni); + $c->set(Cache::key('notice:who_gets:'.$this->id), $ni); } return $ni; @@ -1595,7 +1595,7 @@ class Notice extends Memcached_DataObject $max_id))); } - $idkey = common_cache_key($cachekey); + $idkey = Cache::key($cachekey); $idstr = $cache->get($idkey); @@ -1782,12 +1782,12 @@ class Notice extends Memcached_DataObject if (empty($cache)) { $ids = $this->_repeatStreamDirect($limit); } else { - $idstr = $cache->get(common_cache_key('notice:repeats:'.$this->id)); + $idstr = $cache->get(Cache::key('notice:repeats:'.$this->id)); if ($idstr !== false) { $ids = explode(',', $idstr); } else { $ids = $this->_repeatStreamDirect(100); - $cache->set(common_cache_key('notice:repeats:'.$this->id), implode(',', $ids)); + $cache->set(Cache::key('notice:repeats:'.$this->id), implode(',', $ids)); } if ($limit < 100) { // We do a max of 100, so slice down to limit diff --git a/classes/Profile.php b/classes/Profile.php index 19564408c8..230b3aa3a0 100644 --- a/classes/Profile.php +++ b/classes/Profile.php @@ -432,7 +432,7 @@ class Profile extends Memcached_DataObject $c = Cache::instance(); if (!empty($c)) { - $cnt = $c->get(common_cache_key('profile:subscription_count:'.$this->id)); + $cnt = $c->get(Cache::key('profile:subscription_count:'.$this->id)); if (is_integer($cnt)) { return (int) $cnt; } @@ -446,7 +446,7 @@ class Profile extends Memcached_DataObject $cnt = ($cnt > 0) ? $cnt - 1 : $cnt; if (!empty($c)) { - $c->set(common_cache_key('profile:subscription_count:'.$this->id), $cnt); + $c->set(Cache::key('profile:subscription_count:'.$this->id), $cnt); } return $cnt; @@ -456,7 +456,7 @@ class Profile extends Memcached_DataObject { $c = Cache::instance(); if (!empty($c)) { - $cnt = $c->get(common_cache_key('profile:subscriber_count:'.$this->id)); + $cnt = $c->get(Cache::key('profile:subscriber_count:'.$this->id)); if (is_integer($cnt)) { return (int) $cnt; } @@ -468,7 +468,7 @@ class Profile extends Memcached_DataObject $cnt = (int) $sub->count('distinct subscriber'); if (!empty($c)) { - $c->set(common_cache_key('profile:subscriber_count:'.$this->id), $cnt); + $c->set(Cache::key('profile:subscriber_count:'.$this->id), $cnt); } return $cnt; @@ -478,7 +478,7 @@ class Profile extends Memcached_DataObject { $c = Cache::instance(); if (!empty($c)) { - $cnt = $c->get(common_cache_key('profile:fave_count:'.$this->id)); + $cnt = $c->get(Cache::key('profile:fave_count:'.$this->id)); if (is_integer($cnt)) { return (int) $cnt; } @@ -489,7 +489,7 @@ class Profile extends Memcached_DataObject $cnt = (int) $faves->count('distinct notice_id'); if (!empty($c)) { - $c->set(common_cache_key('profile:fave_count:'.$this->id), $cnt); + $c->set(Cache::key('profile:fave_count:'.$this->id), $cnt); } return $cnt; @@ -500,7 +500,7 @@ class Profile extends Memcached_DataObject $c = Cache::instance(); if (!empty($c)) { - $cnt = $c->get(common_cache_key('profile:notice_count:'.$this->id)); + $cnt = $c->get(Cache::key('profile:notice_count:'.$this->id)); if (is_integer($cnt)) { return (int) $cnt; } @@ -511,7 +511,7 @@ class Profile extends Memcached_DataObject $cnt = (int) $notices->count('distinct id'); if (!empty($c)) { - $c->set(common_cache_key('profile:notice_count:'.$this->id), $cnt); + $c->set(Cache::key('profile:notice_count:'.$this->id), $cnt); } return $cnt; @@ -521,7 +521,7 @@ class Profile extends Memcached_DataObject { $c = Cache::instance(); if (!empty($c)) { - $c->delete(common_cache_key('profile:subscriber_count:'.$this->id)); + $c->delete(Cache::key('profile:subscriber_count:'.$this->id)); } } @@ -529,7 +529,7 @@ class Profile extends Memcached_DataObject { $c = Cache::instance(); if (!empty($c)) { - $c->delete(common_cache_key('profile:subscription_count:'.$this->id)); + $c->delete(Cache::key('profile:subscription_count:'.$this->id)); } } @@ -537,7 +537,7 @@ class Profile extends Memcached_DataObject { $c = Cache::instance(); if (!empty($c)) { - $c->delete(common_cache_key('profile:fave_count:'.$this->id)); + $c->delete(Cache::key('profile:fave_count:'.$this->id)); } } @@ -545,7 +545,7 @@ class Profile extends Memcached_DataObject { $c = Cache::instance(); if (!empty($c)) { - $c->delete(common_cache_key('profile:notice_count:'.$this->id)); + $c->delete(Cache::key('profile:notice_count:'.$this->id)); } } diff --git a/classes/User.php b/classes/User.php index 36db226125..c15ddc9dc5 100644 --- a/classes/User.php +++ b/classes/User.php @@ -491,10 +491,10 @@ class User extends Memcached_DataObject if ($cache) { // Faves don't happen chronologically, so we need to blow // ;last cache, too - $cache->delete(common_cache_key('fave:ids_by_user:'.$this->id)); - $cache->delete(common_cache_key('fave:ids_by_user:'.$this->id.';last')); - $cache->delete(common_cache_key('fave:ids_by_user_own:'.$this->id)); - $cache->delete(common_cache_key('fave:ids_by_user_own:'.$this->id.';last')); + $cache->delete(Cache::key('fave:ids_by_user:'.$this->id)); + $cache->delete(Cache::key('fave:ids_by_user:'.$this->id.';last')); + $cache->delete(Cache::key('fave:ids_by_user_own:'.$this->id)); + $cache->delete(Cache::key('fave:ids_by_user_own:'.$this->id.';last')); } $profile = $this->getProfile(); $profile->blowFaveCount(); diff --git a/lib/util.php b/lib/util.php index f1ca009b4e..20c9144d47 100644 --- a/lib/util.php +++ b/lib/util.php @@ -1793,11 +1793,6 @@ function common_session_token() return $_SESSION['token']; } -function common_cache_key($extra) -{ - return Cache::key($extra); -} - function common_license_terms($uri) { if(preg_match('/creativecommons.org\/licenses\/([^\/]+)/', $uri, $matches)) { diff --git a/plugins/GeonamesPlugin.php b/plugins/GeonamesPlugin.php index dd882715ba..b64ebdba9d 100644 --- a/plugins/GeonamesPlugin.php +++ b/plugins/GeonamesPlugin.php @@ -420,7 +420,7 @@ class GeonamesPlugin extends Plugin if ($this->cachePrefix) { return $this->cachePrefix . ':' . $key; } else { - return common_cache_key($key); + return Cache::key($key); } } diff --git a/plugins/LdapCommon/LdapCommon.php b/plugins/LdapCommon/LdapCommon.php index f53660a4c4..d583e30857 100644 --- a/plugins/LdapCommon/LdapCommon.php +++ b/plugins/LdapCommon/LdapCommon.php @@ -130,7 +130,7 @@ class LdapCommon if (!empty($c)) { $cacheObj = new MemcacheSchemaCache( array('c'=>$c, - 'cacheKey' => common_cache_key('ldap_schema:' . $config_id))); + 'cacheKey' => Cache::key('ldap_schema:' . $config_id))); $ldap->registerSchemaCache($cacheObj); } self::$ldap_connections[$config_id] = $ldap; diff --git a/plugins/Minify/MinifyPlugin.php b/plugins/Minify/MinifyPlugin.php index 5071fd5a1f..afe6edf5fd 100644 --- a/plugins/Minify/MinifyPlugin.php +++ b/plugins/Minify/MinifyPlugin.php @@ -121,7 +121,7 @@ class MinifyPlugin extends Plugin if($this->minifyInlineJs && $type=='text/javascript'){ $c = Cache::instance(); if (!empty($c)) { - $cacheKey = common_cache_key(self::cacheKey . ':' . crc32($code)); + $cacheKey = Cache::key(self::cacheKey . ':' . crc32($code)); $out = $c->get($cacheKey); } if(empty($out)) { @@ -141,7 +141,7 @@ class MinifyPlugin extends Plugin if($this->minifyInlineCss && $type=='text/css'){ $c = Cache::instance(); if (!empty($c)) { - $cacheKey = common_cache_key(self::cacheKey . ':' . crc32($code)); + $cacheKey = Cache::key(self::cacheKey . ':' . crc32($code)); $out = $c->get($cacheKey); } if(empty($out)) { diff --git a/plugins/Minify/minify.php b/plugins/Minify/minify.php index 3e8f86f83b..bac1df8e2d 100644 --- a/plugins/Minify/minify.php +++ b/plugins/Minify/minify.php @@ -76,7 +76,7 @@ class MinifyAction extends Action $c = Cache::instance(); if (!empty($c)) { - $cacheKey = common_cache_key(MinifyPlugin::cacheKey . ':' . $this->file . '?v=' . empty($this->v)?'':$this->v); + $cacheKey = Cache::key(MinifyPlugin::cacheKey . ':' . $this->file . '?v=' . empty($this->v)?'':$this->v); $out = $c->get($cacheKey); } if(empty($out)) { diff --git a/scripts/clearcache.php b/scripts/clearcache.php index 8f54bc9acc..c67d6275d8 100644 --- a/scripts/clearcache.php +++ b/scripts/clearcache.php @@ -38,7 +38,7 @@ require_once INSTALLDIR.'/scripts/commandline.inc'; $karg = get_option_value('k', 'key'); if (!empty($karg)) { - $k = common_cache_key($karg); + $k = Cache::key($karg); } else { $table = get_option_value('t', 'table'); if (empty($table)) { diff --git a/scripts/fixup_inboxes.php b/scripts/fixup_inboxes.php index 7397d75d8e..c6e4fd0717 100755 --- a/scripts/fixup_inboxes.php +++ b/scripts/fixup_inboxes.php @@ -76,6 +76,6 @@ while ($user->fetch()) { $inbox->free(); unset($inbox); if ($cache) { - $cache->delete(common_cache_key('user:notices_with_friends:' . $user->id)); + $cache->delete(Cache::key('user:notices_with_friends:' . $user->id)); } } diff --git a/scripts/showcache.php b/scripts/showcache.php index 953ad1a776..8ef08467d6 100644 --- a/scripts/showcache.php +++ b/scripts/showcache.php @@ -38,7 +38,7 @@ require_once INSTALLDIR.'/scripts/commandline.inc'; $karg = get_option_value('k'); if (!empty($karg)) { - $k = common_cache_key($karg); + $k = Cache::key($karg); } else { $table = get_option_value('t'); if (empty($table)) { diff --git a/scripts/uncache_users.php b/scripts/uncache_users.php index d8c0a025bc..eb7e398023 100644 --- a/scripts/uncache_users.php +++ b/scripts/uncache_users.php @@ -47,6 +47,6 @@ foreach ($ids as $id) { $user->decache(); - $memc->delete(common_cache_key('user:notices_with_friends:'. $user->id)); - $memc->delete(common_cache_key('user:notices_with_friends:'. $user->id . ';last')); + $memc->delete(Cache::key('user:notices_with_friends:'. $user->id)); + $memc->delete(Cache::key('user:notices_with_friends:'. $user->id . ';last')); }