devsam/core
3
6
Fork 1
Code Issues 60 Pull Requests Releases 1 Wiki Activity

KVStorage를 무조건 소문자만 받도록 설정

Browse Source
This commit is contained in:
Hide_D
2018-05-21 01:32:30 +09:00
parent 913b308892
commit a80442399d
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sammo/KVStorage.php
+12 -6
View File
@@ -63,6 +63,7 @@ class KVStorage{
} }
public function invalidateCacheValue($key):self{ public function invalidateCacheValue($key):self{
$key = mb_strtolower($key);
if($this->cacheData === null){ if($this->cacheData === null){
return $this; return $this;
} }
@@ -76,6 +77,8 @@ class KVStorage{
if($this->cacheData === null){ if($this->cacheData === null){
return $this; return $this;
} }
$keys = array_map('mb_strtolower', $keys);
foreach($keys as $key){ foreach($keys as $key){
if(key_exists($key, $this->cacheData)){ if(key_exists($key, $this->cacheData)){
unset($this->cacheData[$key]); unset($this->cacheData[$key]);
@@ -97,6 +100,7 @@ class KVStorage{
if($this->cacheData === null){ if($this->cacheData === null){
$this->cacheData = []; $this->cacheData = [];
} }
$keys = array_map('mb_strtolower', $keys);
if($invalidateAll){ if($invalidateAll){
$notExists = $keys; $notExists = $keys;
@@ -141,6 +145,7 @@ class KVStorage{
if(!$keys){ if(!$keys){
return []; return [];
} }
$keys = array_map('mb_strtolower', $keys);
$dictResult = $this->getValues($keys, $onlyCache); $dictResult = $this->getValues($keys, $onlyCache);
$result = []; $result = [];
foreach($keys as $key){ foreach($keys as $key){
@@ -153,6 +158,7 @@ class KVStorage{
if(!$keys){ if(!$keys){
return []; return [];
} }
$keys = array_map('mb_strtolower', $keys);
if ($this->cacheData === null) { if ($this->cacheData === null) {
return $this->getDBValues($keys); return $this->getDBValues($keys);
} }
@@ -187,6 +193,7 @@ class KVStorage{
} }
public function getValue($key, bool $onlyCache=false){ public function getValue($key, bool $onlyCache=false){
$key = mb_strtolower($key);
if($this->cacheData !== null && ($onlyCache || key_exists($key, $this->cacheData))){ if($this->cacheData !== null && ($onlyCache || key_exists($key, $this->cacheData))){
return $this->cacheData[$key] ?? null; return $this->cacheData[$key] ?? null;
} }
@@ -199,6 +206,7 @@ class KVStorage{
} }
public function setValue($key, $value):self{ public function setValue($key, $value):self{
$key = mb_strtolower($key);
if($value === null){ if($value === null){
return $this->deleteValue($key); return $this->deleteValue($key);
} }
@@ -210,6 +218,7 @@ class KVStorage{
} }
public function deleteValue($key):self{ public function deleteValue($key):self{
$key = mb_strtolower($key);
if(isset($this->cacheData[$key])){ if(isset($this->cacheData[$key])){
unset($this->cacheData[$key]); unset($this->cacheData[$key]);
} }
@@ -234,7 +243,6 @@ class KVStorage{
return []; return [];
} }
$result = []; $result = [];
$keys = array_map('strval', $keys);
foreach($this->db->queryAllLists( foreach($this->db->queryAllLists(
'SELECT `key`, `value` FROM %b WHERE `namespace`=%s AND `key` IN %ls', 'SELECT `key`, `value` FROM %b WHERE `namespace`=%s AND `key` IN %ls',
$this->tableName, $this->tableName,
@@ -252,8 +260,7 @@ class KVStorage{
return $result; return $result;
} }
private function getDBValue($key){ private function getDBValue(string $key){
$key = (string)$key;
$value = $this->db->queryFirstField( $value = $this->db->queryFirstField(
'SELECT `value` FROM %b WHERE `namespace`=%s AND `key`=%s', 'SELECT `value` FROM %b WHERE `namespace`=%s AND `key`=%s',
$this->tableName, $this->tableName,
@@ -266,7 +273,7 @@ class KVStorage{
return Json::decode($value); return Json::decode($value);
} }
private function setDBValue($key, $value):self{ private function setDBValue(string $key, $value):self{
if($value === null){ if($value === null){
return $this->deleteDBValue($key); return $this->deleteDBValue($key);
} }
@@ -278,8 +285,7 @@ class KVStorage{
return $this; return $this;
} }
private function deleteDBValue($key):self{ private function deleteDBValue(string $key):self{
$key = (string)$key;
$this->db->delete( $this->db->delete(
$this->tableName, $this->tableName,
'`namespace`=%s AND `key`=%s', '`namespace`=%s AND `key`=%s',