merge from 1.7.3.5(r13153:r13167)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@13168 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2013-09-29 23:32:39 +00:00
parent cc47d2b247
commit 2d3f149b5a
2042 changed files with 129266 additions and 126243 deletions

View file

@ -1,10 +1,13 @@
<?php
/**
* CacheHandler
*
* @author NHN (developer@xpressengine.com)
**/
class CacheHandler extends Handler {
*/
class CacheHandler extends Handler
{
/**
* instance of cache handler
* @var CacheBase
@ -25,9 +28,11 @@ class CacheHandler extends Handler {
* @param boolean $always_use_file If set true, use a file cache always
* @return CacheHandler
*/
function &getInstance($target = 'object', $info = null, $always_use_file = false) {
function &getInstance($target = 'object', $info = null, $always_use_file = false)
{
$cache_handler_key = $target . ($always_use_file ? '_file' : '');
if(!$GLOBALS['__XE_CACHE_HANDLER__'][$cache_handler_key]) {
if(!$GLOBALS['__XE_CACHE_HANDLER__'][$cache_handler_key])
{
$GLOBALS['__XE_CACHE_HANDLER__'][$cache_handler_key] = new CacheHandler($target, $info, $always_use_file);
}
return $GLOBALS['__XE_CACHE_HANDLER__'][$cache_handler_key];
@ -44,34 +49,67 @@ class CacheHandler extends Handler {
* @param boolean $always_use_file If set true, use a file cache always
* @return CacheHandler
*/
function CacheHandler($target, $info = null, $always_use_file = false) {
if(!$info) $info = Context::getDBInfo();
if($info){
if($target == 'object'){
if($info->use_object_cache =='apc') $type = 'apc';
else if(substr($info->use_object_cache,0,8)=='memcache'){
function CacheHandler($target, $info = null, $always_use_file = false)
{
if(!$info)
{
$info = Context::getDBInfo();
}
if($info)
{
if($target == 'object')
{
if($info->use_object_cache == 'apc')
{
$type = 'apc';
}
else if(substr($info->use_object_cache, 0, 8) == 'memcache')
{
$type = 'memcache';
$url = $info->use_object_cache;
} else if($info->use_object_cache == 'wincache') $type = 'wincache';
else if($info->use_object_cache =='file') $type = 'file';
else if($always_use_file) $type = 'file';
}else if($target == 'template'){
if($info->use_template_cache =='apc') $type = 'apc';
else if(substr($info->use_template_cache,0,8)=='memcache'){
}
else if($info->use_object_cache == 'wincache')
{
$type = 'wincache';
}
else if($info->use_object_cache == 'file')
{
$type = 'file';
}
else if($always_use_file)
{
$type = 'file';
}
}
else if($target == 'template')
{
if($info->use_template_cache == 'apc')
{
$type = 'apc';
}
else if(substr($info->use_template_cache, 0, 8) == 'memcache')
{
$type = 'memcache';
$url = $info->use_template_cache;
} else if($info->use_template_cache == 'wincache') $type = 'wincache';
}
else if($info->use_template_cache == 'wincache')
{
$type = 'wincache';
}
}
if($type){
if($type)
{
$class = 'Cache' . ucfirst($type);
include_once sprintf('%sclasses/cache/%s.class.php', _XE_PATH_, $class);
$this->handler = call_user_func(array($class,'getInstance'), $url);
$this->keyGroupVersions = $this->handler->get('key_group_versions', 0);
if(!$this->keyGroupVersions) {
$this->keyGroupVersions = array();
$this->handler->put('key_group_versions', $this->keyGroupVersions, 0);
}
$this->handler = call_user_func(array($class, 'getInstance'), $url);
$this->keyGroupVersions = $this->handler->get('key_group_versions', 0);
if(!$this->keyGroupVersions)
{
$this->keyGroupVersions = array();
$this->handler->put('key_group_versions', $this->keyGroupVersions, 0);
}
}
}
}
@ -81,8 +119,12 @@ class CacheHandler extends Handler {
*
* @return boolean
*/
function isSupport(){
if($this->handler && $this->handler->isSupport()) return true;
function isSupport()
{
if($this->handler && $this->handler->isSupport())
{
return true;
}
return false;
}
@ -91,11 +133,15 @@ class CacheHandler extends Handler {
*
* @param string $key Cache key
* @param int $modified_time Unix time of data modified.
* If stored time is older then modified time, return false.
* If stored time is older then modified time, return false.
* @return false|mixed Return false on failure or older then modified time. Return the string associated with the $key on success.
*/
function get($key, $modified_time = 0){
if(!$this->handler) return false;
function get($key, $modified_time = 0)
{
if(!$this->handler)
{
return false;
}
return $this->handler->get($key, $modified_time);
}
@ -105,12 +151,16 @@ class CacheHandler extends Handler {
* @param string $key Cache key
* @param mixed $obj Value of a variable to store. $value supports all data types except resources, such as file handlers.
* @param int $valid_time Time for the variable to live in the cache in seconds.
* After the value specified in ttl has passed the stored variable will be deleted from the cache.
* If no ttl is supplied, use the default valid time.
* After the value specified in ttl has passed the stored variable will be deleted from the cache.
* If no ttl is supplied, use the default valid time.
* @return bool|void Returns true on success or false on failure. If use CacheFile, returns void.
*/
function put($key, $obj, $valid_time = 0){
if(!$this->handler) return false;
function put($key, $obj, $valid_time = 0)
{
if(!$this->handler)
{
return false;
}
return $this->handler->put($key, $obj, $valid_time);
}
@ -120,8 +170,12 @@ class CacheHandler extends Handler {
* @param string $key Cache key
* @return void
*/
function delete($key){
if(!$this->handler) return false;
function delete($key)
{
if(!$this->handler)
{
return false;
}
return $this->handler->delete($key);
}
@ -130,11 +184,15 @@ class CacheHandler extends Handler {
*
* @param string $key Cache key
* @param int $modified_time Unix time of data modified.
* If stored time is older then modified time, the data is invalid.
* If stored time is older then modified time, the data is invalid.
* @return bool Return true on valid or false on invalid.
*/
function isValid($key, $modified_time){
if(!$this->handler) return false;
function isValid($key, $modified_time)
{
if(!$this->handler)
{
return false;
}
return $this->handler->isValid($key, $modified_time);
}
@ -143,8 +201,12 @@ class CacheHandler extends Handler {
*
* @return bool|void Returns true on success or false on failure. If use CacheFile, returns void.
*/
function truncate(){
if(!$this->handler) return false;
function truncate()
{
if(!$this->handler)
{
return false;
}
return $this->handler->truncate();
}
@ -164,8 +226,10 @@ class CacheHandler extends Handler {
* @param string $key Cache key
* @return string
*/
function getGroupKey($keyGroupName, $key){
if(!$this->keyGroupVersions[$keyGroupName]){
function getGroupKey($keyGroupName, $key)
{
if(!$this->keyGroupVersions[$keyGroupName])
{
$this->keyGroupVersions[$keyGroupName] = 1;
$this->handler->put('key_group_versions', $this->keyGroupVersions, 0);
}
@ -179,10 +243,12 @@ class CacheHandler extends Handler {
* @param string $keyGroupName Group name
* @return void
*/
function invalidateGroupKey($keyGroupName){
function invalidateGroupKey($keyGroupName)
{
$this->keyGroupVersions[$keyGroupName]++;
$this->handler->put('key_group_versions', $this->keyGroupVersions, 0);
}
}
/**
@ -190,17 +256,19 @@ class CacheHandler extends Handler {
*
* @author NHN (developer@xpressengine.com)
*/
class CacheBase{
class CacheBase
{
/**
* Get cached data
*
* @param string $key Cache key
* @param int $modified_time Unix time of data modified.
* If stored time is older then modified time, return false.
* If stored time is older then modified time, return false.
* @return false|mixed Return false on failure or older then modified time. Return the string associated with the $key on success.
*/
function get($key, $modified_time = 0){
function get($key, $modified_time = 0)
{
return false;
}
@ -210,11 +278,12 @@ class CacheBase{
* @param string $key Cache key
* @param mixed $obj Value of a variable to store. $value supports all data types except resources, such as file handlers.
* @param int $valid_time Time for the variable to live in the cache in seconds.
* After the value specified in ttl has passed the stored variable will be deleted from the cache.
* If no ttl is supplied, use the default valid time.
* After the value specified in ttl has passed the stored variable will be deleted from the cache.
* If no ttl is supplied, use the default valid time.
* @return bool|void Returns true on success or false on failure. If use CacheFile, returns void.
*/
function put($key, $obj, $valid_time = 0){
function put($key, $obj, $valid_time = 0)
{
return false;
}
@ -223,10 +292,11 @@ class CacheBase{
*
* @param string $key Cache key
* @param int $modified_time Unix time of data modified.
* If stored time is older then modified time, the data is invalid.
* If stored time is older then modified time, the data is invalid.
* @return bool Return true on valid or false on invalid.
*/
function isValid($key, $modified_time = 0){
function isValid($key, $modified_time = 0)
{
return false;
}
@ -235,7 +305,8 @@ class CacheBase{
*
* @return boolean
*/
function isSupport(){
function isSupport()
{
return false;
}
@ -244,10 +315,11 @@ class CacheBase{
*
* @return bool|void Returns true on success or false on failure. If use CacheFile, returns void.
*/
function truncate(){
function truncate()
{
return false;
}
}
}
/* End of file CacheHandler.class.php */
/* Location: ./classes/cache/CacheHandler.class.php */