RUST-987 Add index management operations to test runners (#441)

Author: isabelatkinson

src/coll/mod.rs

@@ -598,7 +598,7 @@ impl<T> Collection<T> {
     /// Lists all indexes on this collection.
     pub async fn list_indexes(
         &self,
-        options: impl Into<Option<ListIndexOptions>>,
+        options: impl Into<Option<ListIndexesOptions>>,
     ) -> Result<Cursor<IndexModel>> {
         let list_indexes = ListIndexes::new(self.namespace(), options.into());
         let client = self.client();
@@ -611,7 +611,7 @@ impl<T> Collection<T> {
     /// Lists all indexes on this collection using the provided `ClientSession`.
     pub async fn list_indexes_with_session(
         &self,
-        options: impl Into<Option<ListIndexOptions>>,
+        options: impl Into<Option<ListIndexesOptions>>,
         session: &mut ClientSession,
     ) -> Result<SessionCursor<IndexModel>> {
         let list_indexes = ListIndexes::new(self.namespace(), options.into());

src/coll/options.rs

@@ -906,7 +906,7 @@ pub struct DropIndexOptions {
 #[serde(rename_all = "camelCase", deny_unknown_fields)]
 #[builder(field_defaults(default, setter(into)))]
 #[non_exhaustive]
-pub struct ListIndexOptions {
+pub struct ListIndexesOptions {
     /// The maximum amount of time to search for the index.
     ///
     /// This option maps to the `maxTimeMS` MongoDB query option, so the duration will be sent

src/index/options.rs

@@ -120,9 +120,17 @@ pub struct IndexOptions {
 #[non_exhaustive]
 pub enum IndexVersion {
     #[deprecated]
+    /// Version 0.
     V0,
+
+    /// Version 1.
     V1,
+
+    /// Version 2.
     V2,
+
+    //// Specify a custom index version. This is present to provide forwards compatibility with
+    /// any future index versions which may be added to new versions of MongoDB.
     Custom(u32),
 }
 
@@ -159,9 +167,17 @@ impl<'de> Deserialize<'de> for IndexVersion {
 /// Specify the version for a `text` index. For more information, see [Versions](https://docs.mongodb.com/manual/core/index-text/#versions).
 #[derive(Clone, Debug)]
 pub enum TextIndexVersion {
+    /// Version 1.
     V1,
+
+    /// Version 2.
     V2,
+
+    /// Version 3.
     V3,
+
+    /// Specify a custom text index version. This is present to provide forwards compatibility with
+    /// any future text index versions which may be added to new versions of MongoDB.
     Custom(u32),
 }
 
@@ -196,8 +212,14 @@ impl<'de> Deserialize<'de> for TextIndexVersion {
 /// Specify the version for a `2dsphere` index. For more information, see [Versions](https://docs.mongodb.com/manual/core/2dsphere/#versions).
 #[derive(Clone, Debug)]
 pub enum Sphere2DIndexVersion {
+    /// Version 2.
     V2,
+
+    /// Version 3.
     V3,
+
+    /// Specify a custom sphere 2D index version. This is present to provide forwards compatibility
+    /// with any future sphere 2D index verions which may be added to new versions of MongoDB.
     Custom(u32),
 }
 

src/lib.rs

@@ -290,13 +290,8 @@
 #![cfg_attr(test, type_length_limit = "80000000")]
 #![doc(html_root_url = "https://docs.rs/mongodb/2.0.0-beta.3")]
 
-#[cfg(all(
-    feature = "aws-auth",
-    feature = "async-std-runtime"
-))]
-compile_error!(
-    "The `aws-auth` feature flag is only supported on the tokio runtime."
-);
+#[cfg(all(feature = "aws-auth", feature = "async-std-runtime"))]
+compile_error!("The `aws-auth` feature flag is only supported on the tokio runtime.");
 
 macro_rules! define_if_single_runtime_enabled {
     ( $( $def:item )+ ) => {
@@ -352,7 +347,6 @@ define_if_single_runtime_enabled! {
         coll::Collection,
         cursor::{Cursor, session::{SessionCursor, SessionCursorStream}},
         db::Database,
-        index::IndexModel,
     };
 
     #[cfg(feature = "sync")]
@@ -363,7 +357,7 @@ define_if_single_runtime_enabled! {
         db::Database,
     };
 
-    pub use coll::Namespace;
+    pub use {coll::Namespace, index::IndexModel};
 }
 
 #[cfg(all(

src/operation/list_indexes/mod.rs

@@ -5,7 +5,7 @@ use crate::{
     error::Result,
     index::IndexModel,
     operation::{append_options, Operation},
-    options::ListIndexOptions,
+    options::ListIndexesOptions,
     selection_criteria::{ReadPreference, SelectionCriteria},
     Namespace,
 };
@@ -17,11 +17,11 @@ mod test;
 
 pub(crate) struct ListIndexes {
     ns: Namespace,
-    options: Option<ListIndexOptions>,
+    options: Option<ListIndexesOptions>,
 }
 
 impl ListIndexes {
-    pub(crate) fn new(ns: Namespace, options: Option<ListIndexOptions>) -> Self {
+    pub(crate) fn new(ns: Namespace, options: Option<ListIndexesOptions>) -> Self {
         ListIndexes { ns, options }
     }
 

src/operation/list_indexes/test.rs

@@ -4,12 +4,10 @@ use crate::{
     bson::doc,
     client::options::ServerAddress,
     cmap::StreamDescription,
-    coll::{options::ListIndexOptions, Namespace},
-    index::{
-        options::{IndexOptions, IndexVersion, TextIndexVersion},
-        IndexModel,
-    },
     operation::{test::handle_response_test, ListIndexes, Operation},
+    options::{IndexOptions, IndexVersion, ListIndexesOptions, TextIndexVersion},
+    IndexModel,
+    Namespace,
 };
 
 #[cfg_attr(feature = "tokio-runtime", tokio::test)]
@@ -20,7 +18,7 @@ async fn build() {
         coll: "test_coll".to_string(),
     };
 
-    let list_options = ListIndexOptions::builder()
+    let list_options = ListIndexesOptions::builder()
         .max_time(Some(Duration::from_millis(42)))
         .batch_size(Some(4))
         .build();

src/options.rs

@@ -21,6 +21,7 @@ pub use crate::{
     collation::*,
     concern::*,
     db::options::*,
+    index::options::*,
     selection_criteria::*,
 };
 

src/sync/coll.rs

@@ -23,7 +23,7 @@ use crate::{
         FindOptions,
         InsertManyOptions,
         InsertOneOptions,
-        ListIndexOptions,
+        ListIndexesOptions,
         ReadConcern,
         ReplaceOptions,
         SelectionCriteria,
@@ -416,7 +416,7 @@ impl<T> Collection<T> {
     /// Lists all indexes on this collection.
     pub fn list_indexes(
         &self,
-        options: impl Into<Option<ListIndexOptions>>,
+        options: impl Into<Option<ListIndexesOptions>>,
     ) -> Result<Cursor<IndexModel>> {
         RUNTIME
             .block_on(self.async_collection.list_indexes(options))
@@ -426,7 +426,7 @@ impl<T> Collection<T> {
     /// Lists all indexes on this collection using the provided `ClientSession`.
     pub fn list_indexes_with_session(
         &self,
-        options: impl Into<Option<ListIndexOptions>>,
+        options: impl Into<Option<ListIndexesOptions>>,
         session: &mut ClientSession,
     ) -> Result<SessionCursor<IndexModel>> {
         RUNTIME

src/test/spec/unified_runner/mod.rs

@@ -42,17 +42,12 @@ static SPEC_VERSIONS: &[Version] = &[
 ];
 
 const SKIPPED_OPERATIONS: &[&str] = &[
-    "assertIndexExists",
-    "assertIndexNotExists",
     "bulkWrite",
     "count",
-    "createIndex",
     "download",
     "download_by_name",
     "listCollectionObjects",
     "listDatabaseObjects",
-    "listIndexNames",
-    "listIndexes",
     "mapReduce",
     "watch",
 ];