GODRIVER-281 Remove snapshot option

Change-Id: Iedaad613e9e6d023040215fd7650c994a36e6147

Author: Isabella Siu

core/option/options.go

@@ -236,7 +236,6 @@ var (
 	_ FindOptioner              = (*OptReturnKey)(nil)
 	_ FindOptioner              = (*OptShowRecordID)(nil)
 	_ FindOptioner              = (*OptSkip)(nil)
-	_ FindOptioner              = (*OptSnapshot)(nil)
 	_ FindOptioner              = (*OptSort)(nil)
 	_ FindOneOptioner           = (*OptAllowPartialResults)(nil)
 	_ FindOneOptioner           = (*OptBatchSize)(nil)
@@ -254,7 +253,6 @@ var (
 	_ FindOneOptioner           = (*OptReturnKey)(nil)
 	_ FindOneOptioner           = (*OptShowRecordID)(nil)
 	_ FindOneOptioner           = (*OptSkip)(nil)
-	_ FindOneOptioner           = (*OptSnapshot)(nil)
 	_ FindOneOptioner           = (*OptSort)(nil)
 	_ InsertManyOptioner        = (*OptBypassDocumentValidation)(nil)
 	_ InsertManyOptioner        = (*OptOrdered)(nil)
@@ -862,23 +860,6 @@ func (opt OptSkip) String() string {
 	return "OptSkip: " + strconv.FormatInt(int64(opt), 10)
 }
 
-// OptSnapshot is for internal use.
-type OptSnapshot bool
-
-// Option implements the Optioner interface.
-func (opt OptSnapshot) Option(d *bson.Document) error {
-	d.Append(bson.EC.Boolean("snapshot", bool(opt)))
-	return nil
-}
-
-func (OptSnapshot) findOption()    {}
-func (OptSnapshot) findOneOption() {}
-
-// String implements the Stringer interface.
-func (opt OptSnapshot) String() string {
-	return "OptSnapshot: " + strconv.FormatBool(bool(opt))
-}
-
 // OptSort is for internal use.
 type OptSort struct {
 	Registry *bsoncodec.Registry

mongo/findopt/find.go

@@ -241,17 +241,6 @@ func (fb *FindBundle) Skip(i int64) *FindBundle {
 	return bundle
 }
 
-// Snapshot adds an option to prevent the cursor from returning a document more than once because of an
-// intervening write operation.
-func (fb *FindBundle) Snapshot(b bool) *FindBundle {
-	bundle := &FindBundle{
-		option: Snapshot(b),
-		next:   fb,
-	}
-
-	return bundle
-}
-
 // Sort adds an option to specify the order in which to return results.
 func (fb *FindBundle) Sort(sort interface{}) *FindBundle {
 	bundle := &FindBundle{

mongo/findopt/findopt.go

@@ -40,7 +40,6 @@ var (
 	_ Find       = (*OptReturnKey)(nil)
 	_ Find       = (*OptShowRecordID)(nil)
 	_ Find       = (*OptSkip)(nil)
-	_ Find       = (*OptSnapshot)(nil)
 	_ Find       = (*OptSort)(nil)
 	_ One        = (*OneBundle)(nil)
 	_ One        = (*OptAllowPartialResults)(nil)
@@ -60,7 +59,6 @@ var (
 	_ One        = (*OptReturnKey)(nil)
 	_ One        = (*OptShowRecordID)(nil)
 	_ One        = (*OptSkip)(nil)
-	_ One        = (*OptSnapshot)(nil)
 	_ One        = (*OptSort)(nil)
 	_ ReplaceOne = (*ReplaceOneBundle)(nil)
 	_ ReplaceOne = (*OptBypassDocumentValidation)(nil)
@@ -213,13 +211,6 @@ func Skip(i int64) OptSkip {
 	return OptSkip(i)
 }
 
-// Snapshot prevents the cursor from returning a document more than once because of an
-// intervening write operation.
-// Find, One
-func Snapshot(b bool) OptSnapshot {
-	return OptSnapshot(b)
-}
-
 // Sort specifies the order in which to return results.
 // Find, One, DeleteOne, ReplaceOne, UpdateOne
 func Sort(sort interface{}) OptSort {
@@ -638,23 +629,6 @@ func (opt OptSkip) ConvertFindOneOption() option.FindOptioner {
 	return option.OptSkip(opt)
 }
 
-// OptSnapshot prevents the cursor from returning a document more than once because of an
-// intervening write operation.
-type OptSnapshot option.OptSnapshot
-
-func (OptSnapshot) find() {}
-func (OptSnapshot) one()  {}
-
-// ConvertFindOption implements the Find interface.
-func (opt OptSnapshot) ConvertFindOption() option.FindOptioner {
-	return option.OptSnapshot(opt)
-}
-
-// ConvertFindOneOption implements the One interface.
-func (opt OptSnapshot) ConvertFindOneOption() option.FindOptioner {
-	return option.OptSnapshot(opt)
-}
-
 // OptSort specifies the order in which to return results.
 type OptSort option.OptSort
 

mongo/findopt/findopt_many_test.go

@@ -181,7 +181,6 @@ func TestFindOpt(t *testing.T) {
 			ReturnKey(true),
 			ShowRecordID(false),
 			Skip(50),
-			Snapshot(false),
 			Sort("sort for find"),
 		}
 		params := make([]Find, len(opts))
@@ -206,14 +205,14 @@ func TestFindOpt(t *testing.T) {
 
 	t.Run("Nil Option Bundle", func(t *testing.T) {
 		sess := FindSessionOpt{}
-		opts, _, err := BundleFind(Snapshot(true), BundleFind(nil), sess, nil).unbundle()
+		opts, _, err := BundleFind(OptAllowPartialResults(true), BundleFind(nil), sess, nil).unbundle()
 		testhelpers.RequireNil(t, err, "got non-nil error from unbundle: %s", err)
 
 		if len(opts) != 1 {
 			t.Errorf("expected bundle length 1. got: %d", len(opts))
 		}
 
-		opts, _, err = BundleFind(nil, sess, BundleFind(nil), Snapshot(true)).unbundle()
+		opts, _, err = BundleFind(nil, sess, BundleFind(nil), OptAllowPartialResults(true)).unbundle()
 		testhelpers.RequireNil(t, err, "got non-nil error from unbundle: %s", err)
 
 		if len(opts) != 1 {

mongo/findopt/findopt_one_test.go

@@ -180,7 +180,6 @@ func TestFindOneOpt(t *testing.T) {
 			ReturnKey(true),
 			ShowRecordID(false),
 			Skip(50),
-			Snapshot(false),
 			Sort("sort for find"),
 		}
 		params := make([]One, len(opts))
@@ -205,14 +204,14 @@ func TestFindOneOpt(t *testing.T) {
 
 	t.Run("Nil Option Bundle", func(t *testing.T) {
 		sess := FindSessionOpt{}
-		opts, _, err := BundleOne(Snapshot(true), BundleOne(nil), sess, nil).unbundle()
+		opts, _, err := BundleOne(OptAllowPartialResults(true), BundleOne(nil), sess, nil).unbundle()
 		testhelpers.RequireNil(t, err, "got non-nil error from unbundle: %s", err)
 
 		if len(opts) != 1 {
 			t.Errorf("expected bundle length 1. got: %d", len(opts))
 		}
 
-		opts, _, err = BundleOne(nil, sess, BundleOne(nil), Snapshot(true)).unbundle()
+		opts, _, err = BundleOne(nil, sess, BundleOne(nil), OptAllowPartialResults(true)).unbundle()
 		testhelpers.RequireNil(t, err, "got non-nil error from unbundle: %s", err)
 
 		if len(opts) != 1 {

mongo/findopt/one.go

@@ -231,17 +231,6 @@ func (ob *OneBundle) Skip(i int64) *OneBundle {
 	return bundle
 }
 
-// Snapshot adds an option to prevent the server from returning multiple copies because of an intervening
-// write operation
-func (ob *OneBundle) Snapshot(b bool) *OneBundle {
-	bundle := &OneBundle{
-		option: Snapshot(b),
-		next:   ob,
-	}
-
-	return bundle
-}
-
 // Sort adds an option to specify the order in which to return results.
 func (ob *OneBundle) Sort(sort interface{}) *OneBundle {
 	bundle := &OneBundle{