Remove topology versions of server selector

skriptble · skriptble · commit ba3ea21640a9 · 2018-04-06T15:01:11.000-04:00
Remove the topology server selector version and update all references to the topology package's server selectors to use the description package's server selectors. GODRIVER-334 Change-Id: I6f11576e8c1657fbbde2dc5a42691ae5a12258f5
diff --git a/core/dispatch/aggregate.go b/core/dispatch/aggregate.go
@@ -4,6 +4,7 @@ import (
 	"context"
 
 	"github.com/mongodb/mongo-go-driver/core/command"
+	"github.com/mongodb/mongo-go-driver/core/description"
 	"github.com/mongodb/mongo-go-driver/core/options"
 	"github.com/mongodb/mongo-go-driver/core/topology"
 	"github.com/mongodb/mongo-go-driver/core/writeconcern"
@@ -15,7 +16,7 @@ func Aggregate(
 	ctx context.Context,
 	cmd command.Aggregate,
 	topo *topology.Topology,
-	readSelector, writeSelector topology.ServerSelector,
+	readSelector, writeSelector description.ServerSelector,
 	wc *writeconcern.WriteConcern,
 ) (command.Cursor, error) {
 
diff --git a/core/dispatch/command.go b/core/dispatch/command.go
@@ -5,6 +5,7 @@ import (
 
 	"github.com/mongodb/mongo-go-driver/bson"
 	"github.com/mongodb/mongo-go-driver/core/command"
+	"github.com/mongodb/mongo-go-driver/core/description"
 	"github.com/mongodb/mongo-go-driver/core/topology"
 )
 
@@ -14,7 +15,7 @@ func Command(
 	ctx context.Context,
 	cmd command.Command,
 	topo *topology.Topology,
-	selector topology.ServerSelector,
+	selector description.ServerSelector,
 ) (bson.Reader, error) {
 
 	ss, err := topo.SelectServer(ctx, selector)
diff --git a/core/dispatch/count.go b/core/dispatch/count.go
@@ -4,6 +4,7 @@ import (
 	"context"
 
 	"github.com/mongodb/mongo-go-driver/core/command"
+	"github.com/mongodb/mongo-go-driver/core/description"
 	"github.com/mongodb/mongo-go-driver/core/readconcern"
 	"github.com/mongodb/mongo-go-driver/core/topology"
 )
@@ -14,7 +15,7 @@ func Count(
 	ctx context.Context,
 	cmd command.Count,
 	topo *topology.Topology,
-	selector topology.ServerSelector,
+	selector description.ServerSelector,
 	rc *readconcern.ReadConcern,
 ) (int64, error) {
 
diff --git a/core/dispatch/create_indexes.go b/core/dispatch/create_indexes.go
@@ -4,6 +4,7 @@ import (
 	"context"
 
 	"github.com/mongodb/mongo-go-driver/core/command"
+	"github.com/mongodb/mongo-go-driver/core/description"
 	"github.com/mongodb/mongo-go-driver/core/result"
 	"github.com/mongodb/mongo-go-driver/core/topology"
 )
@@ -14,7 +15,7 @@ func CreateIndexes(
 	ctx context.Context,
 	cmd command.CreateIndexes,
 	topo *topology.Topology,
-	selector topology.ServerSelector,
+	selector description.ServerSelector,
 ) (result.CreateIndexes, error) {
 
 	ss, err := topo.SelectServer(ctx, selector)
diff --git a/core/dispatch/delete.go b/core/dispatch/delete.go
@@ -4,6 +4,7 @@ import (
 	"context"
 
 	"github.com/mongodb/mongo-go-driver/core/command"
+	"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/topology"
@@ -16,7 +17,7 @@ func Delete(
 	ctx context.Context,
 	cmd command.Delete,
 	topo *topology.Topology,
-	selector topology.ServerSelector,
+	selector description.ServerSelector,
 	wc *writeconcern.WriteConcern,
 ) (result.Delete, error) {
 
diff --git a/core/dispatch/delete_indexes.go b/core/dispatch/delete_indexes.go
@@ -5,6 +5,7 @@ import (
 
 	"github.com/mongodb/mongo-go-driver/bson"
 	"github.com/mongodb/mongo-go-driver/core/command"
+	"github.com/mongodb/mongo-go-driver/core/description"
 	"github.com/mongodb/mongo-go-driver/core/topology"
 )
 
@@ -14,7 +15,7 @@ func DropIndexes(
 	ctx context.Context,
 	cmd command.DropIndexes,
 	topo *topology.Topology,
-	selector topology.ServerSelector,
+	selector description.ServerSelector,
 ) (bson.Reader, error) {
 
 	ss, err := topo.SelectServer(ctx, selector)
diff --git a/core/dispatch/distinct.go b/core/dispatch/distinct.go
@@ -4,6 +4,7 @@ import (
 	"context"
 
 	"github.com/mongodb/mongo-go-driver/core/command"
+	"github.com/mongodb/mongo-go-driver/core/description"
 	"github.com/mongodb/mongo-go-driver/core/readconcern"
 	"github.com/mongodb/mongo-go-driver/core/result"
 	"github.com/mongodb/mongo-go-driver/core/topology"
@@ -15,7 +16,7 @@ func Distinct(
 	ctx context.Context,
 	cmd command.Distinct,
 	topo *topology.Topology,
-	selector topology.ServerSelector,
+	selector description.ServerSelector,
 	rc *readconcern.ReadConcern,
 ) (result.Distinct, error) {
 
diff --git a/core/dispatch/find.go b/core/dispatch/find.go
@@ -4,6 +4,7 @@ import (
 	"context"
 
 	"github.com/mongodb/mongo-go-driver/core/command"
+	"github.com/mongodb/mongo-go-driver/core/description"
 	"github.com/mongodb/mongo-go-driver/core/readconcern"
 	"github.com/mongodb/mongo-go-driver/core/topology"
 )
@@ -14,7 +15,7 @@ func Find(
 	ctx context.Context,
 	cmd command.Find,
 	topo *topology.Topology,
-	selector topology.ServerSelector,
+	selector description.ServerSelector,
 	rc *readconcern.ReadConcern,
 ) (command.Cursor, error) {
 
diff --git a/core/dispatch/find_one_and_delete.go b/core/dispatch/find_one_and_delete.go
@@ -4,6 +4,7 @@ import (
 	"context"
 
 	"github.com/mongodb/mongo-go-driver/core/command"
+	"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/topology"
@@ -16,7 +17,7 @@ func FindOneAndDelete(
 	ctx context.Context,
 	cmd command.FindOneAndDelete,
 	topo *topology.Topology,
-	selector topology.ServerSelector,
+	selector description.ServerSelector,
 	wc *writeconcern.WriteConcern,
 ) (result.FindAndModify, error) {
 
diff --git a/core/dispatch/find_one_and_replace.go b/core/dispatch/find_one_and_replace.go
@@ -4,6 +4,7 @@ import (
 	"context"
 
 	"github.com/mongodb/mongo-go-driver/core/command"
+	"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/topology"
@@ -16,7 +17,7 @@ func FindOneAndReplace(
 	ctx context.Context,
 	cmd command.FindOneAndReplace,
 	topo *topology.Topology,
-	selector topology.ServerSelector,
+	selector description.ServerSelector,
 	wc *writeconcern.WriteConcern,
 ) (result.FindAndModify, error) {
 
diff --git a/core/dispatch/find_one_and_update.go b/core/dispatch/find_one_and_update.go
@@ -4,6 +4,7 @@ import (
 	"context"
 
 	"github.com/mongodb/mongo-go-driver/core/command"
+	"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/topology"
@@ -16,7 +17,7 @@ func FindOneAndUpdate(
 	ctx context.Context,
 	cmd command.FindOneAndUpdate,
 	topo *topology.Topology,
-	selector topology.ServerSelector,
+	selector description.ServerSelector,
 	wc *writeconcern.WriteConcern,
 ) (result.FindAndModify, error) {
 
diff --git a/core/dispatch/insert.go b/core/dispatch/insert.go
@@ -4,6 +4,7 @@ import (
 	"context"
 
 	"github.com/mongodb/mongo-go-driver/core/command"
+	"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/topology"
@@ -16,7 +17,7 @@ func Insert(
 	ctx context.Context,
 	cmd command.Insert,
 	topo *topology.Topology,
-	selector topology.ServerSelector,
+	selector description.ServerSelector,
 	wc *writeconcern.WriteConcern,
 ) (result.Insert, error) {
 
diff --git a/core/dispatch/list_collections.go b/core/dispatch/list_collections.go
@@ -4,6 +4,7 @@ import (
 	"context"
 
 	"github.com/mongodb/mongo-go-driver/core/command"
+	"github.com/mongodb/mongo-go-driver/core/description"
 	"github.com/mongodb/mongo-go-driver/core/topology"
 )
 
@@ -13,7 +14,7 @@ func ListCollections(
 	ctx context.Context,
 	cmd command.ListCollections,
 	topo *topology.Topology,
-	selector topology.ServerSelector,
+	selector description.ServerSelector,
 ) (command.Cursor, error) {
 
 	ss, err := topo.SelectServer(ctx, selector)
diff --git a/core/dispatch/list_databases.go b/core/dispatch/list_databases.go
@@ -4,6 +4,7 @@ import (
 	"context"
 
 	"github.com/mongodb/mongo-go-driver/core/command"
+	"github.com/mongodb/mongo-go-driver/core/description"
 	"github.com/mongodb/mongo-go-driver/core/result"
 	"github.com/mongodb/mongo-go-driver/core/topology"
 )
@@ -14,7 +15,7 @@ func ListDatabases(
 	ctx context.Context,
 	cmd command.ListDatabases,
 	topo *topology.Topology,
-	selector topology.ServerSelector,
+	selector description.ServerSelector,
 ) (result.ListDatabases, error) {
 
 	ss, err := topo.SelectServer(ctx, selector)
diff --git a/core/dispatch/list_indexes.go b/core/dispatch/list_indexes.go
@@ -4,6 +4,7 @@ import (
 	"context"
 
 	"github.com/mongodb/mongo-go-driver/core/command"
+	"github.com/mongodb/mongo-go-driver/core/description"
 	"github.com/mongodb/mongo-go-driver/core/topology"
 )
 
@@ -13,7 +14,7 @@ func ListIndexes(
 	ctx context.Context,
 	cmd command.ListIndexes,
 	topo *topology.Topology,
-	selector topology.ServerSelector,
+	selector description.ServerSelector,
 ) (command.Cursor, error) {
 
 	ss, err := topo.SelectServer(ctx, selector)
diff --git a/core/dispatch/update.go b/core/dispatch/update.go
@@ -4,6 +4,7 @@ import (
 	"context"
 
 	"github.com/mongodb/mongo-go-driver/core/command"
+	"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/topology"
@@ -16,7 +17,7 @@ func Update(
 	ctx context.Context,
 	cmd command.Update,
 	topo *topology.Topology,
-	selector topology.ServerSelector,
+	selector description.ServerSelector,
 	wc *writeconcern.WriteConcern,
 ) (result.Update, error) {
 
diff --git a/core/topology/initial_dns_seedlist_discovery_test.go b/core/topology/initial_dns_seedlist_discovery_test.go
@@ -124,7 +124,7 @@ func buildSet(list []string) map[string]struct{} {
 }
 
 func getServerByAddress(address string, c *Topology) (description.Server, error) {
-	selectByName := ServerSelectorFunc(func(_ description.Topology, servers []description.Server) ([]description.Server, error) {
+	selectByName := description.ServerSelectorFunc(func(_ description.Topology, servers []description.Server) ([]description.Server, error) {
 		for _, s := range servers {
 			if s.Addr.String() == address {
 				return []description.Server{s}, nil
diff --git a/core/topology/server.go b/core/topology/server.go
@@ -22,6 +22,24 @@ const minHeartbeatInterval = 500 * time.Millisecond
 // the server has been closed.
 var ErrServerClosed = errors.New("server is closed")
 
+// SelectedServer represents a specific server that was selected during server selection.
+// It contains the kind of the typology it was selected from and the read preference that
+// was given during server selection.
+type SelectedServer struct {
+	*Server
+
+	Kind description.TopologyKind
+}
+
+// Description returns a description of the server as of the last heartbeat.
+func (ss *SelectedServer) Description() description.SelectedServer {
+	sdesc := ss.Server.Description()
+	return description.SelectedServer{
+		Server: sdesc,
+		Kind:   ss.Kind,
+	}
+}
+
 // Server is a single server within a topology.
 type Server struct {
 	cfg     *serverConfig
diff --git a/core/topology/server_selector.go b/core/topology/server_selector.go
diff --git a/core/topology/topology.go b/core/topology/topology.go
diff --git a/core/topology/topology_test.go b/core/topology/topology_test.go
diff --git a/internal/testutil/config.go b/internal/testutil/config.go
diff --git a/mongo/client.go b/mongo/client.go
diff --git a/mongo/collection.go b/mongo/collection.go
diff --git a/mongo/database.go b/mongo/database.go
