snappy && fix journal

jakubvojacek · Jul 23, 2020 · f30caf2 · f30caf2
1 parent d3e572f
commit f30caf2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/Kdyby/Redis/RedisJournal.php b/src/Kdyby/Redis/RedisJournal.php
@@ -69,6 +69,10 @@ public function write(string $key, array $dp): void
 			$this->client->zAdd($this->formatKey(self::PRIORITY), $dp[Cache::PRIORITY], $key);
 		}
 
+		if (isset($dp[Cache::EXPIRE])) {
+			$this->client->send('expire', [$this->formatKey($key, self::TAGS), $dp[Cache::EXPIRE]]);
+		}
+
 		$this->client->exec();
 	}
 
@@ -90,8 +94,7 @@ private function cleanEntry($keys): void
 			}
 
 			// drop tags of entry and priority, in case there are some
-			$this->client->del($this->formatKey($key, self::TAGS), $this->formatKey($key, self::PRIORITY));
-			$this->client->zRem($this->formatKey(self::PRIORITY), $key);
+			$this->client->del($this->formatKey($key, self::TAGS));
 
 			$this->client->exec();
 		}

diff --git a/src/Kdyby/Redis/RedisStorage.php b/src/Kdyby/Redis/RedisStorage.php
@@ -216,6 +216,7 @@ public function write(string $key, $data, array $dp): void
 		}
 
 		$store = \json_encode($meta) . Cache::NAMESPACE_SEPARATOR . $data;
+		$store = \snappy_compress($store);
 
 		try {
 			if (isset($dp[Cache::EXPIRATION])) {
@@ -334,6 +335,7 @@ private function doMultiRead(array $keys): array
 	 */
 	private static function processStoredValue(string $key, string $storedValue): array
 	{
+		$storedValue = \snappy_uncompress($storedValue);
 		[$meta, $data] = \explode(Cache::NAMESPACE_SEPARATOR, $storedValue, 2) + [NULL, NULL];
 		return [[self::KEY => $key] + \json_decode($meta, TRUE), $data];
 	}