zhamao-robot/zhamao-framework
1
0
Fork 0
mirror of https://github.com/zhamao-robot/zhamao-framework.git synced 2026-07-22 16:15:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

update to 2.5.0-b1 (build 408)

Browse Source
This commit is contained in:
jerry
2021-06-16 00:17:30 +08:00
parent 59d614a24e
commit 4ee16d4fc6
92 changed files with 2286 additions and 1342 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/ZM/Store/LightCache.php
View File

@@ -11,7 +11,7 @@ use ZM\Console\Console;
use ZM\Event\EventDispatcher;
use ZM\Exception\ZMException;
use ZM\Framework;
use ZM\Utils\ProcessManager;
use ZM\Utils\Manager\ProcessManager;
class LightCache
{
@@ -26,7 +26,6 @@ class LightCache
* @param $config
* @return bool|mixed
* @throws Exception
* @noinspection PhpMissingReturnTypeInspection
*/
public static function init($config) {
self::$config = $config;
@@ -44,17 +43,17 @@ class LightCache
$write = self::set($k, $v);
Console::verbose("Writing LightCache: " . $k);
if ($write === false) {
self::$last_error = '可能是由于 Hash 冲突过多导致动态空间无法分配内存';
self::$last_error = zm_internal_errcode("E00051") . '可能是由于 Hash 冲突过多导致动态空间无法分配内存';
return false;
}
}
}
}
if ($result === false) {
self::$last_error = '系统内存不足，申请失败';
self::$last_error = zm_internal_errcode("E00050") . '系统内存不足，申请失败';
} else {
$obj = Framework::loadFrameworkState();
foreach(($obj["expiring_light_cache"] ?? []) as $k => $v) {
foreach (($obj["expiring_light_cache"] ?? []) as $k => $v) {
$value = $v["value"];
if (is_array($value)) {
$value = json_encode($value, JSON_UNESCAPED_UNICODE);
@@ -87,7 +86,7 @@ class LightCache
* @throws ZMException
*/
public static function get(string $key) {
if (self::$kv_table === null) throw new ZMException("not initialized LightCache");
if (self::$kv_table === null) throw new ZMException(zm_internal_errcode("E00048") . "not initialized LightCache");
self::checkExpire($key);
$r = self::$kv_table->get($key);
return $r === false ? null : self::parseGet($r);
@@ -99,7 +98,7 @@ class LightCache
* @throws ZMException
*/
public static function getExpire(string $key) {
if (self::$kv_table === null) throw new ZMException("not initialized LightCache");
if (self::$kv_table === null) throw new ZMException(zm_internal_errcode("E00048") . "not initialized LightCache");
self::checkExpire($key);
$r = self::$kv_table->get($key, "expire");
return $r === false ? null : $r - time();
@@ -112,7 +111,7 @@ class LightCache
* @since 2.4.3
*/
public static function getExpireTS(string $key) {
if (self::$kv_table === null) throw new ZMException("not initialized LightCache");
if (self::$kv_table === null) throw new ZMException(zm_internal_errcode("E00048") . "not initialized LightCache");
self::checkExpire($key);
$r = self::$kv_table->get($key, "expire");
return $r === false ? null : $r;
@@ -124,10 +123,9 @@ class LightCache
* @param int $expire
* @return mixed
* @throws ZMException
* @noinspection PhpMissingReturnTypeInspection
*/
public static function set(string $key, $value, int $expire = -1) {
if (self::$kv_table === null) throw new ZMException("not initialized LightCache");
if (self::$kv_table === null) throw new ZMException(zm_internal_errcode("E00048") . "not initialized LightCache");
if (is_array($value)) {
$value = json_encode($value, JSON_UNESCAPED_UNICODE);
if (strlen($value) >= self::$config["max_strlen"]) return false;
@@ -140,7 +138,7 @@ class LightCache
$data_type = "bool";
$value = json_encode($value);
} else {
throw new ZMException("Only can set string, array and int");
throw new ZMException(zm_internal_errcode("E00049") . "Only can set string, array and int");
}
try {
return self::$kv_table->set($key, [
@@ -158,10 +156,9 @@ class LightCache
* @param $value
* @return bool|mixed
* @throws ZMException
* @noinspection PhpMissingReturnTypeInspection
*/
public static function update(string $key, $value) {
if (self::$kv_table === null) throw new ZMException("not initialized LightCache.");
if (self::$kv_table === null) throw new ZMException(zm_internal_errcode("E00048") . "not initialized LightCache.");
if (is_array($value)) {
$value = json_encode($value, JSON_UNESCAPED_UNICODE);
if (strlen($value) >= self::$config["max_strlen"]) return false;
@@ -171,7 +168,7 @@ class LightCache
} elseif (is_int($value)) {
$data_type = "int";
} else {
throw new ZMException("Only can set string, array and int");
throw new ZMException(zm_internal_errcode("E00048") . "Only can set string, array and int");
}
try {
if (self::$kv_table->get($key) === false) return false;

2
src/ZM/Store/LightCacheInside.php
View File

@@ -67,6 +67,6 @@ class LightCacheInside
self::$kv_table[$name] = new Table($size, $conflict_proportion);
self::$kv_table[$name]->column("value", Table::TYPE_STRING, $str_size);
$r = self::$kv_table[$name]->create();
if ($r === false) throw new ZMException("内存不足，创建静态表失败！");
if ($r === false) throw new ZMException(zm_internal_errcode("E00050") . "内存不足，创建静态表失败！");
}
}

2
src/ZM/Store/Redis/ZMRedisPool.php
View File

@@ -30,7 +30,7 @@ class ZMRedisPool
var_dump($r);
}
} catch (RedisException $e) {
Console::error("Redis init failed! " . $e->getMessage());
Console::error(zm_internal_errcode("E00047") . "Redis init failed! " . $e->getMessage());
self::$pool = null;
}
}

1
src/ZM/Store/ZMAtomic.php
View File

@@ -38,6 +38,7 @@ class ZMAtomic
for ($i = 0; $i < 10; ++$i) {
self::$atomics["_tmp_" . $i] = new Atomic(0);
}
self::$atomics["ss"] = new Atomic(1);
}