Merge branch 'master' into GODRIVER-410

Author: thomasgeulen

.gitignore

@@ -5,3 +5,5 @@ debug
 *.ipr
 *.iws
 .idea
+*.sublime-project
+*.sublime-workspace

core/command/create_indexes.go

@@ -11,6 +11,7 @@ import (
 
 	"github.com/mongodb/mongo-go-driver/bson"
 	"github.com/mongodb/mongo-go-driver/core/description"
+	"github.com/mongodb/mongo-go-driver/core/options"
 	"github.com/mongodb/mongo-go-driver/core/result"
 	"github.com/mongodb/mongo-go-driver/core/wiremessage"
 )
@@ -21,9 +22,9 @@ import (
 type CreateIndexes struct {
 	NS      Namespace
 	Indexes *bson.Array
-
-	result result.CreateIndexes
-	err    error
+	Opts    []options.CreateIndexesOptioner
+	result  result.CreateIndexes
+	err     error
 }
 
 // Encode will encode this command into a wire message for the given server description.
@@ -33,6 +34,16 @@ func (ci *CreateIndexes) Encode(desc description.SelectedServer) (wiremessage.Wi
 		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
+		}
+	}
+
 	return (&Command{DB: ci.NS.DB, Command: cmd, isWrite: true}).Encode(desc)
 }
 

core/command/drop_indexes.go

@@ -11,16 +11,17 @@ import (
 
 	"github.com/mongodb/mongo-go-driver/bson"
 	"github.com/mongodb/mongo-go-driver/core/description"
+	"github.com/mongodb/mongo-go-driver/core/options"
 	"github.com/mongodb/mongo-go-driver/core/wiremessage"
 )
 
 // DropIndexes represents the dropIndexes command.
 //
 // The dropIndexes command drops indexes for a namespace.
 type DropIndexes struct {
-	NS    Namespace
-	Index string
-
+	NS     Namespace
+	Index  string
+	Opts   []options.DropIndexesOptioner
 	result bson.Reader
 	err    error
 }
@@ -32,6 +33,16 @@ func (di *DropIndexes) Encode(desc description.SelectedServer) (wiremessage.Wire
 		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
+		}
+	}
+
 	return (&Command{DB: di.NS.DB, Command: cmd, isWrite: true}).Encode(desc)
 }
 

core/command/list_indexes.go

@@ -19,9 +19,8 @@ import (
 //
 // The listIndexes command lists the indexes for a namespace.
 type ListIndexes struct {
-	NS   Namespace
-	Opts []options.ListIndexesOptioner
-
+	NS     Namespace
+	Opts   []options.ListIndexesOptioner
 	result Cursor
 	err    error
 }

core/options/options.go

@@ -137,18 +137,32 @@ type ListDatabasesOptioner interface {
 	listDatabasesOption()
 }
 
-// ListIndexesOptioner is the interface implemented by types that can be used as
-// Options for ListIndexes operations.
+// CursorOptioner is the interface implemented by types that can be used as
+// Options for Cursor operations.
+type CursorOptioner interface {
+	Optioner
+	cursorOption()
+}
+
+//ListIndexesOptioner is the interface implemented by types that can be used as
+// Options for list_indexes operations.
 type ListIndexesOptioner interface {
 	Optioner
 	listIndexesOption()
 }
 
-// CursorOptioner is the interface implemented by types that can be used as
-// Options for Cursor operations.
-type CursorOptioner interface {
+//CreateIndexesOptioner is the interface implemented by types that can be used as
+// Options for create_indexes operations.
+type CreateIndexesOptioner interface {
 	Optioner
-	cursorOption()
+	createIndexesOption()
+}
+
+//DropIndexesOptioner is the interface implemented by types that can be used as
+// Options for drop_indexes operations.
+type DropIndexesOptioner interface {
+	Optioner
+	dropIndexesOption()
 }
 
 var (
@@ -480,6 +494,9 @@ func (OptMaxTime) findOneOption()           {}
 func (OptMaxTime) findOneAndDeleteOption()  {}
 func (OptMaxTime) findOneAndReplaceOption() {}
 func (OptMaxTime) findOneAndUpdateOption()  {}
+func (OptMaxTime) listIndexesOption()       {}
+func (OptMaxTime) dropIndexesOption()       {}
+func (OptMaxTime) createIndexesOption()     {}
 
 // OptMin is for internal use.
 type OptMin struct{ Min *bson.Document }
@@ -705,6 +722,8 @@ func (OptWriteConcern) insertManyOption()        {}
 func (OptWriteConcern) insertOneOption()         {}
 func (OptWriteConcern) replaceOption()           {}
 func (OptWriteConcern) updateOption()            {}
+func (OptWriteConcern) createIndexesOption()     {}
+func (OptWriteConcern) dropIndexesOption()       {}
 
 // OptNameOnly is for internal use.
 type OptNameOnly bool

mongo/client.go

@@ -118,14 +118,20 @@ func newClient(cs connstring.ConnString, opts *ClientOptions) (*Client, error) {
 	if err != nil {
 		return nil, err
 	}
-
 	client.topology = topo
+
 	client.readConcern = readConcernFromConnString(&client.connString)
 	client.writeConcern = writeConcernFromConnString(&client.connString)
-	client.readPreference, err = readPreferenceFromConnString(&client.connString)
+
+	rp, err := readPreferenceFromConnString(&client.connString)
 	if err != nil {
 		return nil, err
 	}
+	if rp != nil {
+		client.readPreference = rp
+	} else {
+		client.readPreference = readpref.Primary()
+	}
 
 	return client, nil
 }
@@ -190,6 +196,7 @@ func readPreferenceFromConnString(cs *connstring.ConnString) (*readpref.ReadPref
 	if cs.MaxStaleness != 0 {
 		options = append(options, readpref.WithMaxStaleness(cs.MaxStaleness))
 	}
+
 	if len(cs.ReadPreference) > 0 {
 		if rp == nil {
 			mode, _ := readpref.ModeFromString(cs.ReadPreference)
@@ -199,6 +206,7 @@ func readPreferenceFromConnString(cs *connstring.ConnString) (*readpref.ReadPref
 			}
 		}
 	}
+
 	return rp, nil
 }
 

mongo/client_internal_test.go

@@ -331,5 +331,17 @@ func TestClient_ReadPreference(t *testing.T) {
 	d, flag := c.readPreference.MaxStaleness()
 	require.True(t, flag)
 	require.Equal(t, time.Duration(5)*time.Second, d)
+}
+
+func TestClient_ReadPreferenceAbsent(t *testing.T) {
+	t.Parallel()
 
+	cs := testutil.ConnString(t)
+	c, err := NewClient(cs.String())
+	require.NoError(t, err)
+	require.NotNil(t, c)
+	require.Equal(t, readpref.PrimaryMode, c.readPreference.Mode())
+	require.Empty(t, c.readPreference.TagSets())
+	_, flag := c.readPreference.MaxStaleness()
+	require.False(t, flag)
 }