Skip to content

Commit c1e0940

Browse files
tychoishtychoish
committed
GODRIVER-273: rename options package to option
Change-Id: I47a4bf5e7ccf29483bfcc6010653ab9d088e5b9c
1 parent ba9aede commit c1e0940

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+274
-274
lines changed

‎core/command/aggregate.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111

1212
"github.com/mongodb/mongo-go-driver/bson"
1313
"github.com/mongodb/mongo-go-driver/core/description"
14-
"github.com/mongodb/mongo-go-driver/core/options"
14+
"github.com/mongodb/mongo-go-driver/core/option"
1515
"github.com/mongodb/mongo-go-driver/core/readpref"
1616
"github.com/mongodb/mongo-go-driver/core/wiremessage"
1717
)
@@ -22,7 +22,7 @@ import (
2222
type Aggregate struct {
2323
NS Namespace
2424
Pipeline *bson.Array
25-
Opts []options.AggregateOptioner
25+
Opts []option.AggregateOptioner
2626
ReadPref *readpref.ReadPref
2727

2828
result Cursor
@@ -41,20 +41,20 @@ func (a *Aggregate) Encode(desc description.SelectedServer) (wiremessage.WireMes
4141
cursor := bson.NewDocument()
4242
command.Append(bson.EC.SubDocument("cursor", cursor))
4343

44-
for _, option := range a.Opts {
45-
switch t := option.(type) {
44+
for _, opt := range a.Opts {
45+
switch t := opt.(type) {
4646
case nil:
4747
continue
48-
case options.OptBatchSize:
48+
case option.OptBatchSize:
4949
if t == 0 && a.HasDollarOut() {
5050
continue
5151
}
52-
err := option.Option(cursor)
52+
err := opt.Option(cursor)
5353
if err != nil {
5454
return nil, err
5555
}
5656
default:
57-
err := option.Option(command)
57+
err := opt.Option(command)
5858
if err != nil {
5959
return nil, err
6060
}
@@ -98,9 +98,9 @@ func (a *Aggregate) Decode(desc description.SelectedServer, cb CursorBuilder, wm
9898
return a
9999
}
100100

101-
opts := make([]options.CursorOptioner, 0)
101+
opts := make([]option.CursorOptioner, 0)
102102
for _, opt := range a.Opts {
103-
curOpt, ok := opt.(options.CursorOptioner)
103+
curOpt, ok := opt.(option.CursorOptioner)
104104
if !ok {
105105
continue
106106
}

‎core/command/count.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212

1313
"github.com/mongodb/mongo-go-driver/bson"
1414
"github.com/mongodb/mongo-go-driver/core/description"
15-
"github.com/mongodb/mongo-go-driver/core/options"
15+
"github.com/mongodb/mongo-go-driver/core/option"
1616
"github.com/mongodb/mongo-go-driver/core/readpref"
1717
"github.com/mongodb/mongo-go-driver/core/wiremessage"
1818
)
@@ -23,7 +23,7 @@ import (
2323
type Count struct {
2424
NS Namespace
2525
Query *bson.Document
26-
Opts []options.CountOptioner
26+
Opts []option.CountOptioner
2727
ReadPref *readpref.ReadPref
2828

2929
result int64

‎core/command/create_indexes.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111

1212
"github.com/mongodb/mongo-go-driver/bson"
1313
"github.com/mongodb/mongo-go-driver/core/description"
14-
"github.com/mongodb/mongo-go-driver/core/options"
14+
"github.com/mongodb/mongo-go-driver/core/option"
1515
"github.com/mongodb/mongo-go-driver/core/result"
1616
"github.com/mongodb/mongo-go-driver/core/wiremessage"
1717
)
@@ -22,7 +22,7 @@ import (
2222
type CreateIndexes struct {
2323
NS Namespace
2424
Indexes *bson.Array
25-
Opts []options.CreateIndexesOptioner
25+
Opts []option.CreateIndexesOptioner
2626
result result.CreateIndexes
2727
err error
2828
}

‎core/command/cursor.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"context"
1111

1212
"github.com/mongodb/mongo-go-driver/bson"
13-
"github.com/mongodb/mongo-go-driver/core/options"
13+
"github.com/mongodb/mongo-go-driver/core/option"
1414
)
1515

1616
// Cursor instances iterate a stream of documents. Each document is
@@ -60,7 +60,7 @@ type Cursor interface {
6060

6161
// CursorBuilder is a type that can build a Cursor.
6262
type CursorBuilder interface {
63-
BuildCursor(bson.Reader, ...options.CursorOptioner) (Cursor, error)
63+
BuildCursor(bson.Reader, ...option.CursorOptioner) (Cursor, error)
6464
}
6565

6666
type emptyCursor struct{}

‎core/command/delete.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111

1212
"github.com/mongodb/mongo-go-driver/bson"
1313
"github.com/mongodb/mongo-go-driver/core/description"
14-
"github.com/mongodb/mongo-go-driver/core/options"
14+
"github.com/mongodb/mongo-go-driver/core/option"
1515
"github.com/mongodb/mongo-go-driver/core/result"
1616
"github.com/mongodb/mongo-go-driver/core/wiremessage"
1717
)
@@ -23,7 +23,7 @@ import (
2323
type Delete struct {
2424
NS Namespace
2525
Deletes []*bson.Document
26-
Opts []options.DeleteOptioner
26+
Opts []option.DeleteOptioner
2727

2828
result result.Delete
2929
err error
@@ -43,18 +43,18 @@ func (d *Delete) Encode(desc description.SelectedServer) (wiremessage.WireMessag
4343
}
4444
command.Append(bson.EC.Array("deletes", arr))
4545

46-
for _, option := range d.Opts {
47-
switch option.(type) {
46+
for _, opt := range d.Opts {
47+
switch opt.(type) {
4848
case nil:
49-
case options.OptCollation:
49+
case option.OptCollation:
5050
for _, doc := range d.Deletes {
51-
err := option.Option(doc)
51+
err := opt.Option(doc)
5252
if err != nil {
5353
return nil, err
5454
}
5555
}
5656
default:
57-
err := option.Option(command)
57+
err := opt.Option(command)
5858
if err != nil {
5959
return nil, err
6060
}

‎core/command/distinct.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111

1212
"github.com/mongodb/mongo-go-driver/bson"
1313
"github.com/mongodb/mongo-go-driver/core/description"
14-
"github.com/mongodb/mongo-go-driver/core/options"
14+
"github.com/mongodb/mongo-go-driver/core/option"
1515
"github.com/mongodb/mongo-go-driver/core/readpref"
1616
"github.com/mongodb/mongo-go-driver/core/result"
1717
"github.com/mongodb/mongo-go-driver/core/wiremessage"
@@ -25,7 +25,7 @@ type Distinct struct {
2525
NS Namespace
2626
Field string
2727
Query *bson.Document
28-
Opts []options.DistinctOptioner
28+
Opts []option.DistinctOptioner
2929
ReadPref *readpref.ReadPref
3030

3131
result result.Distinct

‎core/command/drop_indexes.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111

1212
"github.com/mongodb/mongo-go-driver/bson"
1313
"github.com/mongodb/mongo-go-driver/core/description"
14-
"github.com/mongodb/mongo-go-driver/core/options"
14+
"github.com/mongodb/mongo-go-driver/core/option"
1515
"github.com/mongodb/mongo-go-driver/core/wiremessage"
1616
)
1717

@@ -21,7 +21,7 @@ import (
2121
type DropIndexes struct {
2222
NS Namespace
2323
Index string
24-
Opts []options.DropIndexesOptioner
24+
Opts []option.DropIndexesOptioner
2525
result bson.Reader
2626
err error
2727
}

‎core/command/find.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111

1212
"github.com/mongodb/mongo-go-driver/bson"
1313
"github.com/mongodb/mongo-go-driver/core/description"
14-
"github.com/mongodb/mongo-go-driver/core/options"
14+
"github.com/mongodb/mongo-go-driver/core/option"
1515
"github.com/mongodb/mongo-go-driver/core/readpref"
1616
"github.com/mongodb/mongo-go-driver/core/wiremessage"
1717
)
@@ -22,7 +22,7 @@ import (
2222
type Find struct {
2323
NS Namespace
2424
Filter *bson.Document
25-
Opts []options.FindOptioner
25+
Opts []option.FindOptioner
2626
ReadPref *readpref.ReadPref
2727

2828
result Cursor
@@ -45,20 +45,20 @@ func (f *Find) Encode(desc description.SelectedServer) (wiremessage.WireMessage,
4545
var batchSize int32
4646
var err error
4747

48-
for _, option := range f.Opts {
49-
switch t := option.(type) {
48+
for _, opt := range f.Opts {
49+
switch t := opt.(type) {
5050
case nil:
5151
continue
52-
case options.OptLimit:
52+
case option.OptLimit:
5353
limit = int64(t)
54-
err = option.Option(command)
55-
case options.OptBatchSize:
54+
err = opt.Option(command)
55+
case option.OptBatchSize:
5656
batchSize = int32(t)
57-
err = option.Option(command)
58-
case options.OptProjection:
57+
err = opt.Option(command)
58+
case option.OptProjection:
5959
err = t.IsFind().Option(command)
6060
default:
61-
err = option.Option(command)
61+
err = opt.Option(command)
6262
}
6363
if err != nil {
6464
return nil, err
@@ -81,9 +81,9 @@ func (f *Find) Decode(desc description.SelectedServer, cb CursorBuilder, wm wire
8181
return f
8282
}
8383

84-
opts := make([]options.CursorOptioner, 0)
84+
opts := make([]option.CursorOptioner, 0)
8585
for _, opt := range f.Opts {
86-
curOpt, ok := opt.(options.CursorOptioner)
86+
curOpt, ok := opt.(option.CursorOptioner)
8787
if !ok {
8888
continue
8989
}

‎core/command/find_one_delete.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111

1212
"github.com/mongodb/mongo-go-driver/bson"
1313
"github.com/mongodb/mongo-go-driver/core/description"
14-
"github.com/mongodb/mongo-go-driver/core/options"
14+
"github.com/mongodb/mongo-go-driver/core/option"
1515
"github.com/mongodb/mongo-go-driver/core/result"
1616
"github.com/mongodb/mongo-go-driver/core/wiremessage"
1717
)
@@ -22,7 +22,7 @@ import (
2222
type FindOneAndDelete struct {
2323
NS Namespace
2424
Query *bson.Document
25-
Opts []options.FindOneAndDeleteOptioner
25+
Opts []option.FindOneAndDeleteOptioner
2626

2727
result result.FindAndModify
2828
err error

‎core/command/find_one_replace.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111

1212
"github.com/mongodb/mongo-go-driver/bson"
1313
"github.com/mongodb/mongo-go-driver/core/description"
14-
"github.com/mongodb/mongo-go-driver/core/options"
14+
"github.com/mongodb/mongo-go-driver/core/option"
1515
"github.com/mongodb/mongo-go-driver/core/result"
1616
"github.com/mongodb/mongo-go-driver/core/wiremessage"
1717
)
@@ -23,7 +23,7 @@ type FindOneAndReplace struct {
2323
NS Namespace
2424
Query *bson.Document
2525
Replacement *bson.Document
26-
Opts []options.FindOneAndReplaceOptioner
26+
Opts []option.FindOneAndReplaceOptioner
2727

2828
result result.FindAndModify
2929
err error

0 commit comments

Comments
 (0)