use borrowed deserialization

Author: isabelatkinson

src/error.rs

@@ -741,18 +741,6 @@ pub enum GridFsFileIdentifier {
     Id(Bson),
 }
 
-impl From<&str> for GridFsFileIdentifier {
-    fn from(filename: &str) -> Self {
-        Self::Filename(filename.into())
-    }
-}
-
-impl From<Bson> for GridFsFileIdentifier {
-    fn from(id: Bson) -> Self {
-        Self::Id(id)
-    }
-}
-
 /// Translates ErrorKind::BulkWriteError cases to ErrorKind::WriteErrors, leaving all other errors
 /// untouched.
 pub(crate) fn convert_bulk_errors(error: Error) -> Error {

src/gridfs.rs

@@ -14,7 +14,7 @@ use serde::{Deserialize, Serialize};
 use tokio::io::ReadBuf;
 
 use crate::{
-    bson::{doc, oid::ObjectId, Binary, Bson, DateTime, Document},
+    bson::{doc, oid::ObjectId, Bson, DateTime, Document, RawBinaryRef},
     concern::{ReadConcern, WriteConcern},
     cursor::Cursor,
     error::Result,
@@ -30,13 +30,13 @@ pub const DEFAULT_CHUNK_SIZE_BYTES: u32 = 255 * 1024;
 
 // Contained in a "chunks" collection for each user file
 #[derive(Debug, Deserialize, Serialize)]
-struct Chunk {
+struct Chunk<'a> {
     #[serde(rename = "_id")]
     id: ObjectId,
     files_id: Bson,
     n: u32,
-    // default size is 255 KiB
-    data: Binary,
+    #[serde(borrow)]
+    data: RawBinaryRef<'a>,
 }
 
 /// A collection in which information about stored files is stored. There will be one files
@@ -59,7 +59,7 @@ pub struct FilesCollectionDocument {
 struct GridFsBucketInner {
     options: GridFsBucketOptions,
     files: Collection<FilesCollectionDocument>,
-    chunks: Collection<Chunk>,
+    chunks: Collection<Chunk<'static>>,
     created_indexes: AtomicBool,
 }
 

src/gridfs/download.rs

@@ -4,7 +4,7 @@ use tokio_util::compat::FuturesAsyncWriteCompatExt;
 use super::{options::GridFsDownloadByNameOptions, FilesCollectionDocument, GridFsBucket};
 use crate::{
     bson::{doc, Bson},
-    error::{ErrorKind, GridFsErrorKind, Result},
+    error::{ErrorKind, GridFsErrorKind, GridFsFileIdentifier, Result},
     options::{FindOneOptions, FindOptions},
 };
 
@@ -29,7 +29,7 @@ impl GridFsBucket {
             Some(fcd) => fcd,
             None => {
                 return Err(ErrorKind::GridFs(GridFsErrorKind::FileNotFound {
-                    identifier: id.into(),
+                    identifier: GridFsFileIdentifier::Id(id),
                 })
                 .into());
             }
@@ -92,7 +92,7 @@ impl GridFsBucket {
                     );
                 } else {
                     return Err(ErrorKind::GridFs(GridFsErrorKind::FileNotFound {
-                        identifier: filename.as_ref().into(),
+                        identifier: GridFsFileIdentifier::Filename(filename.as_ref().into()),
                     })
                     .into());
                 }
@@ -141,8 +141,7 @@ impl GridFsBucket {
             .selection_criteria(self.selection_criteria().cloned())
             .build();
         let mut cursor = self
-            .inner
-            .chunks
+            .chunks()
             .find(doc! { "files_id": &file.id }, options)
             .await?;
 
@@ -164,7 +163,7 @@ impl GridFsBucket {
                 .into());
             }
 
-            destination.write_all(&chunk.data.bytes).await?;
+            destination.write_all(chunk.data.bytes).await?;
             n += 1;
         }