WIP

Author: kai-init

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "kai-init/laravel-normcache",
-    "description": "Redis-backed normalized query caching for Laravel Eloquent and Query Builder.",
+    "description": "Redis-backed normalized query caching for Laravel Eloquent.",
     "type": "library",
     "license": "MIT",
     "authors": [
@@ -61,4 +61,4 @@
             }
         }
     }
-}
+}

config/normcache.php

@@ -8,25 +8,10 @@
 
     'row_ttl' => (int) env('NORMCACHE_ROW_TTL', 604800),
     'query_ttl' => (int) env('NORMCACHE_QUERY_TTL', 3600),
-    'schema_ttl' => (int) env('NORMCACHE_SCHEMA_TTL', 86400),
 
     // Set to 0 to disable automatic result overlays.
     'auto_overlay_max_rows' => 1000,
 
-    // Each group requires connection, database, and table metadata. Add schema to
-    // restrict a PostgreSQL or SQL Server match. Types are integer or string.
-    'primary_keys' => [
-        // [
-        //     'connection' => 'pgsql',
-        //     'database' => 'app',
-        //     'schema' => 'public',
-        //     'tables' => [
-        //         'events' => ['column' => 'event_id', 'type' => 'string'],
-        //         'orders' => ['column' => 'order_id', 'type' => 'integer'],
-        //     ],
-        // ],
-    ],
-
     'max_precise_invalidation_keys' => 1000,
 
     'building_lock_ttl' => 5,

pint.json

@@ -1,15 +1,14 @@
 {
     "preset": "laravel",
-    "exclude": [
-        "docs",
-        "tests/Benchmark",
-        "tests/Concerns",
-        "tests/Fixtures/database"
-    ],
+    "exclude": [],
     "rules": {
         "not_operator_with_successor_space": false,
         "phpdoc_single_line_var_spacing": false,
-        "concat_space": {"spacing": "one"},
-        "function_declaration": {"closure_fn_spacing": "none"}
+        "concat_space": {
+            "spacing": "one"
+        },
+        "function_declaration": {
+            "closure_fn_spacing": "none"
+        }
     }
-}
+}

src/Cache/CacheRuntime.php

@@ -17,8 +17,6 @@ final class CacheRuntime
 
     private ?float $epochReadAt = null;
 
-    private ?string $schemaEpoch = null;
-
     private ?bool $runtimeDisabled = null;
 
     public function __construct(
@@ -123,39 +121,16 @@ public function fail(\Throwable $exception): void
         $this->failures->cacheUnavailable($exception);
     }
 
-    public function schemaEpoch(): string
-    {
-        if ($this->schemaEpoch !== null) {
-            return $this->schemaEpoch;
-        }
-
-        $this->resolveState();
-
-        return $this->schemaEpoch ??= $this->store->getRaw($this->keys->schemaEpoch()) ?? '0';
-    }
-
-    public function rememberSchemaEpoch(string $epoch): void
-    {
-        $this->schemaEpoch = $epoch;
-    }
-
-    public function forgetSchemaEpoch(): void
-    {
-        $this->schemaEpoch = null;
-    }
-
     /** @return array{0: string, 1: bool} */
     private function resolveState(): array
     {
         if ($this->epoch === null || $this->epochExpired()) {
             $epochKey = $this->keys->epoch();
             $disabledKey = $this->keys->disabled();
-            $schemaEpochKey = $this->keys->schemaEpoch();
-            $values = $this->store->mget([$epochKey, $disabledKey, $schemaEpochKey]);
+            $values = $this->store->mget([$epochKey, $disabledKey]);
             $this->epoch = $values[$epochKey] ?? '0';
             $this->epochReadAt = microtime(true);
             $this->runtimeDisabled ??= ($values[$disabledKey] ?? null) !== null;
-            $this->schemaEpoch ??= $values[$schemaEpochKey] ?? '0';
         }
 
         return [$this->epoch, $this->runtimeDisabled ?? false];

src/Cache/CacheStateResolver.php

@@ -15,12 +15,6 @@ public function __construct(
         private CacheKeyBuilder $keys,
     ) {}
 
-    /**
-     * Feed the values back to resolve() as $prefetched; unmatched arguments there
-     * would silently resolve missing keys to version '0'.
-     *
-     * @return list<string>
-     */
     public function pendingStateKeys(QueryPlan $plan, string $namespace): array
     {
         return $this->pendingKeys($plan, $namespace)['all'];