verify the symfony cache works

Author: bshaffer

Spanner/composer.json

@@ -19,7 +19,8 @@
         "google/cloud-pubsub": "^2.0",
         "dg/bypass-finals": "^1.7",
         "dms/phpunit-arraysubset-asserts": "^0.5.0",
-        "symfony/process": "^6.4"
+        "symfony/process": "^6.4",
+        "symfony/cache": " ^6.4"
     },
     "suggest": {
         "ext-protobuf": "Provides a significant increase in throughput over the pure PHP protobuf implementation. See https://cloud.google.com/php/grpc for installation instructions.",

Spanner/src/Session/SessionCache.php

@@ -188,11 +188,11 @@ private function isExpired(): bool
      */
     private function getDefaultLock(string $cacheKey): LockInterface
     {
-        // if ($this->isSysvIPCLoaded()) {
-        //     return new SemaphoreLock(
-        //         $this->getSysvKey(crc32($cacheKey))
-        //     );
-        // }
+        if ($this->isSysvIPCLoaded()) {
+            return new SemaphoreLock(
+                $this->getSysvKey(crc32($cacheKey))
+            );
+        }
 
         return new FlockLock($cacheKey);
     }

Spanner/tests/Unit/Session/SessionCacheTest.php

@@ -27,6 +27,7 @@
 use Prophecy\PhpUnit\ProphecyTrait;
 use Psr\Cache\CacheItemInterface;
 use Psr\Cache\CacheItemPoolInterface;
+use Symfony\Component\Cache\Adapter\FilesystemAdapter;
 use Symfony\Component\Process\Process;
 
 /**
@@ -179,7 +180,8 @@ public function testCacheLocking()
         $sessionCache = new SessionCache(
             $this->spannerClient->reveal(),
             $databaseName,
-            ['cacheItemPool' => new FileSystemCacheItemPool($cachePath)],
+            // ['cacheItemPool' => new FileSystemCacheItemPool($cachePath)],
+            ['cacheItemPool' => new FilesystemAdapter($databaseId)]
         );
 
         $process = new Process(['php', __DIR__ . '/lock_test_process.php', $databaseName, $cachePath]);

Spanner/tests/Unit/Session/lock_test_process.php

@@ -9,6 +9,7 @@
 use Google\Cloud\Spanner\V1\Client\SpannerClient;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Component\Cache\Adapter\FilesystemAdapter;
 
 /**
  * Runs a process which is designed to wait while a session is acquired.
@@ -59,10 +60,12 @@ public function run(): string
             ->will(function () {
                 throw new \Exception('createSession called in child process - this shouldn\'t happen');
             });
+        $parts = explode('/', $this->databaseName);
         $sessionCache = new SessionCache(
             $spannerClient->reveal(),
             $this->databaseName,
-            ['cacheItemPool' => new FileSystemCacheItemPool($this->cachePath)]
+            // ['cacheItemPool' => new FileSystemCacheItemPool($this->cachePath)]
+            ['cacheItemPool' => new FilesystemAdapter(array_pop($parts))]
         );
         // 2. FORCIBLY UNREGISTER the bypass stream wrapper (file)
         if (stream_wrapper_unregister('file')) {