Page MenuHomePhabricator
Files F15409778

D9079.id21576.diff
No OneTemporary
Actions

D9079.id21576.diff
View Options

diff --git a/src/cache/PhutilKeyValueCacheInRequest.php b/src/cache/PhutilKeyValueCacheInRequest.php
--- a/src/cache/PhutilKeyValueCacheInRequest.php
+++ b/src/cache/PhutilKeyValueCacheInRequest.php
@@ -19,6 +19,22 @@
private $cache = array();
private $ttl = array();
+ private $limit = 0;
+
+
+ /**
+ * Set a limit on the number of keys this cache may contain.
+ *
+ * When too many keys are inserted, the oldest keys are removed from the
+ * cache. Setting a limit of `0` disables the cache.
+ *
+ * @param int Maximum number of items to store in the cache.
+ * @return this
+ */
+ public function setLimit($limit) {
+ $this->limit = $limit;
+ return $this;
+ }
/* -( Key-Value Cache Implementation )------------------------------------- */
@@ -45,7 +61,11 @@
}
public function setKeys(array $keys, $ttl = null) {
- $this->cache = $keys + $this->cache;
+
+ foreach ($keys as $key => $value) {
+ $this->cache[$key] = $value;
+ }
+
if ($ttl) {
$end = time() + $ttl;
foreach ($keys as $key => $value) {
@@ -57,6 +77,23 @@
}
}
+ if ($this->limit) {
+ $count = count($this->cache);
+ if ($count > $this->limit) {
+ $remove = array();
+ foreach ($this->cache as $key => $value) {
+ $remove[] = $key;
+
+ $count--;
+ if ($count <= $this->limit) {
+ break;
+ }
+ }
+
+ $this->deleteKeys($remove);
+ }
+ }
+
return $this;
}
diff --git a/src/cache/__tests__/PhutilKeyValueCacheTestCase.php b/src/cache/__tests__/PhutilKeyValueCacheTestCase.php
--- a/src/cache/__tests__/PhutilKeyValueCacheTestCase.php
+++ b/src/cache/__tests__/PhutilKeyValueCacheTestCase.php
@@ -8,6 +8,37 @@
$cache->destroyCache();
}
+ public function testInRequestCacheLimit() {
+ $cache = new PhutilKeyValueCacheInRequest();
+ $cache->setLimit(4);
+
+ $cache->setKey(1, 1);
+ $cache->setKey(2, 2);
+ $cache->setKey(3, 3);
+ $cache->setKey(4, 4);
+
+ $this->assertEqual(
+ array(
+ 1 => 1,
+ 2 => 2,
+ 3 => 3,
+ 4 => 4,
+ ),
+ $cache->getAllKeys());
+
+
+ $cache->setKey(5, 5);
+
+ $this->assertEqual(
+ array(
+ 2 => 2,
+ 3 => 3,
+ 4 => 4,
+ 5 => 5,
+ ),
+ $cache->getAllKeys());
+ }
+
public function testOnDiskCache() {
$cache = new PhutilKeyValueCacheOnDisk();
$cache->setCacheFile(new TempFile());

File Metadata

Mime Type
text/plain
Expires
Thu, Mar 20, 5:14 AM (2 w, 2 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7372237
Default Alt Text
D9079.id21576.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility