Implement improved Go Driver CRUD API

GODRIVER-586
GODRIVER-505
GODRIVER-349

Co-authored-by: Matthew Chiaravalloti <[email protected]>
Change-Id: I6008752862ae100ec9bce052a1c28b3ac8c29eeb

Author: mattChiaravalloti

core/command/aggregate.go

@@ -8,10 +8,8 @@ package command
 
 import (
 	"context"
-
 	"github.com/mongodb/mongo-go-driver/bson"
 	"github.com/mongodb/mongo-go-driver/core/description"
-	"github.com/mongodb/mongo-go-driver/core/option"
 	"github.com/mongodb/mongo-go-driver/core/readconcern"
 	"github.com/mongodb/mongo-go-driver/core/readpref"
 	"github.com/mongodb/mongo-go-driver/core/session"
@@ -25,7 +23,8 @@ import (
 type Aggregate struct {
 	NS           Namespace
 	Pipeline     *bson.Array
-	Opts         []option.AggregateOptioner
+	CursorOpts   []*bson.Element
+	Opts         []*bson.Element
 	ReadPref     *readpref.ReadPref
 	WriteConcern *writeconcern.WriteConcern
 	ReadConcern  *readconcern.ReadConcern
@@ -58,22 +57,14 @@ func (a *Aggregate) encode(desc description.SelectedServer) (*Read, error) {
 	command.Append(bson.EC.SubDocument("cursor", cursor))
 
 	for _, opt := range a.Opts {
-		switch t := opt.(type) {
-		case nil, option.OptMaxAwaitTime:
-			continue
-		case option.OptBatchSize:
-			if t == 0 && a.HasDollarOut() {
+		switch opt.Key() {
+		case "batchSize":
+			if opt.Value().Int32() == 0 && a.HasDollarOut() {
 				continue
 			}
-			err := opt.Option(cursor)
-			if err != nil {
-				return nil, err
-			}
+			cursor.Append(opt)
 		default:
-			err := opt.Option(command)
-			if err != nil {
-				return nil, err
-			}
+			command.Append(opt)
 		}
 	}
 
@@ -135,19 +126,10 @@ func (a *Aggregate) Decode(desc description.SelectedServer, cb CursorBuilder, wm
 }
 
 func (a *Aggregate) decode(desc description.SelectedServer, cb CursorBuilder, rdr bson.Raw) *Aggregate {
-	opts := make([]option.CursorOptioner, 0)
-	for _, opt := range a.Opts {
-		curOpt, ok := opt.(option.CursorOptioner)
-		if !ok {
-			continue
-		}
-		opts = append(opts, curOpt)
-	}
-
 	labels, err := getErrorLabels(&rdr)
 	a.err = err
 
-	res, err := cb.BuildCursor(rdr, a.Session, a.Clock, opts...)
+	res, err := cb.BuildCursor(rdr, a.Session, a.Clock, a.CursorOpts...)
 	a.result = res
 	if err != nil {
 		a.err = Error{Message: err.Error(), Labels: labels}

core/command/command.go

@@ -15,7 +15,6 @@ import (
 	"github.com/mongodb/mongo-go-driver/bson/bsoncore"
 	"github.com/mongodb/mongo-go-driver/bson/bsontype"
 	"github.com/mongodb/mongo-go-driver/core/description"
-	"github.com/mongodb/mongo-go-driver/core/option"
 	"github.com/mongodb/mongo-go-driver/core/readconcern"
 	"github.com/mongodb/mongo-go-driver/core/result"
 	"github.com/mongodb/mongo-go-driver/core/session"
@@ -435,7 +434,7 @@ splitInserts:
 
 func encodeBatch(
 	docs []*bson.Document,
-	opts []option.Optioner,
+	opts []*bson.Element,
 	cmdKind WriteCommandKind,
 	collName string,
 ) (*bson.Document, error) {
@@ -463,17 +462,7 @@ func encodeBatch(
 		vals = append(vals, bson.VC.Document(doc))
 	}
 	cmd.Append(bson.EC.ArrayFromElements(docString, vals...))
-
-	for _, opt := range opts {
-		if opt == nil {
-			continue
-		}
-
-		err := opt.Option(cmd)
-		if err != nil {
-			return nil, err
-		}
-	}
+	cmd.Append(opts...)
 
 	return cmd, nil
 }

core/command/count.go

@@ -12,7 +12,6 @@ import (
 
 	"github.com/mongodb/mongo-go-driver/bson"
 	"github.com/mongodb/mongo-go-driver/core/description"
-	"github.com/mongodb/mongo-go-driver/core/option"
 	"github.com/mongodb/mongo-go-driver/core/readconcern"
 	"github.com/mongodb/mongo-go-driver/core/readpref"
 	"github.com/mongodb/mongo-go-driver/core/session"
@@ -25,7 +24,7 @@ import (
 type Count struct {
 	NS          Namespace
 	Query       *bson.Document
-	Opts        []option.CountOptioner
+	Opts        []*bson.Element
 	ReadPref    *readpref.ReadPref
 	ReadConcern *readconcern.ReadConcern
 	Clock       *session.ClusterClock
@@ -51,15 +50,7 @@ func (c *Count) encode(desc description.SelectedServer) (*Read, error) {
 	}
 
 	command := bson.NewDocument(bson.EC.String("count", c.NS.Collection), bson.EC.SubDocument("query", c.Query))
-	for _, opt := range c.Opts {
-		if opt == nil {
-			continue
-		}
-		err := opt.Option(command)
-		if err != nil {
-			return nil, err
-		}
-	}
+	command.Append(c.Opts...)
 
 	return &Read{
 		Clock:       c.Clock,

core/command/count_documents.go

@@ -12,7 +12,6 @@ import (
 
 	"github.com/mongodb/mongo-go-driver/bson"
 	"github.com/mongodb/mongo-go-driver/core/description"
-	"github.com/mongodb/mongo-go-driver/core/option"
 	"github.com/mongodb/mongo-go-driver/core/readconcern"
 	"github.com/mongodb/mongo-go-driver/core/readpref"
 	"github.com/mongodb/mongo-go-driver/core/session"
@@ -25,7 +24,7 @@ import (
 type CountDocuments struct {
 	NS          Namespace
 	Pipeline    *bson.Array
-	Opts        []option.CountOptioner
+	Opts        []*bson.Element
 	ReadPref    *readpref.ReadPref
 	ReadConcern *readconcern.ReadConcern
 	Clock       *session.ClusterClock
@@ -45,22 +44,7 @@ func (c *CountDocuments) Encode(desc description.SelectedServer) (wiremessage.Wi
 
 	cursor := bson.NewDocument()
 	command.Append(bson.EC.SubDocument("cursor", cursor))
-	for _, opt := range c.Opts {
-		if opt == nil {
-			continue
-		}
-		//because we already have these options in the pipeline
-		switch opt.(type) {
-		case option.OptSkip:
-			continue
-		case option.OptLimit:
-			continue
-		}
-		err := opt.Option(command)
-		if err != nil {
-			return nil, err
-		}
-	}
+	command.Append(c.Opts...)
 
 	return (&Read{DB: c.NS.DB, ReadPref: c.ReadPref, Command: command}).Encode(desc)
 }

core/command/create_indexes.go

@@ -11,7 +11,6 @@ import (
 
 	"github.com/mongodb/mongo-go-driver/bson"
 	"github.com/mongodb/mongo-go-driver/core/description"
-	"github.com/mongodb/mongo-go-driver/core/option"
 	"github.com/mongodb/mongo-go-driver/core/result"
 	"github.com/mongodb/mongo-go-driver/core/session"
 	"github.com/mongodb/mongo-go-driver/core/wiremessage"
@@ -24,7 +23,7 @@ import (
 type CreateIndexes struct {
 	NS           Namespace
 	Indexes      *bson.Array
-	Opts         []option.CreateIndexesOptioner
+	Opts         []*bson.Element
 	WriteConcern *writeconcern.WriteConcern
 	Clock        *session.ClusterClock
 	Session      *session.Client
@@ -48,16 +47,7 @@ func (ci *CreateIndexes) encode(desc description.SelectedServer) (*Write, error)
 		bson.EC.String("createIndexes", ci.NS.Collection),
 		bson.EC.Array("indexes", ci.Indexes),
 	)
-
-	for _, opt := range ci.Opts {
-		if opt == nil {
-			continue
-		}
-		err := opt.Option(cmd)
-		if err != nil {
-			return nil, err
-		}
-	}
+	cmd.Append(ci.Opts...)
 
 	return &Write{
 		Clock:        ci.Clock,

core/command/cursor.go

@@ -8,9 +8,7 @@ package command
 
 import (
 	"context"
-
 	"github.com/mongodb/mongo-go-driver/bson"
-	"github.com/mongodb/mongo-go-driver/core/option"
 	"github.com/mongodb/mongo-go-driver/core/session"
 )
 
@@ -61,7 +59,7 @@ type Cursor interface {
 
 // CursorBuilder is a type that can build a Cursor.
 type CursorBuilder interface {
-	BuildCursor(bson.Raw, *session.Client, *session.ClusterClock, ...option.CursorOptioner) (Cursor, error)
+	BuildCursor(bson.Raw, *session.Client, *session.ClusterClock, ...*bson.Element) (Cursor, error)
 }
 
 type emptyCursor struct{}

core/command/delete.go

@@ -11,7 +11,6 @@ import (
 
 	"github.com/mongodb/mongo-go-driver/bson"
 	"github.com/mongodb/mongo-go-driver/core/description"
-	"github.com/mongodb/mongo-go-driver/core/option"
 	"github.com/mongodb/mongo-go-driver/core/result"
 	"github.com/mongodb/mongo-go-driver/core/session"
 	"github.com/mongodb/mongo-go-driver/core/wiremessage"
@@ -26,7 +25,7 @@ type Delete struct {
 	ContinueOnError bool
 	NS              Namespace
 	Deletes         []*bson.Document
-	Opts            []option.DeleteOptioner
+	Opts            []*bson.Element
 	WriteConcern    *writeconcern.WriteConcern
 	Clock           *session.ClusterClock
 	Session         *session.Client
@@ -70,18 +69,13 @@ func (d *Delete) encodeBatch(docs []*bson.Document, desc description.SelectedSer
 		copyDocs = append(copyDocs, doc.Copy())
 	}
 
-	var options []option.Optioner
+	var options []*bson.Element
 	for _, opt := range d.Opts {
-		switch opt.(type) {
-		case nil:
-			continue
-		case option.OptCollation:
+		if opt.Key() == "collation" {
 			for _, doc := range copyDocs {
-				if err := opt.Option(doc); err != nil {
-					return nil, err
-				}
+				doc.Append(opt)
 			}
-		default:
+		} else {
 			options = append(options, opt)
 		}
 	}

core/command/distinct.go

@@ -11,7 +11,6 @@ import (
 
 	"github.com/mongodb/mongo-go-driver/bson"
 	"github.com/mongodb/mongo-go-driver/core/description"
-	"github.com/mongodb/mongo-go-driver/core/option"
 	"github.com/mongodb/mongo-go-driver/core/readconcern"
 	"github.com/mongodb/mongo-go-driver/core/readpref"
 	"github.com/mongodb/mongo-go-driver/core/result"
@@ -27,7 +26,7 @@ type Distinct struct {
 	NS          Namespace
 	Field       string
 	Query       *bson.Document
-	Opts        []option.DistinctOptioner
+	Opts        []*bson.Element
 	ReadPref    *readpref.ReadPref
 	ReadConcern *readconcern.ReadConcern
 	Clock       *session.ClusterClock
@@ -59,15 +58,7 @@ func (d *Distinct) encode(desc description.SelectedServer) (*Read, error) {
 		command.Append(bson.EC.SubDocument("query", d.Query))
 	}
 
-	for _, opt := range d.Opts {
-		if opt == nil {
-			continue
-		}
-		err := opt.Option(command)
-		if err != nil {
-			return nil, err
-		}
-	}
+	command.Append(d.Opts...)
 
 	return &Read{
 		Clock:       d.Clock,

core/command/drop_indexes.go

@@ -11,7 +11,6 @@ import (
 
 	"github.com/mongodb/mongo-go-driver/bson"
 	"github.com/mongodb/mongo-go-driver/core/description"
-	"github.com/mongodb/mongo-go-driver/core/option"
 	"github.com/mongodb/mongo-go-driver/core/session"
 	"github.com/mongodb/mongo-go-driver/core/wiremessage"
 	"github.com/mongodb/mongo-go-driver/core/writeconcern"
@@ -23,7 +22,7 @@ import (
 type DropIndexes struct {
 	NS           Namespace
 	Index        string
-	Opts         []option.DropIndexesOptioner
+	Opts         []*bson.Element
 	WriteConcern *writeconcern.WriteConcern
 	Clock        *session.ClusterClock
 	Session      *session.Client
@@ -47,16 +46,7 @@ func (di *DropIndexes) encode(desc description.SelectedServer) (*Write, error) {
 		bson.EC.String("dropIndexes", di.NS.Collection),
 		bson.EC.String("index", di.Index),
 	)
-
-	for _, opt := range di.Opts {
-		if opt == nil {
-			continue
-		}
-		err := opt.Option(cmd)
-		if err != nil {
-			return nil, err
-		}
-	}
+	cmd.Append(di.Opts...)
 
 	return &Write{
 		Clock:        di.Clock,