Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-26 17:50:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added Unittests for cache

Browse source 
fixed Lock & Cache bugs
This commit is contained in:
Philipp Holzer 2018-07-07 19:46:16 +02:00
parent 1dafaa69c5
commit 80a4e6263f
No known key found for this signature in database
GPG key ID: 58160D7D6AF942B6
18 changed files with 317 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Core/Cache/ArrayCache.php
View file

@ -51,7 +51,7 @@ class ArrayCache extends AbstractCacheDriver implements IMemoryCacheDriver
/**
* (@inheritdoc)
*/
public function clear()
public function clear($outdated = true)
{
$this->cachedData = [];
return true;

10
src/Core/Cache/DatabaseCacheDriver.php
View file

@ -37,7 +37,7 @@ class DatabaseCacheDriver extends AbstractCacheDriver implements ICacheDriver
{
$fields = [
'v' => serialize($value),
'expires' => DateTimeFormat::utc('now + ' . $ttl . ' seconds'),
'expires' => DateTimeFormat::utc('now + ' . $ttl . 'seconds'),
'updated' => DateTimeFormat::utcNow()
];
@ -49,8 +49,12 @@ class DatabaseCacheDriver extends AbstractCacheDriver implements ICacheDriver
return dba::delete('cache', ['k' => $key]);
}
public function clear()
public function clear($outdated = true)
{
return dba::delete('cache', ['`expires` < NOW()']);
if ($outdated) {
return dba::delete('cache', ['`expires` < NOW()']);
} else {
return dba::delete('cache', ['`k` IS NOT NULL ']);
}
}
}

3
src/Core/Cache/ICacheDriver.php
View file

@ -42,8 +42,9 @@ interface ICacheDriver
/**
* Remove outdated data from the cache
* @param boolean $outdated just remove outdated values
*
* @return bool
*/
public function clear();
public function clear($outdated = true);
}

8
src/Core/Cache/MemcacheCacheDriver.php
View file

@ -96,9 +96,13 @@ class MemcacheCacheDriver extends AbstractCacheDriver implements IMemoryCacheDri
/**
* (@inheritdoc)
*/
public function clear()
public function clear($outdated = true)
{
return $this->memcache->flush();
if ($outdated) {
return true;
} else {
return $this->memcache->flush();
}
}
/**

10
src/Core/Cache/MemcachedCacheDriver.php
View file

@ -58,7 +58,7 @@ class MemcachedCacheDriver extends AbstractCacheDriver implements IMemoryCacheDr
return $this->memcached->set(
$cachekey,
$value,
time() + $ttl
$ttl
);
} else {
return $this->memcached->set(
@ -75,9 +75,13 @@ class MemcachedCacheDriver extends AbstractCacheDriver implements IMemoryCacheDr
return $this->memcached->delete($cachekey);
}
public function clear()
public function clear($outdated = true)
{
return $this->memcached->flush();
if ($outdated) {
return true;
} else {
return $this->memcached->flush();
}
}
/**

13
src/Core/Cache/RedisCacheDriver.php
View file

@ -61,7 +61,7 @@ class RedisCacheDriver extends AbstractCacheDriver implements IMemoryCacheDriver
if ($ttl > 0) {
return $this->redis->setex(
$cachekey,
time() + $ttl,
$ttl,
$cached
);
} else {
@ -78,12 +78,15 @@ class RedisCacheDriver extends AbstractCacheDriver implements IMemoryCacheDriver
return ($this->redis->delete($cachekey) > 0);
}
public function clear()
public function clear($outdated = true)
{
return $this->redis->flushAll();
if ($outdated) {
return true;
} else {
return $this->redis->flushAll();
}
}
/**
* (@inheritdoc)
*/
@ -92,7 +95,7 @@ class RedisCacheDriver extends AbstractCacheDriver implements IMemoryCacheDriver
$cachekey = $this->getCacheKey($key);
$cached = json_encode($value);
return $this->redis->setnx($cachekey, $value);
return $this->redis->setnx($cachekey, $cached);
}
/**