api: make RoundRobinStrategy private

Part of #158

Author: oleg-jukovec

CHANGELOG.md

@@ -20,6 +20,7 @@ Versioning](http://semver.org/spec/v2.0.0.html) except to the first release.
 
 - multi subpackage (#240)
 - msgpack.v2 support (#236)
+- pool/RoundRobinStrategy (#158)
 
 ### Fixed
 

pool/connection_pool.go

@@ -97,9 +97,9 @@ type ConnectionPool struct {
 
 	state            state
 	done             chan struct{}
-	roPool           *RoundRobinStrategy
-	rwPool           *RoundRobinStrategy
-	anyPool          *RoundRobinStrategy
+	roPool           *roundRobinStrategy
+	rwPool           *roundRobinStrategy
+	anyPool          *roundRobinStrategy
 	poolsMutex       sync.RWMutex
 	watcherContainer watcherContainer
 }
@@ -141,9 +141,9 @@ func ConnectWithOpts(addrs []string, connOpts tarantool.Opts, opts Opts) (connPo
 	}
 
 	size := len(addrs)
-	rwPool := NewEmptyRoundRobin(size)
-	roPool := NewEmptyRoundRobin(size)
-	anyPool := NewEmptyRoundRobin(size)
+	rwPool := newRoundRobinStrategy(size)
+	roPool := newRoundRobinStrategy(size)
+	anyPool := newRoundRobinStrategy(size)
 
 	connPool = &ConnectionPool{
 		addrs:    make(map[string]*endpoint),

pool/round_robin.go

@@ -6,24 +6,24 @@ import (
 	"github.com/tarantool/go-tarantool/v2"
 )
 
-type RoundRobinStrategy struct {
+type roundRobinStrategy struct {
 	conns       []*tarantool.Connection
 	indexByAddr map[string]uint
 	mutex       sync.RWMutex
 	size        uint
 	current     uint
 }
 
-func NewEmptyRoundRobin(size int) *RoundRobinStrategy {
-	return &RoundRobinStrategy{
+func newRoundRobinStrategy(size int) *roundRobinStrategy {
+	return &roundRobinStrategy{
 		conns:       make([]*tarantool.Connection, 0, size),
 		indexByAddr: make(map[string]uint),
 		size:        0,
 		current:     0,
 	}
 }
 
-func (r *RoundRobinStrategy) GetConnByAddr(addr string) *tarantool.Connection {
+func (r *roundRobinStrategy) GetConnByAddr(addr string) *tarantool.Connection {
 	r.mutex.RLock()
 	defer r.mutex.RUnlock()
 
@@ -35,7 +35,7 @@ func (r *RoundRobinStrategy) GetConnByAddr(addr string) *tarantool.Connection {
 	return r.conns[index]
 }
 
-func (r *RoundRobinStrategy) DeleteConnByAddr(addr string) *tarantool.Connection {
+func (r *roundRobinStrategy) DeleteConnByAddr(addr string) *tarantool.Connection {
 	r.mutex.Lock()
 	defer r.mutex.Unlock()
 
@@ -63,14 +63,14 @@ func (r *RoundRobinStrategy) DeleteConnByAddr(addr string) *tarantool.Connection
 	return conn
 }
 
-func (r *RoundRobinStrategy) IsEmpty() bool {
+func (r *roundRobinStrategy) IsEmpty() bool {
 	r.mutex.RLock()
 	defer r.mutex.RUnlock()
 
 	return r.size == 0
 }
 
-func (r *RoundRobinStrategy) GetNextConnection() *tarantool.Connection {
+func (r *roundRobinStrategy) GetNextConnection() *tarantool.Connection {
 	r.mutex.RLock()
 	defer r.mutex.RUnlock()
 
@@ -80,7 +80,7 @@ func (r *RoundRobinStrategy) GetNextConnection() *tarantool.Connection {
 	return r.conns[r.nextIndex()]
 }
 
-func (r *RoundRobinStrategy) GetConnections() []*tarantool.Connection {
+func (r *roundRobinStrategy) GetConnections() []*tarantool.Connection {
 	r.mutex.RLock()
 	defer r.mutex.RUnlock()
 
@@ -90,7 +90,7 @@ func (r *RoundRobinStrategy) GetConnections() []*tarantool.Connection {
 	return ret
 }
 
-func (r *RoundRobinStrategy) AddConn(addr string, conn *tarantool.Connection) {
+func (r *roundRobinStrategy) AddConn(addr string, conn *tarantool.Connection) {
 	r.mutex.Lock()
 	defer r.mutex.Unlock()
 
@@ -103,7 +103,7 @@ func (r *RoundRobinStrategy) AddConn(addr string, conn *tarantool.Connection) {
 	}
 }
 
-func (r *RoundRobinStrategy) nextIndex() uint {
+func (r *roundRobinStrategy) nextIndex() uint {
 	ret := r.current % r.size
 	r.current++
 	return ret

pool/round_robin_test.go

@@ -1,10 +1,9 @@
-package pool_test
+package pool
 
 import (
 	"testing"
 
 	"github.com/tarantool/go-tarantool/v2"
-	. "github.com/tarantool/go-tarantool/v2/pool"
 )
 
 const (
@@ -13,7 +12,7 @@ const (
 )
 
 func TestRoundRobinAddDelete(t *testing.T) {
-	rr := NewEmptyRoundRobin(10)
+	rr := newRoundRobinStrategy(10)
 
 	addrs := []string{validAddr1, validAddr2}
 	conns := []*tarantool.Connection{&tarantool.Connection{}, &tarantool.Connection{}}
@@ -33,7 +32,7 @@ func TestRoundRobinAddDelete(t *testing.T) {
 }
 
 func TestRoundRobinAddDuplicateDelete(t *testing.T) {
-	rr := NewEmptyRoundRobin(10)
+	rr := newRoundRobinStrategy(10)
 
 	conn1 := &tarantool.Connection{}
 	conn2 := &tarantool.Connection{}
@@ -53,7 +52,7 @@ func TestRoundRobinAddDuplicateDelete(t *testing.T) {
 }
 
 func TestRoundRobinGetNextConnection(t *testing.T) {
-	rr := NewEmptyRoundRobin(10)
+	rr := newRoundRobinStrategy(10)
 
 	addrs := []string{validAddr1, validAddr2}
 	conns := []*tarantool.Connection{&tarantool.Connection{}, &tarantool.Connection{}}
@@ -71,7 +70,7 @@ func TestRoundRobinGetNextConnection(t *testing.T) {
 }
 
 func TestRoundRobinStrategy_GetConnections(t *testing.T) {
-	rr := NewEmptyRoundRobin(10)
+	rr := newRoundRobinStrategy(10)
 
 	addrs := []string{validAddr1, validAddr2}
 	conns := []*tarantool.Connection{&tarantool.Connection{}, &tarantool.Connection{}}