驱动优化,恢复Memcached驱动,补充memcache驱动,解决windows下没有memcached扩展的问题

This commit is contained in:
huangdijia
2016-01-29 09:09:09 +08:00
parent de8d0a53de
commit 3d38c39c17
4 changed files with 452 additions and 296 deletions

134
library/think/cache/driver/Memcache.php vendored Normal file
View File

@@ -0,0 +1,134 @@
<?php
// +----------------------------------------------------------------------
// | ThinkPHP [ WE CAN DO IT JUST THINK ]
// +----------------------------------------------------------------------
// | Copyright (c) 2006~2016 http://thinkphp.cn All rights reserved.
// +----------------------------------------------------------------------
// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
// +----------------------------------------------------------------------
// | Author: liu21st <liu21st@gmail.com>
// +----------------------------------------------------------------------
namespace think\cache\driver;
use think\Cache;
use think\Exception;
class Memcache
{
protected $handler = null;
protected $options = [
'host' => '127.0.0.1',
'port' => 11211,
'expire' => 0,
'timeout' => 0, // 超时时间(单位:毫秒)
'persistent' => true,
'length' => 0,
];
/**
* 架构函数
* @param array $options 缓存参数
* @access public
*/
public function __construct($options = [])
{
if (!extension_loaded('memcache')) {
throw new Exception('_NOT_SUPPERT_:memcache');
}
if (!empty($options)) {
$this->options = array_merge($this->options, $options);
}
$this->handler = new \Memcache;
// 支持集群
$hosts = explode(',', $this->options['host']);
$ports = explode(',', $this->options['port']);
if (empty($ports[0])) {
$ports[0] = 11211;
}
// 建立连接
foreach ((array) $hosts as $i => $host) {
$port = isset($ports[$i]) ? $ports[$i] : $ports[0];
$this->options['timeout'] > 0 ?
$this->handler->addServer($host, $port, $this->options['persistent'], 1) :
$this->handler->addServer($host, $port, $this->options['persistent'], 1, $this->options['timeout']);
}
}
/**
* 读取缓存
* @access public
* @param string $name 缓存变量名
* @return mixed
*/
public function get($name)
{
Cache::$readTimes++;
return $this->handler->get($this->options['prefix'] . $name);
}
/**
* 写入缓存
* @access public
* @param string $name 缓存变量名
* @param mixed $value 存储数据
* @param integer $expire 有效时间(秒)
* @return bool
*/
public function set($name, $value, $expire = null)
{
Cache::$writeTimes++;
if (is_null($expire)) {
$expire = $this->options['expire'];
}
$name = $this->options['prefix'] . $name;
if ($this->handler->set($name, $value, 0, $expire)) {
if ($this->options['length'] > 0) {
// 记录缓存队列
$queue = $this->handler->get('__info__');
if (!$queue) {
$queue = [];
}
if (false === array_search($name, $queue)) {
array_push($queue, $name);
}
if (count($queue) > $this->options['length']) {
// 出列
$key = array_shift($queue);
// 删除缓存
$this->handler->delete($key);
}
$this->handler->set('__info__', $queue);
}
return true;
}
return false;
}
/**
* 删除缓存
*
* @param string $name 缓存变量名
* @param bool|false $ttl
*
* @return bool
*/
public function rm($name, $ttl = false)
{
$name = $this->options['prefix'] . $name;
return false === $ttl ?
$this->handler->delete($name) :
$this->handler->delete($name, $ttl);
}
/**
* 清除缓存
* @access public
* @return bool
*/
public function clear()
{
return $this->handler->flush();
}
}

View File

