RUST-994 Only return index names from CreateIndex(es)Result (#442)

Author: isabelatkinson

src/operation/create_indexes/mod.rs

@@ -4,7 +4,6 @@ mod test;
 use crate::{
     bson::{doc, Document},
     cmap::{Command, StreamDescription},
-    coll::options::CommitQuorum,
     error::Result,
     index::IndexModel,
     operation::{append_options, Operation},
@@ -13,12 +12,7 @@ use crate::{
     Namespace,
 };
 
-use super::CommandResponse;
-use serde::{
-    de::{Error, Unexpected},
-    Deserialize,
-    Deserializer,
-};
+use super::{CommandResponse, WriteConcernOnlyBody};
 
 #[derive(Debug)]
 pub(crate) struct CreateIndexes {
@@ -56,7 +50,7 @@ impl CreateIndexes {
 impl Operation for CreateIndexes {
     type O = CreateIndexesResult;
     type Command = Document;
-    type Response = CommandResponse<Response>;
+    type Response = CommandResponse<WriteConcernOnlyBody>;
     const NAME: &'static str = "createIndexes";
 
     fn build(&mut self, _description: &StreamDescription) -> Result<Command> {
@@ -77,19 +71,12 @@ impl Operation for CreateIndexes {
 
     fn handle_response(
         &self,
-        response: Response,
+        response: WriteConcernOnlyBody,
         _description: &StreamDescription,
     ) -> Result<Self::O> {
+        response.validate()?;
         let index_names = self.indexes.iter().filter_map(|i| i.get_name()).collect();
-        let Response(response) = response;
-        Ok(CreateIndexesResult {
-            index_names,
-            created_collection_automatically: response.created_collection_automatically,
-            num_indexes_before: response.num_indexes_before,
-            num_indexes_after: response.num_indexes_after,
-            note: response.note,
-            commit_quorum: response.commit_quorum,
-        })
+        Ok(CreateIndexesResult { index_names })
     }
 
     fn write_concern(&self) -> Option<&WriteConcern> {
@@ -98,47 +85,3 @@ impl Operation for CreateIndexes {
             .and_then(|opts| opts.write_concern.as_ref())
     }
 }
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-struct ResponseBody {
-    created_collection_automatically: Option<bool>,
-    num_indexes_before: u32,
-    num_indexes_after: u32,
-    note: Option<String>,
-    commit_quorum: Option<CommitQuorum>,
-}
-
-#[derive(Debug)]
-pub(crate) struct Response(ResponseBody);
-
-impl<'de> Deserialize<'de> for Response {
-    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        #[derive(Deserialize)]
-        #[serde(untagged)]
-        enum ResponseHelper {
-            PlainResponse(ResponseBody),
-            ShardedResponse { raw: Document },
-        }
-
-        match ResponseHelper::deserialize(deserializer)? {
-            ResponseHelper::PlainResponse(body) => Ok(Response(body)),
-            ResponseHelper::ShardedResponse { raw } => {
-                let len = raw.values().count();
-                if len != 1 {
-                    return Err(Error::invalid_length(len, &"a single result"));
-                }
-
-                let (_, v) = raw.into_iter().next().unwrap(); // Safe unwrap because of length check above.
-                bson::from_bson(v).map(Response).map_err(|_| {
-                    Error::invalid_type(
-                        Unexpected::Other("Unknown bson"),
-                        &"a createIndexes response",
-                    )
-                })
-            }
-        }
-    }
-}

src/operation/create_indexes/test.rs

@@ -81,11 +81,6 @@ async fn handle_success() {
 
     let expected_values = CreateIndexesResult {
         index_names: vec!["a".to_string(), "b".to_string()],
-        created_collection_automatically: Some(false),
-        num_indexes_before: 1,
-        num_indexes_after: 3,
-        note: None,
-        commit_quorum: Some(CommitQuorum::VotingMembers),
     };
     let actual_values = handle_response_test(&op, response).unwrap();
     assert_eq!(actual_values, expected_values);

src/results.rs

@@ -5,7 +5,6 @@ use std::collections::{HashMap, VecDeque};
 use crate::{
     bson::{Bson, Document},
     bson_util,
-    coll::options::CommitQuorum,
     db::options::CreateCollectionOptions,
 };
 
@@ -84,21 +83,6 @@ pub struct DeleteResult {
 pub struct CreateIndexResult {
     /// The name of the index created in the `createIndex` command.
     pub index_name: String,
-
-    /// Whether or not the collection was created implicitly by the command.
-    pub created_collection_automatically: Option<bool>,
-
-    /// The number of indexes on the collection prior to running the command.
-    pub num_indexes_before: u32,
-
-    /// The number of indexes on the collection after the command was run.
-    pub num_indexes_after: u32,
-
-    /// Any information pertinent to the creation of the indexes. For more information, see the [documentation](https://docs.mongodb.com/manual/reference/command/createIndexes/#output).
-    pub note: Option<String>,
-
-    /// The commit quorum for the operation.
-    pub commit_quorum: Option<CommitQuorum>,
 }
 
 /// Information about the indexes created as a result of a
@@ -108,32 +92,12 @@ pub struct CreateIndexResult {
 pub struct CreateIndexesResult {
     /// The list containing the names of all indexes created in the `createIndexes` command.
     pub index_names: Vec<String>,
-
-    /// Whether or not the collection was created implicitly by the command.
-    pub created_collection_automatically: Option<bool>,
-
-    /// The number of indexes on the collection prior to running the command.
-    pub num_indexes_before: u32,
-
-    /// The number of indexes on the collection after the command was run.
-    pub num_indexes_after: u32,
-
-    /// Any information pertinent to the creation of the indexes. For more information, see the [documentation](https://docs.mongodb.com/manual/reference/command/createIndexes/#output).
-    pub note: Option<String>,
-
-    /// The commit quorum for the operation.
-    pub commit_quorum: Option<CommitQuorum>,
 }
 
 impl CreateIndexesResult {
     pub(crate) fn into_create_index_result(self) -> CreateIndexResult {
         CreateIndexResult {
             index_name: self.index_names.into_iter().next().unwrap(),
-            created_collection_automatically: self.created_collection_automatically,
-            num_indexes_before: self.num_indexes_before,
-            num_indexes_after: self.num_indexes_after,
-            note: self.note,
-            commit_quorum: self.commit_quorum,
         }
     }
 }