WIP

mongodb · Sep 26, 2023 · cfd0ffc · cfd0ffc
1 parent f35a93a
commit cfd0ffc
Show file tree

Hide file tree

Showing 2 changed files with 74 additions and 117 deletions.
diff --git a/mongo/gridfs/bucket.go b/mongo/gridfs/bucket.go
@@ -73,7 +73,27 @@ func NewBucket(db *mongo.Database, opts ...*options.BucketOptions) (*Bucket, err
 		rp:        db.ReadPreference(),
 	}
 
-	bo := options.MergeBucketOptions(opts...)
+	bo := options.GridFSBucket()
+	for _, opt := range opts {
+		if opt == nil {
+			continue
+		}
+		if opt.Name != nil {
+			bo.Name = opt.Name
+		}
+		if opt.ChunkSizeBytes != nil {
+			bo.ChunkSizeBytes = opt.ChunkSizeBytes
+		}
+		if opt.WriteConcern != nil {
+			bo.WriteConcern = opt.WriteConcern
+		}
+		if opt.ReadConcern != nil {
+			bo.ReadConcern = opt.ReadConcern
+		}
+		if opt.ReadPreference != nil {
+			bo.ReadPreference = opt.ReadPreference
+		}
+	}
 	if bo.Name != nil {
 		b.name = *bo.Name
 	}
