Merge pull request #22 from daniel-sc/master

fix: mongodb - Indices + error handling

Author: AidasK

src/Flow/Mongo/MongoConfig.php

@@ -4,6 +4,9 @@
 
 use Flow\Config;
 
+/**
+ * @codeCoverageIgnore
+ */
 class MongoConfig extends Config implements MongoConfigInterface
 {
     private $gridFs;

src/Flow/Mongo/MongoConfigInterface.php

@@ -5,7 +5,7 @@
 use Flow\ConfigInterface;
 
 /**
- * @package Flow
+ * @codeCoverageIgnore
  */
 interface MongoConfigInterface extends ConfigInterface
 {

src/Flow/Mongo/MongoFile.php

@@ -14,7 +14,7 @@
  * - Chunk preprocessor not supported (must not modify chunks size)!
  * - Must use 'forceChunkSize=true' on client side.
  *
- * @package Flow
+ * @codeCoverageIgnore
  */
 class MongoFile extends File
 {
@@ -44,7 +44,7 @@ protected function getGridFsFile()
             $changed = $gridFsFileQuery;
             $changed['flowUpdated'] = new \MongoDate();
             $this->uploadGridFsFile = $this->config->getGridFs()->findAndModify($gridFsFileQuery, $changed, null,
-                ['upsert' => true]);
+                ['upsert' => true, 'new' => true]);
         }
 
         return $this->uploadGridFsFile;
@@ -69,8 +69,8 @@ public function checkChunk()
 
     /**
      * Save chunk
-     *
      * @return bool
+     * @throws \Exception if upload size is invalid or some other unexpected error occurred.
      */
     public function saveChunk()
     {
@@ -90,13 +90,19 @@ public function saveChunk()
             ) {
                 throw new \Exception("Invalid upload! (size: {$actualChunkSize})");
             }
-            $chunk['data'] = new \MongoBinData($data);
+            $chunk['data'] = new \MongoBinData($data, 0); // \MongoBinData::GENERIC is not defined for older mongo drivers
             $this->config->getGridFs()->chunks->findAndModify($chunkQuery, $chunk, [], ['upsert' => true]);
             unlink($file['tmp_name']);
 
+            $this->ensureIndices();
+
             return true;
         } catch (\Exception $e) {
-            return false;
+            // try to remove a possibly (partly) stored chunk:
+            if (isset($chunkQuery)) {
+                $this->config->getGridFs()->chunks->remove($chunkQuery);
+            }
+            throw $e;
         }
     }
 
@@ -147,6 +153,18 @@ public function deleteChunks()
         // nothing to do, as chunks are directly part of the final file
     }
 
+    public function ensureIndices()
+    {
+        $chunksCollection = $this->config->getGridFs()->chunks;
+        $indexKeys = ['files_id' => 1, 'n' => 1];
+        $indexOptions = ['unique' => true, 'background' => true];
+        if(method_exists($chunksCollection, 'createIndex')) { // only available for PECL mongo >= 1.5.0
+            $chunksCollection->createIndex($indexKeys, $indexOptions);
+        } else {
+            $chunksCollection->ensureIndex($indexKeys, $indexOptions);
+        }
+    }
+
     /**
      * @return array
      */
@@ -160,4 +178,4 @@ protected function getGridFsFileQuery()
             'length' => intval($this->request->getTotalSize())
         ];
     }
-}
+}

src/Flow/Mongo/MongoUploader.php

@@ -4,6 +4,9 @@
 
 use Flow\FileOpenException;
 
+/**
+ * @codeCoverageIgnore
+ */
 class MongoUploader
 {
     /**