RUST-728 Inherit collection options in find and count_documents (1.2.x) (#319)

Author: isabelatkinson

src/cmap/conn/command.rs

@@ -16,32 +16,15 @@ use crate::{
 pub(crate) struct Command {
     pub(crate) name: String,
     pub(crate) target_db: String,
-    pub(crate) read_pref: Option<ReadPreference>,
     pub(crate) body: Document,
 }
 
 impl Command {
-    /// Constructs a read command.
-    pub(crate) fn new_read(
-        name: String,
-        target_db: String,
-        read_pref: Option<ReadPreference>,
-        body: Document,
-    ) -> Self {
-        Self {
-            name,
-            target_db,
-            read_pref,
-            body,
-        }
-    }
-
     /// Constructs a new command.
     pub(crate) fn new(name: String, target_db: String, body: Document) -> Self {
         Self {
             name,
             target_db,
-            read_pref: None,
             body,
         }
     }
@@ -78,6 +61,11 @@ impl Command {
             self.body.insert("apiDeprecationErrors", deprecation_errors);
         }
     }
+
+    pub(crate) fn set_read_preference(&mut self, read_preference: ReadPreference) {
+        self.body
+            .insert("$readPreference", read_preference.into_document());
+    }
 }
 
 #[derive(Debug, Clone)]

src/cmap/conn/wire/message.rs

@@ -30,12 +30,6 @@ impl Message {
     pub(crate) fn with_command(mut command: Command, request_id: Option<i32>) -> Self {
         command.body.insert("$db", command.target_db);
 
-        if let Some(read_pref) = command.read_pref {
-            command
-                .body
-                .insert("$readPreference", read_pref.into_document());
-        };
-
         Self {
             response_to: 0,
             flags: MessageFlags::empty(),

src/cmap/establish/handshake/mod.rs

@@ -188,10 +188,9 @@ impl Handshaker {
 
         body.insert("client", metadata);
 
-        let mut command = Command::new_read(
+        let mut command = Command::new(
             "isMaster".to_string(),
             db.unwrap_or_else(|| "admin".to_string()),
-            None,
             body,
         );
 

src/cmap/establish/test.rs

@@ -58,14 +58,14 @@ async fn speculative_auth_test(
         .await
         .unwrap();
 
-    let command = Command::new_read(
+    let mut command = Command::new(
         "find".into(),
         authorized_db_name.into(),
-        Some(ReadPreference::PrimaryPreferred {
-            options: Default::default(),
-        }),
         doc! { "find": "foo", "limit": 1  },
     );
+    command.set_read_preference(ReadPreference::PrimaryPreferred {
+        options: Default::default(),
+    });
 
     let response = conn.send_command(command, None).await.unwrap();
 

src/cmap/test/integration.rs

@@ -48,12 +48,8 @@ async fn acquire_connection_and_send_command() {
     let read_pref = ReadPreference::PrimaryPreferred {
         options: Default::default(),
     };
-    let mut cmd = Command::new_read(
-        "listDatabases".to_string(),
-        "admin".to_string(),
-        Some(read_pref),
-        body,
-    );
+    let mut cmd = Command::new("listDatabases".to_string(), "admin".to_string(), body);
+    cmd.set_read_preference(read_pref);
     if let Some(server_api) = client_options.server_api.as_ref() {
         cmd.set_server_api(server_api);
     }

src/coll/mod.rs

@@ -232,9 +232,10 @@ where
         filter: impl Into<Option<Document>>,
         options: impl Into<Option<CountOptions>>,
     ) -> Result<i64> {
-        let options = options.into();
-        let filter = filter.into();
-        let op = CountDocuments::new(self.namespace(), filter, options);
+        let mut options = options.into();
+        resolve_options!(self, options, [read_concern, selection_criteria]);
+
+        let op = CountDocuments::new(self.namespace(), filter.into(), options);
         self.client().execute_operation(op).await
     }
 
@@ -294,7 +295,10 @@ where
         filter: impl Into<Option<Document>>,
         options: impl Into<Option<FindOptions>>,
     ) -> Result<Cursor<T>> {
-        let find = Find::new(self.namespace(), filter.into(), options.into());
+        let mut options = options.into();
+        resolve_options!(self, options, [read_concern, selection_criteria]);
+
+        let find = Find::new(self.namespace(), filter.into(), options);
         let client = self.client();
 
         client
@@ -309,11 +313,10 @@ where
         filter: impl Into<Option<Document>>,
         options: impl Into<Option<FindOneOptions>>,
     ) -> Result<Option<T>> {
-        let mut options: FindOptions = options
-            .into()
-            .map(Into::into)
-            .unwrap_or_else(Default::default);
-        options.limit = Some(-1);
+        let mut options = options.into();
+        resolve_options!(self, options, [read_concern, selection_criteria]);
+
+        let options: FindOptions = options.map(Into::into).unwrap_or_else(Default::default);
         let mut cursor = self.find(filter, Some(options)).await?;
         cursor.next().await.transpose()
     }

src/error.rs

@@ -44,7 +44,10 @@ impl Error {
 
     pub(crate) fn pool_cleared_error(address: &StreamAddress) -> Self {
         ErrorKind::ConnectionPoolClearedError {
-            message: format!("Conneciton pool for {} cleared during operation execution", address)
+            message: format!(
+                "Conneciton pool for {} cleared during operation execution",
+                address
+            ),
         }
         .into()
     }
@@ -129,10 +132,13 @@ impl Error {
 
     /// Whether an error originated from the server.
     pub(crate) fn is_server_error(&self) -> bool {
-        matches!(self.kind.as_ref(), ErrorKind::AuthenticationError { .. }
-        | ErrorKind::BulkWriteError(_)
-        | ErrorKind::CommandError(_)
-        | ErrorKind::WriteError(_))
+        matches!(
+            self.kind.as_ref(),
+            ErrorKind::AuthenticationError { .. }
+                | ErrorKind::BulkWriteError(_)
+                | ErrorKind::CommandError(_)
+                | ErrorKind::WriteError(_)
+        )
     }
 
     /// Returns the labels for this error.
@@ -153,7 +159,9 @@ impl Error {
 
     /// Whether this error contains the specified label.
     pub fn contains_label<T: AsRef<str>>(&self, label: T) -> bool {
-        self.labels().iter().any(|actual_label| actual_label.as_str() == label.as_ref())
+        self.labels()
+            .iter()
+            .any(|actual_label| actual_label.as_str() == label.as_ref())
     }
 
     /// Returns a copy of this Error with the specified label added.
@@ -373,7 +381,10 @@ impl ErrorKind {
     }
 
     pub(crate) fn is_network_error(&self) -> bool {
-        matches!(self, ErrorKind::Io(..) | ErrorKind::ConnectionPoolClearedError { .. })
+        matches!(
+            self,
+            ErrorKind::Io(..) | ErrorKind::ConnectionPoolClearedError { .. }
+        )
     }
 
     /// Gets the code/message tuple from this error, if applicable. In the case of write errors, the
@@ -397,13 +408,14 @@ impl ErrorKind {
     pub(crate) fn code_name(&self) -> Option<&str> {
         match self {
             ErrorKind::CommandError(ref cmd_err) => Some(cmd_err.code_name.as_str()),
-            ErrorKind::WriteError(ref failure) => {
-                match failure {
-                    WriteFailure::WriteConcernError(ref wce) => Some(wce.code_name.as_str()),
-                    WriteFailure::WriteError(ref we) => we.code_name.as_deref(),
-                }
-            }
-            ErrorKind::BulkWriteError(ref bwe) => bwe.write_concern_error.as_ref().map(|wce| wce.code_name.as_str()),
+            ErrorKind::WriteError(ref failure) => match failure {
+                WriteFailure::WriteConcernError(ref wce) => Some(wce.code_name.as_str()),
+                WriteFailure::WriteError(ref we) => we.code_name.as_deref(),
+            },
+            ErrorKind::BulkWriteError(ref bwe) => bwe
+                .write_concern_error
+                .as_ref()
+                .map(|wce| wce.code_name.as_str()),
             _ => None,
         }
     }
@@ -564,8 +576,8 @@ pub enum WriteFailure {
     /// An error that occurred due to not being able to satisfy a write concern.
     WriteConcernError(WriteConcernError),
 
-    /// An error that occurred during a write operation that wasn't due to being unable to satisfy a
-    /// write concern.
+    /// An error that occurred during a write operation that wasn't due to being unable to satisfy
+    /// a write concern.
     WriteError(WriteError),
 }
 

src/lib.rs

@@ -72,7 +72,6 @@
 
 #![warn(missing_docs)]
 #![warn(missing_crate_level_docs)]
-
 #![cfg_attr(
     feature = "cargo-clippy",
     allow(

src/operation/count/test.rs

@@ -28,7 +28,6 @@ async fn build() {
         }
     );
     assert_eq!(count_command.target_db, "test_db");
-    assert_eq!(count_command.read_pref, None);
 }
 
 #[cfg_attr(feature = "tokio-runtime", tokio::test)]
@@ -58,7 +57,6 @@ async fn build_with_options() {
         }
     );
     assert_eq!(count_command.target_db, "test_db");
-    assert_eq!(count_command.read_pref, None);
 }
 
 #[cfg_attr(feature = "tokio-runtime", tokio::test)]

src/operation/count_documents/test.rs

@@ -36,7 +36,6 @@ async fn build() {
 
     assert_eq!(count_command.body, expected_body);
     assert_eq!(count_command.target_db, "test_db");
-    assert_eq!(count_command.read_pref, None);
 }
 
 #[cfg_attr(feature = "tokio-runtime", tokio::test)]
@@ -77,7 +76,6 @@ async fn build_with_options() {
 
     assert_eq!(count_command.body, expected_body);
     assert_eq!(count_command.target_db, "test_db");
-    assert_eq!(count_command.read_pref, None);
 }
 
 #[cfg_attr(feature = "tokio-runtime", tokio::test)]