Added explicit file unlock. Fix in deleting locked files.

ivopetkov · Nov 11, 2017 · 0e91967 · 0e91967
1 parent d4ddf81
commit 0e91967
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 10 deletions.
diff --git a/src/ObjectStorage.php b/src/ObjectStorage.php
@@ -15,7 +15,7 @@ class ObjectStorage
     /**
      * The current library version
      */
-    const VERSION = '0.3.0';
+    const VERSION = '0.3.1';
 
     /**
      * The directory where the objects will be stored
@@ -437,6 +437,7 @@ public function execute(array $commands): array
                         $filePointer = fopen($filename, "r");
                         flock($filePointer, LOCK_SH);
                         $content = fread($filePointer, filesize($filename));
+                        flock($filePointer, LOCK_UN);
                         fclose($filePointer);
                         return $content;
                     }
@@ -689,6 +690,8 @@ public function execute(array $commands): array
                     };
                 } elseif ($command === 'delete') {
                     $key = $getProperty('key', true);
+                    $prepareFileForWriting($this->objectsDir . $key);
+                    $prepareFileForWriting($this->metadataDir . $key);
                     $functions[$index] = function() use ($key, $deleteFile) {
                         $deleteFile($this->objectsDir . $key);
                         $deleteFile($this->metadataDir . $key);
@@ -923,6 +926,7 @@ public function execute(array $commands): array
         }
 
         foreach ($filePointers as $filename => $filePointer) {
+            flock($filePointer, LOCK_UN);
             fclose($filePointer);
         }
         unset($filePointers);

diff --git a/tests/KeyCollisionTest.php b/tests/KeyCollisionTest.php
@@ -43,14 +43,6 @@ public function testFileWhenThereIsDirWithTheSameKey()
         //echo "\n\n" . var_export($result) . "\n\n" . getState() . "\n\n";
     }
 
-    /**
-     * 
-     */
-    public function testFileWhenThereIsDirWithTheSameKeyCleanUp()
-    {
-        $this->removeDataDir();
-    }
-
     /**
      * 
      */
@@ -84,9 +76,44 @@ public function testDirWhenThereIsFileWithTheSameKey()
     /**
      * 
      */
-    public function testDirWhenThereIsFileWithTheSameKeyCleanUp()
+    public function testGetKeyWhenItsDir()
     {
         $this->removeDataDir();
+
+        $objectStorage = $this->getInstance();
+
+        $this->createFile($this->getDataDir() . '/objects/data1/key1', 'content');
+        $result = $objectStorage->get([
+            'key' => 'data1',
+            'result' => ['key', 'body']
+        ]);
+
+        $this->assertTrue($result === []);
+
+        $this->assertTrue($this->checkState('3fb020a8835e135fb296ad20b43ba773
+objects/data1/key1: content
+'));
+    }
+
+    /**
+     * 
+     */
+    public function testDeleteKeyWhenItsDir()
+    {
+        $this->removeDataDir();
+
+        $objectStorage = $this->getInstance();
+
+        $this->createFile($this->getDataDir() . '/objects/data1/key1', 'content');
+
+        $this->assertTrue($this->checkState('3fb020a8835e135fb296ad20b43ba773
+objects/data1/key1: content
+'));
+
+        $this->setExpectedException('\IvoPetkov\ObjectStorage\ErrorException');
+        $objectStorage->delete([
+            'key' => 'data1'
+        ]);
     }
 
 }
diff --git a/tests/LocksTest.php b/tests/LocksTest.php
@@ -47,4 +47,26 @@ public function testLockedKeys2()
         );
     }
 
+    /**
+     * 
+     */
+    public function testLockedKeys3()
+    {
+        $this->removeDataDir();
+        $objectStorage = new \IvoPetkov\ObjectStorage($this->getDataDir());
+        $objectStorage->set(
+                [
+                    'key' => 'lockeddata3',
+                    'body' => 'data'
+                ]
+        );
+        $this->lockFile('lockeddata3');
+        $this->setExpectedException('\IvoPetkov\ObjectStorage\ObjectLockedException');
+        $objectStorage->delete(
+                [
+                    'key' => 'lockeddata3',
+                ]
+        );
+    }
+
 }