molong/sentcms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新tp5内核

Browse Source
This commit is contained in:
龙渊
2018-01-02 23:03:31 +08:00
parent 590696a06b
commit 3818619504
99 changed files with 3362 additions and 2006 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/library/think/cache/Driver.php
Vendored
+29 -8
View File
@@ -2,7 +2,7 @@
// +----------------------------------------------------------------------
// | ThinkPHP [ WE CAN DO IT JUST THINK ]
// +----------------------------------------------------------------------
// | Copyright (c) 2006~2017 http://thinkphp.cn All rights reserved.
// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
// +----------------------------------------------------------------------
// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
// +----------------------------------------------------------------------
@@ -120,10 +120,29 @@ abstract class Driver
public function remember($name, $value, $expire = null)
{
if (!$this->has($name)) {
if ($value instanceof \Closure) {
$value = call_user_func($value);
$time = time();
while ($time + 5 > time() && $this->has($name . '_lock')) {
// 存在锁定则等待
usleep(200000);
}
try {
// 锁定
$this->set($name . '_lock', true);
if ($value instanceof \Closure) {
$value = call_user_func($value);
}
$this->set($name, $value, $expire);
// 解锁
$this->rm($name . '_lock');
} catch (\Exception $e) {
// 解锁
$this->rm($name . '_lock');
throw $e;
} catch (\throwable $e) {
$this->rm($name . '_lock');
throw $e;
}
$this->set($name, $value, $expire);
} else {
$value = $this->get($name);
}
@@ -140,7 +159,9 @@ abstract class Driver
*/
public function tag($name, $keys = null, $overlay = false)
{
if (is_null($keys)) {
if (is_null($name)) {
} elseif (is_null($keys)) {
$this->tag = $name;
} else {
$key = 'tag_' . md5($name);
@@ -153,7 +174,7 @@ abstract class Driver
} else {
$value = array_unique(array_merge($this->getTagItem($name), $keys));
}
$this->set($key, implode(',', $value));
$this->set($key, implode(',', $value), 0);
}
return $this;
}
@@ -176,7 +197,7 @@ abstract class Driver
} else {
$value = $name;
}
$this->set($key, $value);
$this->set($key, $value, 0);
}
}
@@ -191,7 +212,7 @@ abstract class Driver
$key = 'tag_' . md5($tag);
$value = $this->get($key);
if ($value) {
return explode(',', $value);
return array_filter(explode(',', $value));
} else {
return [];
}