@@ -9,175 +9,128 @@
// | Author: liu21st <liu21st@gmail.com> // | Author: liu21st <liu21st@gmail.com>
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
namespace { namespace think\cache\driver;
// 检测php环境
if (!extension_loaded('memcached')) {
if (!extension_loaded('memcache')) {
throw new Exception('_NOT_SUPPERT_:memcache or memcachd');
}
class Memcached extends Memcache
{
const OPT_CONNECT_TIMEOUT = 14;
private $timeout = 1000;
public function addServers(array $servers = []) use think\Cache;
{ use think\Exception;
if (empty($servers)) {
return;
}
foreach ($servers as $key => $server) { class Memcached
if (empty($server[0])) { {
continue; protected $handler = null;
} protected $options = [
'host' => '127.0.0.1',
'port' => 11211,
'expire' => 0,
'timeout' => 0, // 超时时间(单位:毫秒)
'length' => 0,
];
$this->addServer( /**
$server[0], * 架构函数
!empty($server[1]) ? $server[1] : 11211, * @param array $options 缓存参数
true, * @access public
!empty($server[2]) ? $server[1] : 1, */
$this->timeout > 0 ? ($this->timeout / 1000) : 1 public function __construct($options = [])
);
}
}
public function setOption(int $option, mixed $value)
{
switch ($option) {
case self::OPT_CONNECT_TIMEOUT:
$this->timeout = $value;
break;
default:
break;
}
}
public function set(string $key, mixed $value, $expiration = 0)
{
return $this->set($key, $value, MEMCACHE_COMPRESSED, $expiration);
}
}
}
}
namespace think\cache\driver {
use think\Cache;
class Memcached
{ {
protected $handler = null; if (!extension_loaded('memcached')) {
protected $options = [ throw new Exception('_NOT_SUPPERT_:memcached');
'host' => '127.0.0.1',
'port' => 11211,
'expire' => 0,
'timeout' => 0, // 超时时间(单位:毫秒)
'length' => 0,
];
/**
* 架构函数
* @param array $options 缓存参数
* @access public
*/
public function __construct($options = [])
{
if (!empty($options)) {
$this->options = array_merge($this->options, $options);
}
$this->handler = new \Memcached;
// 设置连接超时时间(单位:毫秒)
if ($this->options['timeout'] > 0) {
$this->handler->setOption(\Memcached::OPT_CONNECT_TIMEOUT, $this->options['timeout']);
}
// 支持集群
$hosts = explode(',', $this->options['host']);
$ports = explode(',', $this->options['port']);
if (empty($ports[0])) {
$ports[0] = 11211;
}
// 建立连接
$servers = [];
foreach ((array) $hosts as $i => $host) {
$servers[] = [$host, (isset($ports[$i]) ? $ports[$i] : $ports[0]), 1];
}
$this->handler->addServers($servers);
} }
if (!empty($options)) {
/** $this->options = array_merge($this->options, $options);
* 读取缓存
* @access public
* @param string $name 缓存变量名
* @return mixed
*/
public function get($name)
{
Cache::$readTimes++;
return $this->handler->get($this->options['prefix'] . $name);
} }
$this->handler = new \Memcached;
// 设置连接超时时间(单位:毫秒)
if ($this->options['timeout'] > 0) {
$this->handler->setOption(\Memcached::OPT_CONNECT_TIMEOUT, $this->options['timeout']);
}
// 支持集群
$hosts = explode(',', $this->options['host']);
$ports = explode(',', $this->options['port']);
if (empty($ports[0])) {
$ports[0] = 11211;
}
// 建立连接
$servers = [];
foreach ((array) $hosts as $i => $host) {
$servers[] = [$host, (isset($ports[$i]) ? $ports[$i] : $ports[0]), 1];
}
$this->handler->addServers($servers);
}
/** /**
* 写入缓存 * 读取缓存
* @access public * @access public
* @param string $name 缓存变量名 * @param string $name 缓存变量名
* @param mixed $value 存储数据 * @return mixed
* @param integer $expire 有效时间(秒) */
* @return bool public function get($name)
*/ {
public function set($name, $value, $expire = null) Cache::$readTimes++;
{ return $this->handler->get($this->options['prefix'] . $name);
Cache::$writeTimes++; }
if (is_null($expire)) {
$expire = $this->options['expire'];
}
$name = $this->options['prefix'] . $name;
if ($this->handler->set($name, $value, $expire)) {
if ($this->options['length'] > 0) {
// 记录缓存队列
$queue = $this->handler->get('__info__');
if (!$queue) {
$queue = [];
}
if (false === array_search($name, $queue)) {
array_push($queue, $name);
}
if (count($queue) > $this->options['length']) { /**
// 出列 * 写入缓存
$key = array_shift($queue); * @access public
// 删除缓存 * @param string $name 缓存变量名
$this->handler->delete($key); * @param mixed $value 存储数据
} * @param integer $expire 有效时间(秒)
$this->handler->set('__info__', $queue); * @return bool
*/
public function set($name, $value, $expire = null)
{
Cache::$writeTimes++;
if (is_null($expire)) {
$expire = $this->options['expire'];
}
$name = $this->options['prefix'] . $name;
if ($this->handler->set($name, $value, $expire)) {
if ($this->options['length'] > 0) {
// 记录缓存队列
$queue = $this->handler->get('__info__');
if (!$queue) {
$queue = [];
} }
return true; if (false === array_search($name, $queue)) {
array_push($queue, $name);
}
if (count($queue) > $this->options['length']) {
// 出列
$key = array_shift($queue);
// 删除缓存
$this->handler->delete($key);
}
$this->handler->set('__info__', $queue);
} }
return false; return true;
} }
return false;
}
/** /**
* 删除缓存 * 删除缓存
* *
* @param string $name 缓存变量名 * @param string $name 缓存变量名
* @param bool|false $ttl * @param bool|false $ttl
* *
* @return bool * @return bool
*/ */
public function rm($name, $ttl = false) public function rm($name, $ttl = false)
{ {
$name = $this->options['prefix'] . $name; $name = $this->options['prefix'] . $name;
return false === $ttl ? return false === $ttl ?
$this->handler->delete($name) : $this->handler->delete($name) :
$this->handler->delete($name, $ttl); $this->handler->delete($name, $ttl);
} }
/** /**
* 清除缓存 * 清除缓存
* @access public * @access public
* @return bool * @return bool
*/ */
public function clear() public function clear()
{ {
return $this->handler->flush(); return $this->handler->flush();
}
} }
} }

View File

@@ -0,0 +1,115 @@
<?php
// +----------------------------------------------------------------------
// | ThinkPHP [ WE CAN DO IT JUST THINK ]
// +----------------------------------------------------------------------
// | Copyright (c) 2006~2016 http://thinkphp.cn All rights reserved.
// +----------------------------------------------------------------------
// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
// +----------------------------------------------------------------------
// | Author: liu21st <liu21st@gmail.com>
// +----------------------------------------------------------------------
namespace think\session\driver;
use SessionHandler;
use think\Exception;
class Memcache extends SessionHandler
{
protected $handler = null;
protected $config = [
'host' => '127.0.0.1', // memcache主机
'port' => 1121, // memcache端口
'expire' => 3600, // session有效期
'timeout' => 0, // 连接超时时间(单位:毫秒)
'persistent' => true, // 长连接
'session_name' => '', // memcache key前缀
];
public function __construct($config = [])
{
$this->config = array_merge($this->config, $config);
}
/**
* 打开Session
* @access public
* @param string $savePath
* @param mixed $sessName
*/
public function open($savePath, $sessName)
{
// 检测php环境
if (!extension_loaded('memcache')) {
throw new Exception('_NOT_SUPPERT_:memcache');
}
$this->handler = new \Memcache;
// 支持集群
$hosts = explode(',', $this->config['host']);
$ports = explode(',', $this->config['port']);
if (empty($ports[0])) {
$ports[0] = 11211;
}
// 建立连接
foreach ((array) $hosts as $i => $host) {
$port = isset($ports[$i]) ? $ports[$i] : $ports[0];
$this->config['timeout'] > 0 ?
$this->handler->addServer($host, $port, $this->config['persistent'], 1) :
$this->handler->addServer($host, $port, $this->config['persistent'], 1, $this->config['timeout']);
}
return true;
}
/**
* 关闭Session
* @access public
*/
public function close()
{
$this->gc(ini_get('session.gc_maxlifetime'));
$this->handler->close();
$this->handler = null;
return true;
}
/**
* 读取Session
* @access public
* @param string $sessID
*/
public function read($sessID)
{
return $this->handler->get($this->config['session_name'] . $sessID);
}
/**
* 写入Session
* @access public
* @param string $sessID
* @param String $sessData
*/
public function write($sessID, $sessData)
{
return $this->handler->set($this->config['session_name'] . $sessID, $sessData, 0, $this->config['expire']);
}
/**
* 删除Session
* @access public
* @param string $sessID
*/
public function destroy($sessID)
{
return $this->handler->delete($this->config['session_name'] . $sessID);
}
/**
* Session 垃圾回收
* @access public
* @param string $sessMaxLifeTime
*/
public function gc($sessMaxLifeTime)
{
return true;
}
}

View File

@@ -9,155 +9,109 @@
// | Author: liu21st <liu21st@gmail.com> // | Author: liu21st <liu21st@gmail.com>
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
namespace { namespace think\session\driver;
// 检测php环境
if (!extension_loaded('memcached')) {
if (!extension_loaded('memcache')) {
throw new Exception('_NOT_SUPPERT_:memcache or memcached');
}
class Memcached extends Memcache
{
const OPT_CONNECT_TIMEOUT = 14;
private $timeout = 1000;
public function addServers(array $servers = []) use SessionHandler;
{ use think\Exception;
if (empty($servers)) {
return;
}
foreach ($servers as $key => $server) { class Memcached extends SessionHandler
if (empty($server[0])) { {
continue; protected $handler = null;
} protected $config = [
'host' => '127.0.0.1', // memcache主机
'port' => 1121, // memcache端口
'expire' => 3600, // session有效期
'timeout' => 0, // 连接超时时间(单位:毫秒)
'session_name' => '', // memcache key前缀
];
$this->addServer( public function __construct($config = [])
$server[0],
!empty($server[1]) ? $server[1] : 11211,
true,
!empty($server[2]) ? $server[1] : 1,
$this->timeout > 0 ? ($this->timeout / 1000) : 1
);
}
}
public function setOption(int $option, mixed $value)
{
switch ($option) {
case self::OPT_CONNECT_TIMEOUT:
$this->timeout = $value;
break;
default:
break;
}
}
public function set(string $key, mixed $value, $expiration = 0)
{
return $this->set($key, $value, MEMCACHE_COMPRESSED, $expiration);
}
}
}
}
namespace think\session\driver {
use SessionHandler;
class Memcached extends SessionHandler
{ {
protected $handler = null; $this->config = array_merge($this->config, $config);
protected $config = [ }
'host' => '127.0.0.1', // memcache主机
'port' => 1121, // memcache端口
'expire' => 3600, // session有效期
'timeout' => 0, // 连接超时时间(单位:毫秒)
'session_name' => '', // memcache key前缀
];
public function __construct($config = []) /**
{ * 打开Session
$this->config = array_merge($this->config, $config); * @access public
* @param string $savePath
* @param mixed $sessName
*/
public function open($savePath, $sessName)
{
// 检测php环境
if (!extension_loaded('memcached')) {
throw new Exception('_NOT_SUPPERT_:memcached');
} }
$this->handler = new \Memcached;
// 设置连接超时时间(单位:毫秒)
if ($this->config['timeout'] > 0) {
$this->handler->setOption(\Memcached::OPT_CONNECT_TIMEOUT, $this->config['timeout']);
}
// 支持集群
$hosts = explode(',', $this->config['host']);
$ports = explode(',', $this->config['port']);
if (empty($ports[0])) {
$ports[0] = 11211;
}
// 建立连接
$servers = [];
foreach ((array) $hosts as $i => $host) {
$servers[] = [$host, (isset($ports[$i]) ? $ports[$i] : $ports[0]), 1];
}
$this->handler->addServers($servers);
return true;
}
/** /**
* 打开Session * 关闭Session
* @access public * @access public
* @param string $savePath */
* @param mixed $sessName public function close()
*/ {
public function open($savePath, $sessName) $this->gc(ini_get('session.gc_maxlifetime'));
{ $this->handler->close();
$this->handler = new \Memcached; $this->handler = null;
// 设置连接超时时间(单位:毫秒) return true;
if ($this->config['timeout'] > 0) { }
$this->handler->setOption(\Memcached::OPT_CONNECT_TIMEOUT, $this->config['timeout']);
}
// 支持集群
$hosts = explode(',', $this->config['host']);
$ports = explode(',', $this->config['port']);
if (empty($ports[0])) {
$ports[0] = 11211;
}
// 建立连接
$servers = [];
foreach ((array) $hosts as $i => $host) {
$servers[] = [$host, (isset($ports[$i]) ? $ports[$i] : $ports[0]), 1];
}
$this->handler->addServers($servers);
return true;
}
/** /**
* 关闭Session * 读取Session
* @access public * @access public
*/ * @param string $sessID
public function close() */
{ public function read($sessID)
$this->gc(ini_get('session.gc_maxlifetime')); {
$this->handler->close(); return $this->handler->get($this->config['session_name'] . $sessID);
$this->handler = null; }
return true;
}
/** /**
* 读取Session * 写入Session
* @access public * @access public
* @param string $sessID * @param string $sessID
*/ * @param String $sessData
public function read($sessID) */
{ public function write($sessID, $sessData)
return $this->handler->get($this->config['session_name'] . $sessID); {
} return $this->handler->set($this->config['session_name'] . $sessID, $sessData, $this->config['expire']);
}
/** /**
* 写入Session * 删除Session
* @access public * @access public
* @param string $sessID * @param string $sessID
* @param String $sessData */
*/ public function destroy($sessID)
public function write($sessID, $sessData) {
{ return $this->handler->delete($this->config['session_name'] . $sessID);
return $this->handler->set($this->config['session_name'] . $sessID, $sessData, $this->config['expire']); }
}
/** /**
* 删除Session * Session 垃圾回收
* @access public * @access public
* @param string $sessID * @param string $sessMaxLifeTime
*/ */
public function destroy($sessID) public function gc($sessMaxLifeTime)
{ {
return $this->handler->delete($this->config['session_name'] . $sessID); return true;
}
/**
* Session 垃圾回收
* @access public
* @param string $sessMaxLifeTime
*/
public function gc($sessMaxLifeTime)
{
return true;
}
} }
} }