Added probabilistic cleaning to SQLiteStorage - addresses Issue #83

.github/workflows/static-analysis.yml

@@ -13,7 +13,7 @@ jobs:
             - uses: actions/checkout@v4
             - uses: shivammathur/setup-php@v2
               with:
-                  php-version: 8.0
+                  php-version: 8.1
                   coverage: none
 
             - run: composer install --no-progress --prefer-dist

.github/workflows/tests.yml

@@ -7,7 +7,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                php: ['8.0', '8.1', '8.2', '8.3', '8.4']
+                php: ['8.1', '8.2', '8.3', '8.4']
 
             fail-fast: false
 
@@ -37,7 +37,7 @@ jobs:
             - uses: actions/checkout@v4
             - uses: shivammathur/setup-php@v2
               with:
-                  php-version: 8.0
+                  php-version: 8.1
                   coverage: none
 
             - run: composer update --no-progress --prefer-dist --prefer-lowest --prefer-stable
@@ -52,7 +52,7 @@ jobs:
             - uses: actions/checkout@v4
             - uses: shivammathur/setup-php@v2
               with:
-                  php-version: 8.0
+                  php-version: 8.1
                   coverage: none
 
             - run: composer install --no-progress --prefer-dist

composer.json

@@ -15,19 +15,19 @@
 		}
 	],
 	"require": {
-		"php": "8.0 - 8.4",
+		"php": "8.1 - 8.4",
 		"nette/utils": "^4.0"
 	},
 	"require-dev": {
 		"nette/tester": "^2.4",
 		"nette/di": "^3.1 || ^4.0",
-		"latte/latte": "^2.11 || ^3.0.12",
+		"latte/latte": "^3.0.12",
 		"tracy/tracy": "^2.9",
 		"psr/simple-cache": "^2.0 || ^3.0",
 		"phpstan/phpstan-nette": "^2.0@stable"
 	},
 	"conflict": {
-		"latte/latte": ">=3.0.0 <3.0.12"
+		"latte/latte": "<3.0.12"
 	},
 	"suggest": {
 		"ext-pdo_sqlite": "to use SQLiteStorage or SQLiteJournal"
@@ -45,7 +45,7 @@
 	},
 	"extra": {
 		"branch-alias": {
-			"dev-master": "3.3-dev"
+			"dev-master": "4.0-dev"
 		}
 	}
 }

readme.md

@@ -33,7 +33,7 @@ Installation
 composer require nette/caching
 ```
 
-It requires PHP version 8.0 and supports PHP up to 8.4.
+It requires PHP version 8.1 and supports PHP up to 8.4.
 
 
 Basic Usage

src/Bridges/CacheDI/CacheExtension.php

@@ -45,13 +45,5 @@ public function loadConfiguration(): void
 		$builder->addDefinition($this->prefix('storage'))
 			->setType(Nette\Caching\Storage::class)
 			->setFactory(Nette\Caching\Storages\FileStorage::class, [$this->tempDir]);
-
-		if ($this->name === 'cache') {
-			if (extension_loaded('pdo_sqlite')) {
-				$builder->addAlias('nette.cacheJournal', $this->prefix('journal'));
-			}
-
-			$builder->addAlias('cacheStorage', $this->prefix('storage'));
-		}
 	}
 }

src/Caching/Cache.php

@@ -65,9 +65,7 @@ class Cache
 	public const ALL = self::All;
 
 	/** @internal */
-	public const
-		NamespaceSeparator = "\x00",
-		NAMESPACE_SEPARATOR = self::NamespaceSeparator;
+	public const NamespaceSeparator = "\x00";
 
 	private Storage $storage;
 	private string $namespace;
@@ -386,6 +384,7 @@ public function capture(mixed $key): ?OutputHelper
 	 */
 	public function start($key): ?OutputHelper
 	{
+		trigger_error(__METHOD__ . '() was renamed to capture()', E_USER_DEPRECATED);
 		return $this->capture($key);
 	}
 
@@ -395,7 +394,7 @@ public function start($key): ?OutputHelper
 	 */
 	protected function generateKey($key): string
 	{
-		return $this->namespace . md5(is_scalar($key) ? (string) $key : serialize($key));
+		return $this->namespace . hash('xxh128', is_scalar($key) ? (string) $key : serialize($key));
 	}
 
 

src/Caching/Storage.php

@@ -17,9 +17,8 @@ interface Storage
 {
 	/**
 	 * Read from cache.
-	 * @return mixed
 	 */
-	function read(string $key);
+	function read(string $key): mixed;
 
 	/**
 	 * Prevents item reading and writing. Lock is released by write() or remove().

src/Caching/Storages/SQLiteStorage.php

@@ -21,6 +21,8 @@ class SQLiteStorage implements Nette\Caching\Storage, Nette\Caching\BulkReader
 {
 	private \PDO $pdo;
 
+	/** probability that the clean() routine is started */
+	public static float $gcProbability = 0.001;
 
 	public function __construct(string $path)
 	{
@@ -46,6 +48,12 @@ public function __construct(string $path)
 			CREATE INDEX IF NOT EXISTS tags_tag ON tags(tag);
 			PRAGMA synchronous = OFF;
 		');
+
+		// should we run the clean function to remove expired cached items?
+		if (mt_rand() / mt_getrandmax() < static::$gcProbability) {
+			$this->clean([]);
+		}
+
 	}
 
 

tests/Bridges.DI/CacheExtension.phpt

@@ -28,8 +28,4 @@ test('', function () {
 
 	$storage = $container->getService('cache.storage');
 	Assert::type(Nette\Caching\Storages\FileStorage::class, $storage);
-
-	// aliases
-	Assert::same($journal, $container->getService('nette.cacheJournal'));
-	Assert::same($storage, $container->getService('cacheStorage'));
 });