Change MaxTime and MaxAwaitTime options to always use time.Duration.

GODRIVER-781

Change-Id: Ib5ffdbf2470d939d5be649d87d97c70a98c1dfc4

Author: Divjot Arora

mongo/options/countoptions.go

@@ -6,13 +6,15 @@
 
 package options
 
+import "time"
+
 // CountOptions represents all possible options to the count() function
 type CountOptions struct {
-	Collation *Collation  // Specifies a collation
-	Hint      interface{} // The index to use
-	Limit     *int64      // The maximum number of documents to count
-	MaxTime   *int64      // The maximum amount of time to allow the operation to run
-	Skip      *int64      // The number of documents to skip before counting
+	Collation *Collation     // Specifies a collation
+	Hint      interface{}    // The index to use
+	Limit     *int64         // The maximum number of documents to count
+	MaxTime   *time.Duration // The maximum amount of time to allow the operation to run
+	Skip      *int64         // The number of documents to skip before counting
 }
 
 // Count returns a pointer to a new CountOptions
@@ -40,8 +42,8 @@ func (co *CountOptions) SetLimit(i int64) *CountOptions {
 }
 
 // SetMaxTime specifies the maximum amount of time to allow the operation to run
-func (co *CountOptions) SetMaxTime(i int64) *CountOptions {
-	co.MaxTime = &i
+func (co *CountOptions) SetMaxTime(d time.Duration) *CountOptions {
+	co.MaxTime = &d
 	return co
 }
 

mongo/options/distinctoptions.go

@@ -6,10 +6,12 @@
 
 package options
 
+import "time"
+
 // DistinctOptions represents all possible options to the distinct() function
 type DistinctOptions struct {
-	Collation *Collation // Specifies a collation
-	MaxTime   *int64     // The maximum amount of time to allow the operation to run
+	Collation *Collation     // Specifies a collation
+	MaxTime   *time.Duration // The maximum amount of time to allow the operation to run
 }
 
 // Distinct returns a pointer to a new DistinctOptions
@@ -25,8 +27,8 @@ func (do *DistinctOptions) SetCollation(c *Collation) *DistinctOptions {
 }
 
 // SetMaxTime specifies the maximum amount of time to allow the operation to run
-func (do *DistinctOptions) SetMaxTime(i int64) *DistinctOptions {
-	do.MaxTime = &i
+func (do *DistinctOptions) SetMaxTime(d time.Duration) *DistinctOptions {
+	do.MaxTime = &d
 	return do
 }
 

mongo/options/estimatedcountoptions.go

@@ -6,9 +6,11 @@
 
 package options
 
+import "time"
+
 // EstimatedDocumentCountOptions represents all possible options to the estimatedDocumentCount() function
 type EstimatedDocumentCountOptions struct {
-	MaxTime *int64 // The maximum amount of time to allow the operation to run
+	MaxTime *time.Duration // The maximum amount of time to allow the operation to run
 }
 
 // EstimatedDocumentCount returns a pointer to a new EstimatedDocumentCountOptions
@@ -17,8 +19,8 @@ func EstimatedDocumentCount() *EstimatedDocumentCountOptions {
 }
 
 // SetMaxTime specifies the maximum amount of time to allow the operation to run
-func (eco *EstimatedDocumentCountOptions) SetMaxTime(i int64) *EstimatedDocumentCountOptions {
-	eco.MaxTime = &i
+func (eco *EstimatedDocumentCountOptions) SetMaxTime(d time.Duration) *EstimatedDocumentCountOptions {
+	eco.MaxTime = &d
 	return eco
 }
 

x/mongo/driver/count.go

@@ -68,7 +68,7 @@ func Count(
 	}
 	if countOpts.MaxTime != nil {
 		cmd.Opts = append(cmd.Opts, bsonx.Elem{
-			"maxTimeMS", bsonx.Int64(int64(time.Duration(*countOpts.MaxTime) / time.Millisecond)),
+			"maxTimeMS", bsonx.Int64(int64(*countOpts.MaxTime / time.Millisecond)),
 		})
 	}
 	if countOpts.Skip != nil {

x/mongo/driver/count_documents.go

@@ -8,8 +8,6 @@ package driver
 
 import (
 	"context"
-	"time"
-
 	"github.com/mongodb/mongo-go-driver/bson/bsoncodec"
 	"github.com/mongodb/mongo-go-driver/x/bsonx"
 
@@ -19,6 +17,7 @@ import (
 	"github.com/mongodb/mongo-go-driver/x/mongo/driver/uuid"
 	"github.com/mongodb/mongo-go-driver/x/network/command"
 	"github.com/mongodb/mongo-go-driver/x/network/description"
+	"time"
 )
 
 // CountDocuments handles the full cycle dispatch and execution of a countDocuments command against the provided
@@ -66,7 +65,7 @@ func CountDocuments(
 	// ignore Skip and Limit because we already have these options in the pipeline
 	if countOpts.MaxTime != nil {
 		cmd.Opts = append(cmd.Opts, bsonx.Elem{
-			"maxTimeMS", bsonx.Int64(int64(time.Duration(*countOpts.MaxTime) / time.Millisecond)),
+			"maxTimeMS", bsonx.Int64(int64(*countOpts.MaxTime / time.Millisecond)),
 		})
 	}
 	if countOpts.Collation != nil {

x/mongo/driver/distinct.go

@@ -8,8 +8,6 @@ package driver
 
 import (
 	"context"
-	"time"
-
 	"github.com/mongodb/mongo-go-driver/mongo/options"
 	"github.com/mongodb/mongo-go-driver/x/bsonx"
 
@@ -19,6 +17,7 @@ import (
 	"github.com/mongodb/mongo-go-driver/x/network/command"
 	"github.com/mongodb/mongo-go-driver/x/network/description"
 	"github.com/mongodb/mongo-go-driver/x/network/result"
+	"time"
 )
 
 // Distinct handles the full cycle dispatch and execution of a distinct command against the provided
@@ -64,7 +63,7 @@ func Distinct(
 
 	if distinctOpts.MaxTime != nil {
 		cmd.Opts = append(cmd.Opts, bsonx.Elem{
-			"maxTimeMS", bsonx.Int64(int64(time.Duration(*distinctOpts.MaxTime) / time.Millisecond)),
+			"maxTimeMS", bsonx.Int64(int64(*distinctOpts.MaxTime / time.Millisecond)),
 		})
 	}
 	if distinctOpts.Collation != nil {