Remove remaining bsonx usage in production code; don't drop handling of bsonx.Doc

Author: matthewdale

mongo/database.go

@@ -438,13 +438,7 @@ func (db *Database) ListCollectionNames(ctx context.Context, filter interface{},
 
 	names := make([]string, 0)
 	for res.Next(ctx) {
-		next := &bsoncore.Document{}
-		err = res.Decode(next)
-		if err != nil {
-			return nil, err
-		}
-
-		elem, err := next.LookupErr("name")
+		elem, err := res.Current.LookupErr("name")
 		if err != nil {
 			return nil, err
 		}

mongo/gridfs/bucket.go

@@ -21,7 +21,6 @@ import (
 	"go.mongodb.org/mongo-driver/mongo/readconcern"
 	"go.mongodb.org/mongo-driver/mongo/readpref"
 	"go.mongodb.org/mongo-driver/mongo/writeconcern"
-	"go.mongodb.org/mongo-driver/x/bsonx"
 	"go.mongodb.org/mongo-driver/x/bsonx/bsoncore"
 )
 
@@ -186,12 +185,8 @@ func (b *Bucket) UploadFromStreamWithID(fileID interface{}, filename string, sou
 
 // OpenDownloadStream creates a stream from which the contents of the file can be read.
 func (b *Bucket) OpenDownloadStream(fileID interface{}) (*DownloadStream, error) {
-	id, err := convertFileID(fileID)
-	if err != nil {
-		return nil, err
-	}
 	return b.openDownloadStream(bson.D{
-		{"_id", id},
+		{"_id", fileID},
 	})
 }
 
@@ -254,11 +249,7 @@ func (b *Bucket) Delete(fileID interface{}) error {
 		defer cancel()
 	}
 
-	id, err := convertFileID(fileID)
-	if err != nil {
-		return err
-	}
-	res, err := b.filesColl.DeleteOne(ctx, bson.D{{"_id", id}})
+	res, err := b.filesColl.DeleteOne(ctx, bson.D{{"_id", fileID}})
 	if err == nil && res.DeletedCount == 0 {
 		err = ErrFileNotFound
 	}
@@ -317,12 +308,8 @@ func (b *Bucket) Rename(fileID interface{}, newFilename string) error {
 		defer cancel()
 	}
 
-	id, err := convertFileID(fileID)
-	if err != nil {
-		return err
-	}
 	res, err := b.filesColl.UpdateOne(ctx,
-		bson.D{{"_id", id}},
+		bson.D{{"_id", fileID}},
 		bson.D{{"$set", bson.D{{"filename", newFilename}}}},
 	)
 	if err != nil {
@@ -426,11 +413,7 @@ func (b *Bucket) downloadToStream(ds *DownloadStream, stream io.Writer) (int64,
 }
 
 func (b *Bucket) deleteChunks(ctx context.Context, fileID interface{}) error {
-	id, err := convertFileID(fileID)
-	if err != nil {
-		return err
-	}
-	_, err = b.chunksColl.DeleteMany(ctx, bson.D{{"files_id", id}})
+	_, err := b.chunksColl.DeleteMany(ctx, bson.D{{"files_id", fileID}})
 	return err
 }
 
@@ -449,12 +432,8 @@ func (b *Bucket) findFile(ctx context.Context, filter interface{}, opts ...*opti
 }
 
 func (b *Bucket) findChunks(ctx context.Context, fileID interface{}) (*mongo.Cursor, error) {
-	id, err := convertFileID(fileID)
-	if err != nil {
-		return nil, err
-	}
 	chunksCursor, err := b.chunksColl.Find(ctx,
-		bson.D{{"files_id", id}},
+		bson.D{{"files_id", fileID}},
 		options.Find().SetSort(bson.D{{"n", 1}})) // sort by chunk index
 	if err != nil {
 		return nil, err
@@ -627,22 +606,3 @@ func (b *Bucket) parseUploadOptions(opts ...*options.UploadOptions) (*Upload, er
 
 	return upload, nil
 }
-
-type _convertFileID struct {
-	ID interface{} `bson:"_id"`
-}
-
-func convertFileID(fileID interface{}) (bsonx.Val, error) {
-	id := _convertFileID{
-		ID: fileID,
-	}
-
-	b, err := bson.Marshal(id)
-	if err != nil {
-		return bsonx.Val{}, err
-	}
-	val := bsoncore.Document(b).Lookup("_id")
-	var res bsonx.Val
-	err = res.UnmarshalBSONValue(val.Type, val.Data)
-	return res, err
-}

mongo/gridfs/upload_stream.go

@@ -17,7 +17,6 @@ import (
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/bson/primitive"
 	"go.mongodb.org/mongo-driver/mongo"
-	"go.mongodb.org/mongo-driver/x/bsonx"
 )
 
 // UploadBufferSize is the size in bytes of one stream batch. Chunks will be written to the db after the sum of chunk
@@ -138,11 +137,7 @@ func (us *UploadStream) Abort() error {
 		defer cancel()
 	}
 
-	id, err := convertFileID(us.FileID)
-	if err != nil {
-		return err
-	}
-	_, err = us.chunksColl.DeleteMany(ctx, bson.D{{"files_id", id}})
+	_, err := us.chunksColl.DeleteMany(ctx, bson.D{{"files_id", us.FileID}})
 	if err != nil {
 		return err
 	}
@@ -164,10 +159,6 @@ func (us *UploadStream) uploadChunks(ctx context.Context, uploadPartial bool) er
 
 	docs := make([]interface{}, numChunks)
 
-	id, err := convertFileID(us.FileID)
-	if err != nil {
-		return err
-	}
 	begChunkIndex := us.chunkIndex
 	for i := 0; i < us.bufferIndex; i += int(us.chunkSize) {
 		endIndex := i + int(us.chunkSize)
@@ -181,16 +172,15 @@ func (us *UploadStream) uploadChunks(ctx context.Context, uploadPartial bool) er
 		chunkData := us.buffer[i:endIndex]
 		docs[us.chunkIndex-begChunkIndex] = bson.D{
 			{"_id", primitive.NewObjectID()},
-			{"files_id", id},
+			{"files_id", us.FileID},
 			{"n", int32(us.chunkIndex)},
-			{"data", bsonx.Binary(0x00, chunkData)},
-			// {"data", bsoncore.BuildDocumentValue(chunkData)},
+			{"data", primitive.Binary{Subtype: 0x00, Data: chunkData}},
 		}
 		us.chunkIndex++
 		us.fileLen += int64(len(chunkData))
 	}
 
-	_, err = us.chunksColl.InsertMany(ctx, docs)
+	_, err := us.chunksColl.InsertMany(ctx, docs)
 	if err != nil {
 		return err
 	}
@@ -205,23 +195,19 @@ func (us *UploadStream) uploadChunks(ctx context.Context, uploadPartial bool) er
 }
 
 func (us *UploadStream) createFilesCollDoc(ctx context.Context) error {
-	id, err := convertFileID(us.FileID)
-	if err != nil {
-		return err
-	}
 	doc := bson.D{
-		{"_id", id},
+		{"_id", us.FileID},
 		{"length", us.fileLen},
 		{"chunkSize", us.chunkSize},
-		{"uploadDate", bsonx.DateTime(time.Now().UnixNano() / int64(time.Millisecond))},
+		{"uploadDate", primitive.DateTime(time.Now().UnixNano() / int64(time.Millisecond))},
 		{"filename", us.filename},
 	}
 
 	if us.metadata != nil {
 		doc = append(doc, bson.E{"metadata", us.metadata})
 	}
 
-	_, err = us.filesColl.InsertOne(ctx, doc)
+	_, err := us.filesColl.InsertOne(ctx, doc)
 	if err != nil {
 		return err
 	}

mongo/mongo.go

@@ -16,6 +16,7 @@ import (
 	"strings"
 
 	"go.mongodb.org/mongo-driver/mongo/options"
+	"go.mongodb.org/mongo-driver/x/bsonx"
 	"go.mongodb.org/mongo-driver/x/bsonx/bsoncore"
 
 	"go.mongodb.org/mongo-driver/bson"
@@ -80,6 +81,8 @@ func transformAndEnsureID(registry *bsoncodec.Registry, val interface{}) (bsonco
 	switch tt := val.(type) {
 	case nil:
 		return nil, nil, ErrNilDocument
+	case bsonx.Doc:
+		val = tt.Copy()
 	case []byte:
 		// Slight optimization so we'll just use MarshalBSON and not go through the codec machinery.
 		val = bson.Raw(tt)
@@ -120,17 +123,6 @@ func transformAndEnsureID(registry *bsoncodec.Registry, val interface{}) (bsonco
 	return doc, id, nil
 }
 
-// func transformDocument(registry *bsoncodec.Registry, val interface{}) (bsoncore.Document, error) {
-// 	// if doc, ok := val.(bsonx.Doc); ok {
-// 	// 	return doc.Copy(), nil
-// 	// }
-// 	b, err := transformBsoncoreDocument(registry, val, true, "document")
-// 	if err != nil {
-// 		return nil, err
-// 	}
-// 	return b, nil
-// }
-
 func transformBsoncoreDocument(registry *bsoncodec.Registry, val interface{}, mapAllowed bool, paramName string) (bsoncore.Document, error) {
 	if registry == nil {
 		registry = bson.DefaultRegistry
@@ -273,7 +265,7 @@ func transformUpdateValue(registry *bsoncodec.Registry, update interface{}, doll
 	switch t := update.(type) {
 	case nil:
 		return u, ErrNilDocument
-	case primitive.D:
+	case primitive.D, bsonx.Doc:
 		u.Type = bsontype.EmbeddedDocument
 		u.Data, err = transformBsoncoreDocument(registry, update, true, "update")
 		if err != nil {

mongo/mongo_test.go

@@ -459,20 +459,6 @@ func TestMongoHelpers(t *testing.T) {
 	})
 }
 
-var _ bson.Marshaler = bMarsh{}
-
-type bMarsh struct {
-	bson.D
-}
-
-func (b bMarsh) MarshalBSON() ([]byte, error) {
-	return bson.Marshal(b)
-}
-
-type reflectStruct struct {
-	Foo string
-}
-
 var _ bsoncodec.ValueMarshaler = bvMarsh{}
 
 type bvMarsh struct {