Merge pull request #59 from skunkteam/Virtual-branch

refactor: Simplified cloning in FirestoreDatabase and Query
skunkteam · Mar 22, 2024 · 143dff4 · 143dff4
2 parents 168856a + 4c1bb08
commit 143dff4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/crates/firestore-database/src/database.rs b/crates/firestore-database/src/database.rs
@@ -81,14 +81,14 @@ impl FirestoreDatabase {
             txn.read_doc(name)
                 .await?
                 .version_for_consistency(consistency)?
-                .map(Arc::clone)
+                .cloned()
         } else {
             self.get_doc_meta(name)
                 .await?
                 .read()
                 .await?
                 .version_for_consistency(consistency)?
-                .map(Arc::clone)
+                .cloned()
         };
         Span::current().record("found", version.is_some());
         Ok(version)

diff --git a/crates/firestore-database/src/database/query.rs b/crates/firestore-database/src/database/query.rs
@@ -415,12 +415,8 @@ impl Query {
         for col in collections {
             for meta in col.docs().await {
                 let version = match &txn {
-                    Some(txn) => txn
-                        .read_doc(&meta.name)
-                        .await?
-                        .current_version()
-                        .map(Arc::clone),
-                    None => meta.read().await?.current_version().map(Arc::clone),
+                    Some(txn) => txn.read_doc(&meta.name).await?.current_version().cloned(),
+                    None => meta.read().await?.current_version().cloned(),
                 };
                 let Some(version) = version else {
                     continue;