diff --git a/modules/comment/comment.admin.controller.php b/modules/comment/comment.admin.controller.php index 40fd69af3..500e178ce 100644 --- a/modules/comment/comment.admin.controller.php +++ b/modules/comment/comment.admin.controller.php @@ -436,12 +436,7 @@ class commentAdminController extends comment $output = executeQuery('comment.deleteModuleCommentsList', $args); //remove from cache - $oCacheHandler = CacheHandler::getInstance('object'); - if($oCacheHandler->isSupport()) - { - // Invalidate newest comments. Per document cache is invalidated inside document admin controller. - $oCacheHandler->invalidateGroupKey('newestCommentsList'); - } + Rhymix\Framework\Cache::clearGroup('newestCommentsList'); return $output; } diff --git a/modules/counter/counter.model.php b/modules/counter/counter.model.php index fac25cd59..0ece14901 100644 --- a/modules/counter/counter.model.php +++ b/modules/counter/counter.model.php @@ -31,13 +31,9 @@ class counterModel extends counter $args->site_srl = $site_srl; $iplogged = false; - $oCacheHandler = CacheHandler::getInstance('object'); - if($oCacheHandler->isSupport()) - { - $object_key = 'counter:' . $site_srl . '_' . str_replace(array('.', ':'), '-', $args->ipaddress); - $cache_key = $oCacheHandler->getGroupKey('counterIpLogged_' . $args->regdate, $object_key); - $iplogged = $oCacheHandler->get($cache_key); - } + $cache_key = 'counter:' . $site_srl . '_' . str_replace(array('.', ':'), '-', $args->ipaddress); + $group_key = 'counterIpLogged_' . $args->regdate; + $iplogged = Rhymix\Framework\Cache::get($cache_key, $group_key); if($iplogged === false) { @@ -45,9 +41,9 @@ class counterModel extends counter if($output->data->count) $iplogged = TRUE; } - if($iplogged && $oCacheHandler->isSupport()) + if($iplogged) { - $oCacheHandler->put($cache_key, $iplogged); + Rhymix\Framework\Cache::set($cache_key, $iplogged, 0, $group_key); } return $iplogged; @@ -64,15 +60,10 @@ class counterModel extends counter $args = new stdClass; $args->regdate = date('Ymd'); - $insertedTodayStatus = false; - $oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE); - if($oCacheHandler->isSupport()) - { - $cache_key = 'counter:insertedTodayStatus:' . $site_srl . '_' . $args->regdate; - $insertedTodayStatus = $oCacheHandler->get($cache_key); - } + $cache_key = 'counter:insertedTodayStatus:' . $site_srl . '_' . $args->regdate; + $insertedTodayStatus = Rhymix\Framework\Cache::get($cache_key); - if($insertedTodayStatus === false) + if(!$insertedTodayStatus) { if($site_srl) { @@ -86,11 +77,11 @@ class counterModel extends counter $insertedTodayStatus = !!$output->data->count; - if($insertedTodayStatus && $oCacheHandler->isSupport()) + if($insertedTodayStatus) { - $oCacheHandler->put($cache_key, TRUE); + Rhymix\Framework\Cache::set($cache_key, true); $_old_date = date('Ymd', strtotime('-1 day')); - $oCacheHandler->delete('counter:insertedTodayStatus:' . $site_srl . '_' . $_old_date); + Rhymix\Framework\Cache::delete('counter:insertedTodayStatus:' . $site_srl . '_' . $_old_date); } } diff --git a/modules/layout/layout.admin.controller.php b/modules/layout/layout.admin.controller.php index 572d052ee..222ec7dcb 100644 --- a/modules/layout/layout.admin.controller.php +++ b/modules/layout/layout.admin.controller.php @@ -178,11 +178,7 @@ class layoutAdminController extends layout $output = executeQuery('layout.updateModuleLayout', $update_args); } - $oCacheHandler = CacheHandler::getInstance('object', null, true); - if($oCacheHandler->isSupport()) - { - $oCacheHandler->invalidateGroupKey('site_and_module'); - } + Rhymix\Framework\Cache::clearGroup('site_and_module'); } } } diff --git a/modules/member/member.admin.controller.php b/modules/member/member.admin.controller.php index f18ec15c8..b57fd2688 100644 --- a/modules/member/member.admin.controller.php +++ b/modules/member/member.admin.controller.php @@ -1330,11 +1330,7 @@ class memberAdminController extends member function _deleteMemberGroupCache($site_srl = 0) { //remove from cache - $oCacheHandler = CacheHandler::getInstance('object', null, true); - if($oCacheHandler->isSupport()) - { - $oCacheHandler->invalidateGroupKey('member'); - } + Rhymix\Framework\Cache::clearGroup('member'); } /** diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php index 3de91d867..1f5996715 100644 --- a/modules/member/member.controller.php +++ b/modules/member/member.controller.php @@ -2971,27 +2971,12 @@ class memberController extends member function _clearMemberCache($member_srl, $site_srl = 0) { - $oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE); - if($oCacheHandler->isSupport()) + $member_srl = getNumberingPath($member_srl) . $member_srl; + Rhymix\Framework\Cache::delete("member_info:$member_srl", 'member'); + Rhymix\Framework\Cache::delete("member_groups:$member_srl:site:$site_srl", 'member'); + if ($site_srl != 0) { - $object_key = 'member_groups:' . getNumberingPath($member_srl) . $member_srl . '_' . $site_srl; - $cache_key = $oCacheHandler->getGroupKey('member', $object_key); - $oCacheHandler->delete($cache_key); - - if($site_srl !== 0) - { - $object_key = 'member_groups:' . getNumberingPath($member_srl) . $member_srl . '_0'; - $cache_key = $oCacheHandler->getGroupKey('member', $object_key); - $oCacheHandler->delete($cache_key); - } - } - - $oCacheHandler = CacheHandler::getInstance('object'); - if($oCacheHandler->isSupport()) - { - $object_key = 'member_info:' . getNumberingPath($member_srl) . $member_srl; - $cache_key = $oCacheHandler->getGroupKey('member', $object_key); - $oCacheHandler->delete($cache_key); + Rhymix\Framework\Cache::delete("member_groups:$member_srl:site:0", 'member'); } } } diff --git a/modules/member/member.model.php b/modules/member/member.model.php index dc7d6aed4..9e361b7f9 100644 --- a/modules/member/member.model.php +++ b/modules/member/member.model.php @@ -326,31 +326,21 @@ class memberModel extends member //columnList size zero... get full member info if(!$GLOBALS['__member_info__'][$member_srl] || count($columnList) == 0) { - $GLOBALS['__member_info__'][$member_srl] = false; - - $oCacheHandler = CacheHandler::getInstance('object'); - if($oCacheHandler->isSupport()) - { - $columnList = array(); - $object_key = 'member_info:' . getNumberingPath($member_srl) . $member_srl; - $cache_key = $oCacheHandler->getGroupKey('member', $object_key); - $GLOBALS['__member_info__'][$member_srl] = $oCacheHandler->get($cache_key); - } - - if($GLOBALS['__member_info__'][$member_srl] === false) + $cache_key = 'member_info:' . getNumberingPath($member_srl) . $member_srl; + $GLOBALS['__member_info__'][$member_srl] = Rhymix\Framework\Cache::get($cache_key, 'member'); + if(!$GLOBALS['__member_info__'][$member_srl]) { $args = new stdClass(); $args->member_srl = $member_srl; $output = executeQuery('member.getMemberInfoByMemberSrl', $args, $columnList); if(!$output->data) { - if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, new stdClass); + Rhymix\Framework\Cache::set($cache_key, new stdClass, 0, 'member'); return new stdClass; } + $this->arrangeMemberInfo($output->data, $site_srl); - - //insert in cache - if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $GLOBALS['__member_info__'][$member_srl]); + Rhymix\Framework\Cache::set($cache_key, $GLOBALS['__member_info__'][$member_srl], 0, 'member'); } } @@ -367,7 +357,6 @@ class memberModel extends member $oModuleModel = getModel('module'); $config = $oModuleModel->getModuleConfig('member'); - $info->profile_image = $this->getProfileImage($info->member_srl); $info->image_name = $this->getImageName($info->member_srl); $info->image_mark = $this->getImageMark($info->member_srl); @@ -494,18 +483,12 @@ class memberModel extends member static $member_groups = array(); // cache controll - $group_list = false; - $oCacheHandler = CacheHandler::getInstance('object', null, true); - if($oCacheHandler->isSupport()) - { - $object_key = 'member_groups:' . getNumberingPath($member_srl) . $member_srl . '_'.$site_srl; - $cache_key = $oCacheHandler->getGroupKey('member', $object_key); - $group_list = $oCacheHandler->get($cache_key); - } + $cache_key = 'member_groups:' . getNumberingPath($member_srl) . $member_srl . ':site:' . $site_srl; + $group_list = Rhymix\Framework\Cache::get($cache_key, 'member'); if(!$member_groups[$member_srl][$site_srl] || $force_reload) { - if($group_list === false) + if(!$group_list) { $args = new stdClass(); $args->member_srl = $member_srl; @@ -513,7 +496,7 @@ class memberModel extends member $output = executeQueryArray('member.getMemberGroups', $args); $group_list = $output->data; //insert in cache - if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $group_list); + Rhymix\Framework\Cache::set($cache_key, $group_list, 0, 'member'); } if(!$group_list) return array(); @@ -550,26 +533,15 @@ class memberModel extends member */ function getDefaultGroup($site_srl = 0, $columnList = array()) { - $default_group = false; - $oCacheHandler = CacheHandler::getInstance('object', null, true); - if($oCacheHandler->isSupport()) - { - $columnList = array(); - $object_key = 'default_group_' . $site_srl; - $cache_key = $oCacheHandler->getGroupKey('member', $object_key); - $default_group = $oCacheHandler->get($cache_key); - } + $default_group = Rhymix\Framework\Cache::get("default_group:$site_srl", 'member'); - if($default_group === false) + if(!$default_group) { $args = new stdClass(); $args->site_srl = $site_srl; $output = executeQuery('member.getDefaultGroup', $args, $columnList); $default_group = $output->data; - if($oCacheHandler->isSupport()) - { - $oCacheHandler->put($cache_key, $default_group); - } + Rhymix\Framework\Cache::set("default_group:$site_srl", $default_group, 0, 'member'); } return $default_group; @@ -609,16 +581,9 @@ class memberModel extends member $site_srl = 0; } - $group_list = false; - $oCacheHandler = CacheHandler::getInstance('object', null, true); - if($oCacheHandler->isSupport()) - { - $object_key = 'member_groups:site_'.$site_srl; - $cache_key = $oCacheHandler->getGroupKey('member', $object_key); - $group_list = $oCacheHandler->get($cache_key); - } + $group_list = Rhymix\Framework\Cache::get("member_groups:site:$site_srl", 'member'); - if($group_list === false) + if(!$group_list) { $args = new stdClass(); $args->site_srl = $site_srl; @@ -626,8 +591,7 @@ class memberModel extends member $args->order_type = 'asc'; $output = executeQueryArray('member.getGroups', $args); $group_list = $output->data; - //insert in cache - if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $group_list); + Rhymix\Framework\Cache::set("member_groups:site:$site_srl", $group_list, 0, 'member'); } if(!$group_list) @@ -635,7 +599,6 @@ class memberModel extends member return array(); } - foreach($group_list as $val) { $result[$val->group_srl] = $val; diff --git a/modules/menu/menu.admin.controller.php b/modules/menu/menu.admin.controller.php index b22f8f39e..6fafff9f0 100644 --- a/modules/menu/menu.admin.controller.php +++ b/modules/menu/menu.admin.controller.php @@ -209,12 +209,7 @@ class menuAdminController extends menu return $output; } - $oCacheHandler = CacheHandler::getInstance('object', null, true); - if($oCacheHandler->isSupport()) - { - $oCacheHandler->invalidateGroupKey('site_and_module'); - } - + Rhymix\Framework\Cache::clearGroup('site_and_module'); $oMenuAdminController = getAdminController('menu'); $oMenuAdminController->makeXmlFile($menuSrl); diff --git a/modules/ncenterlite/ncenterlite.controller.php b/modules/ncenterlite/ncenterlite.controller.php index 21aa7f76f..0c04dbc89 100644 --- a/modules/ncenterlite/ncenterlite.controller.php +++ b/modules/ncenterlite/ncenterlite.controller.php @@ -232,7 +232,6 @@ class ncenterliteController extends ncenterlite if(isset($config->use['mention'])) { $mention_targets = $this->_getMentionTarget($content); - debugPrint($mention_targets); // !TODO 공용 메소드로 분리 foreach($mention_targets as $mention_member_srl) diff --git a/modules/page/page.admin.controller.php b/modules/page/page.admin.controller.php index 3e3fa4332..2db0b7a18 100644 --- a/modules/page/page.admin.controller.php +++ b/modules/page/page.admin.controller.php @@ -282,13 +282,7 @@ class pageAdminController extends page } } - $oCacheHandler = CacheHandler::getInstance('object', null, true); - if($oCacheHandler->isSupport()) - { - $object_key = 'mid_info:' . $module_info->module_srl; - $cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key); - $oCacheHandler->delete($cache_key); - } + Rhymix\Framework\Cache::delete('mid_info:' . $module_info->module_srl, 'site_and_module'); } function procPageAdminArticleDocumentInsert() diff --git a/modules/point/point.admin.controller.php b/modules/point/point.admin.controller.php index 77fa68645..7dfc6269f 100644 --- a/modules/point/point.admin.controller.php +++ b/modules/point/point.admin.controller.php @@ -402,12 +402,7 @@ class pointAdminController extends point executeQuery('module.deleteModulePartConfig', $args); } - $oCacheHandler = CacheHandler::getInstance('object', null, true); - if($oCacheHandler->isSupport()) - { - $oCacheHandler->invalidateGroupKey('site_and_module'); - } - + Rhymix\Framework\Cache::clearGroup('site_and_module'); $this->setMessage('success_updated'); } diff --git a/modules/point/point.controller.php b/modules/point/point.controller.php index 21ca270ea..50cfea845 100644 --- a/modules/point/point.controller.php +++ b/modules/point/point.controller.php @@ -688,21 +688,7 @@ class pointController extends point $cache_filename = sprintf('%s%d.cache.txt', $cache_path, $member_srl); FileHandler::writeFile($cache_filename, $point); - $oCacheHandler = CacheHandler::getInstance('object', null, true); - if($new_group_list && $del_group_list && $oCacheHandler->isSupport()) - { - $object_key = 'member_groups:' . getNumberingPath($member_srl) . $member_srl . '_0'; - $cache_key = $oCacheHandler->getGroupKey('member', $object_key); - $oCacheHandler->delete($cache_key); - } - - $oCacheHandler = CacheHandler::getInstance('object'); - if($new_group_list && $del_group_list && $oCacheHandler->isSupport()) - { - $object_key = 'member_info:' . getNumberingPath($member_srl) . $member_srl; - $cache_key = $oCacheHandler->getGroupKey('member', $object_key); - $oCacheHandler->delete($cache_key); - } + getController('member')->_clearMemberCache($member_srl); return $output; }