storage: remove Option in DatabaseStorageTransaction

Author: pietroalbini

src/storage/database.rs

@@ -79,25 +79,20 @@ impl DatabaseConnection {
         &self,
     ) -> Result<DatabaseStorageTransaction<'_>, Error> {
         Ok(DatabaseStorageTransaction {
-            transaction: Some(self.conn.transaction()?),
+            transaction: self.conn.transaction()?,
         })
     }
 }
 
 pub(super) struct DatabaseStorageTransaction<'a> {
-    transaction: Option<Transaction<'a>>,
+    transaction: Transaction<'a>,
 }
 
 impl<'a> StorageTransaction for DatabaseStorageTransaction<'a> {
     fn store_batch(&mut self, batch: &[Blob]) -> Result<(), Error> {
-        let transaction = self
-            .transaction
-            .as_ref()
-            .expect("called complete() before store_batch()");
-
         for blob in batch {
             let compression = blob.compression.map(|alg| alg as i32);
-            transaction.query(
+            self.transaction.query(
                 "INSERT INTO files (path, mime, content, compression)
                  VALUES ($1, $2, $3, $4)
                  ON CONFLICT (path) DO UPDATE
@@ -108,11 +103,8 @@ impl<'a> StorageTransaction for DatabaseStorageTransaction<'a> {
         Ok(())
     }
 
-    fn complete(&mut self) -> Result<(), Error> {
-        self.transaction
-            .take()
-            .expect("called complete() multiple times")
-            .commit()?;
+    fn complete(self: Box<Self>) -> Result<(), Error> {
+        self.transaction.commit()?;
         Ok(())
     }
 }
@@ -193,7 +185,7 @@ mod tests {
             };
 
             let conn = backend.start_connection()?;
-            let mut transaction = conn.start_storage_transaction()?;
+            let mut transaction = Box::new(conn.start_storage_transaction()?);
             transaction.store_batch(std::slice::from_ref(&small_blob))?;
             transaction.store_batch(std::slice::from_ref(&big_blob))?;
             transaction.complete()?;

src/storage/mod.rs

@@ -226,7 +226,7 @@ impl std::fmt::Debug for Storage {
 
 trait StorageTransaction {
     fn store_batch(&mut self, batch: &[Blob]) -> Result<(), Error>;
-    fn complete(&mut self) -> Result<(), Error>;
+    fn complete(self: Box<Self>) -> Result<(), Error>;
 }
 
 // public for benchmarking

src/storage/s3.rs

@@ -115,7 +115,7 @@ impl<'a> StorageTransaction for S3StorageTransaction<'a> {
         Ok(())
     }
 
-    fn complete(&mut self) -> Result<(), Error> {
+    fn complete(self: Box<Self>) -> Result<(), Error> {
         Ok(())
     }
 }

src/storage/s3/test.rs

@@ -25,7 +25,7 @@ impl TestS3 {
     }
     pub(crate) fn upload(&self, blobs: &[Blob]) -> Result<(), Error> {
         let s3 = self.0.borrow();
-        let mut transaction = s3.start_storage_transaction()?;
+        let mut transaction = Box::new(s3.start_storage_transaction()?);
         transaction.store_batch(blobs)?;
         transaction.complete()?;
         Ok(())