@@ -210,7 +230,17 @@ func (b *Bucket) OpenDownloadStreamByName(filename string, opts ...*options.Name
 	var numSkip int32 = -1
 	var sortOrder int32 = 1
 
-	nameOpts := options.MergeNameOptions(opts...)
+	nameOpts := options.GridFSName()
+	nameOpts.Revision = &options.DefaultRevision
+
+	for _, opt := range opts {
+		if opt == nil {
+			continue
+		}
+		if opt.Revision != nil {
+			nameOpts.Revision = opt.Revision
+		}
+	}
 	if nameOpts.Revision != nil {
 		numSkip = *nameOpts.Revision
 	}
@@ -302,7 +332,33 @@ func (b *Bucket) Find(filter interface{}, opts ...*options.GridFSFindOptions) (*
 // Use the context parameter to time-out or cancel the find operation. The deadline set by SetReadDeadline
 // is ignored.
 func (b *Bucket) FindContext(ctx context.Context, filter interface{}, opts ...*options.GridFSFindOptions) (*mongo.Cursor, error) {
-	gfsOpts := options.MergeGridFSFindOptions(opts...)
+	gfsOpts := options.GridFSFind()
+	for _, opt := range opts {
+		if opt == nil {
+			continue
+		}
+		if opt.AllowDiskUse != nil {
+			gfsOpts.AllowDiskUse = opt.AllowDiskUse
+		}
+		if opt.BatchSize != nil {
+			gfsOpts.BatchSize = opt.BatchSize
+		}
+		if opt.Limit != nil {
+			gfsOpts.Limit = opt.Limit
+		}
+		if opt.MaxTime != nil {
+			gfsOpts.MaxTime = opt.MaxTime
+		}
+		if opt.NoCursorTimeout != nil {
+			gfsOpts.NoCursorTimeout = opt.NoCursorTimeout
+		}
+		if opt.Skip != nil {
+			gfsOpts.Skip = opt.Skip
+		}
+		if opt.Sort != nil {
+			gfsOpts.Sort = opt.Sort
+		}
+	}
 	find := options.Find()
 	if gfsOpts.AllowDiskUse != nil {
 		find.SetAllowDiskUse(*gfsOpts.AllowDiskUse)
@@ -642,7 +698,21 @@ func (b *Bucket) parseUploadOptions(opts ...*options.UploadOptions) (*Upload, er
 		chunkSize: b.chunkSize, // upload chunk size defaults to bucket's value
 	}
 
-	uo := options.MergeUploadOptions(opts...)
+	uo := options.GridFSUpload()
+	for _, opt := range opts {
+		if opt == nil {
+			continue
+		}
+		if opt.ChunkSizeBytes != nil {
+			uo.ChunkSizeBytes = opt.ChunkSizeBytes
+		}
+		if opt.Metadata != nil {
+			uo.Metadata = opt.Metadata
+		}
+		if opt.Registry != nil {
+			uo.Registry = opt.Registry
+		}
+	}
 	if uo.ChunkSizeBytes != nil {
 		upload.chunkSize = *uo.ChunkSizeBytes
 	}

diff --git a/mongo/options/gridfsoptions.go b/mongo/options/gridfsoptions.go
@@ -84,37 +84,6 @@ func (b *BucketOptions) SetReadPreference(rp *readpref.ReadPref) *BucketOptions
 	return b
 }
 
-// MergeBucketOptions combines the given BucketOptions instances into a single BucketOptions in a last-one-wins fashion.
-//
-// Deprecated: Merging options structs will not be supported in Go Driver 2.0. Users should create a
-// single options struct instead.
-func MergeBucketOptions(opts ...*BucketOptions) *BucketOptions {
-	b := GridFSBucket()
-
-	for _, opt := range opts {
-		if opt == nil {
-			continue
-		}
-		if opt.Name != nil {
-			b.Name = opt.Name
-		}
-		if opt.ChunkSizeBytes != nil {
-			b.ChunkSizeBytes = opt.ChunkSizeBytes
-		}
-		if opt.WriteConcern != nil {
-			b.WriteConcern = opt.WriteConcern
-		}
-		if opt.ReadConcern != nil {
-			b.ReadConcern = opt.ReadConcern
-		}
-		if opt.ReadPreference != nil {
-			b.ReadPreference = opt.ReadPreference
-		}
-	}
-
-	return b
-}
-
 // UploadOptions represents options that can be used to configure a GridFS upload operation.
 type UploadOptions struct {
 	// The number of bytes in each chunk in the bucket. The default value is DefaultChunkSize (255 KiB).
@@ -146,31 +115,6 @@ func (u *UploadOptions) SetMetadata(doc interface{}) *UploadOptions {
 	return u
 }
 
-// MergeUploadOptions combines the given UploadOptions instances into a single UploadOptions in a last-one-wins fashion.
-//
-// Deprecated: Merging options structs will not be supported in Go Driver 2.0. Users should create a
-// single options struct instead.
-func MergeUploadOptions(opts ...*UploadOptions) *UploadOptions {
-	u := GridFSUpload()
-
-	for _, opt := range opts {
-		if opt == nil {
-			continue
-		}
-		if opt.ChunkSizeBytes != nil {
-			u.ChunkSizeBytes = opt.ChunkSizeBytes
-		}
-		if opt.Metadata != nil {
-			u.Metadata = opt.Metadata
-		}
-		if opt.Registry != nil {
-			u.Registry = opt.Registry
-		}
-	}
-
-	return u
-}
-
 // NameOptions represents options that can be used to configure a GridFS DownloadByName operation.
 type NameOptions struct {
 	// Specifies the revision of the file to retrieve. Revision numbers are defined as follows:
@@ -197,26 +141,6 @@ func (n *NameOptions) SetRevision(r int32) *NameOptions {
 	return n
 }
 
-// MergeNameOptions combines the given NameOptions instances into a single *NameOptions in a last-one-wins fashion.
-//
-// Deprecated: Merging options structs will not be supported in Go Driver 2.0. Users should create a
-// single options struct instead.
-func MergeNameOptions(opts ...*NameOptions) *NameOptions {
-	n := GridFSName()
-	n.Revision = &DefaultRevision
-
-	for _, opt := range opts {
-		if opt == nil {
-			continue
-		}
-		if opt.Revision != nil {
-			n.Revision = opt.Revision
-		}
-	}
-
-	return n
-}
-
 // GridFSFindOptions represents options that can be used to configure a GridFS Find operation.
 type GridFSFindOptions struct {
 	// If true, the server can write temporary data to disk while executing the find operation. The default value
@@ -302,40 +226,3 @@ func (f *GridFSFindOptions) SetSort(sort interface{}) *GridFSFindOptions {
 	f.Sort = sort
 	return f
 }
-
-// MergeGridFSFindOptions combines the given GridFSFindOptions instances into a single GridFSFindOptions in a
-// last-one-wins fashion.
-//
-// Deprecated: Merging options structs will not be supported in Go Driver 2.0. Users should create a
-// single options struct instead.
-func MergeGridFSFindOptions(opts ...*GridFSFindOptions) *GridFSFindOptions {
-	fo := GridFSFind()
-	for _, opt := range opts {
-		if opt == nil {
-			continue
-		}
-		if opt.AllowDiskUse != nil {
-			fo.AllowDiskUse = opt.AllowDiskUse
-		}
-		if opt.BatchSize != nil {
-			fo.BatchSize = opt.BatchSize
-		}
-		if opt.Limit != nil {
-			fo.Limit = opt.Limit
-		}
-		if opt.MaxTime != nil {
-			fo.MaxTime = opt.MaxTime
-		}
-		if opt.NoCursorTimeout != nil {
-			fo.NoCursorTimeout = opt.NoCursorTimeout
-		}
-		if opt.Skip != nil {
-			fo.Skip = opt.Skip
-		}
-		if opt.Sort != nil {
-			fo.Sort = opt.Sort
-		}
-	}
-
-	return fo
-}