Skip to content

Commit cf20d6a

Browse files
copy -> clone
1 parent 1f0154e commit cf20d6a

File tree

8 files changed

+24
-24
lines changed

8 files changed

+24
-24
lines changed

connection.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -300,13 +300,13 @@ type SslOpts struct {
300300
Ciphers string
301301
}
302302

303-
// Copy returns the copy of an Opts object.
303+
// Clone returns a copy of the Opts object.
304304
// Beware that Notify channel, Logger and Handle are not copied.
305305
// Any changes in copy RequiredProtocolInfo will not affect the original
306306
// RequiredProtocolInfo value.
307-
func (opts Opts) Copy() Opts {
307+
func (opts Opts) Clone() Opts {
308308
optsCopy := opts
309-
optsCopy.RequiredProtocolInfo = opts.RequiredProtocolInfo.Copy()
309+
optsCopy.RequiredProtocolInfo = opts.RequiredProtocolInfo.Clone()
310310

311311
return optsCopy
312312
}
@@ -337,7 +337,7 @@ func Connect(addr string, opts Opts) (conn *Connection, err error) {
337337
contextRequestId: 1,
338338
Greeting: &Greeting{},
339339
control: make(chan struct{}),
340-
opts: opts.Copy(),
340+
opts: opts.Clone(),
341341
dec: newDecoder(&smallBuf{}),
342342
}
343343
maxprocs := uint32(runtime.GOMAXPROCS(-1))
@@ -1310,12 +1310,12 @@ func (conn *Connection) identify(w *bufio.Writer, r *bufio.Reader) error {
13101310
// outdated if connection is in a disconnected state.
13111311
// Since 1.10.0
13121312
func (conn *Connection) ServerProtocolInfo() ProtocolInfo {
1313-
return conn.serverProtocolInfo.Copy()
1313+
return conn.serverProtocolInfo.Clone()
13141314
}
13151315

13161316
// ClientProtocolVersion returns protocol version and protocol features
13171317
// supported by Go connection client.
13181318
// Since 1.10.0
13191319
func (conn *Connection) ClientProtocolInfo() ProtocolInfo {
1320-
return clientProtocolInfo.Copy()
1320+
return clientProtocolInfo.Clone()
13211321
}

connection_pool/connection_pool.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ func ConnectWithOpts(addrs []string, connOpts tarantool.Opts, opts OptsPool) (co
125125

126126
connPool = &ConnectionPool{
127127
addrs: make([]string, 0, len(addrs)),
128-
connOpts: connOpts.Copy(),
128+
connOpts: connOpts.Clone(),
129129
opts: opts,
130130
state: unknownState,
131131
done: make(chan struct{}),

connection_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ import (
88
. "github.com/tarantool/go-tarantool"
99
)
1010

11-
func TestOptsCopyPreservesRequiredProtocolFeatures(t *testing.T) {
11+
func TestOptsClonePreservesRequiredProtocolFeatures(t *testing.T) {
1212
original := Opts{
1313
RequiredProtocolInfo: ProtocolInfo{
1414
Version: ProtocolVersion(100),
1515
Features: []ProtocolFeature{ProtocolFeature(99), ProtocolFeature(100)},
1616
},
1717
}
1818

19-
origCopy := original.Copy()
19+
origCopy := original.Clone()
2020

2121
original.RequiredProtocolInfo.Features[1] = ProtocolFeature(98)
2222

example_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ func ExampleProtocolVersion() {
333333
}
334334

335335
func getTestTxnOpts() tarantool.Opts {
336-
txnOpts := opts.Copy()
336+
txnOpts := opts.Clone()
337337

338338
// Assert that server supports expected protocol features
339339
txnOpts.RequiredProtocolInfo = tarantool.ProtocolInfo{

multi/multi.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ func ConnectWithOpts(addrs []string, connOpts tarantool.Opts, opts OptsMulti) (c
8888
connOpts.Notify = notify
8989
connMulti = &ConnectionMulti{
9090
addrs: addrs,
91-
connOpts: connOpts.Copy(),
91+
connOpts: connOpts.Clone(),
9292
opts: opts,
9393
notify: notify,
9494
control: make(chan struct{}),

protocol.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ type ProtocolInfo struct {
1919
Features []ProtocolFeature
2020
}
2121

22-
// Copy returns the exact copy of a ProtocolInfo object.
22+
// Clone returns an exact copy of the ProtocolInfo object.
2323
// Any changes in copy will not affect the original values.
24-
func (info ProtocolInfo) Copy() ProtocolInfo {
24+
func (info ProtocolInfo) Clone() ProtocolInfo {
2525
infoCopy := info
2626

2727
if info.Features != nil {
@@ -118,7 +118,7 @@ func fillId(enc *encoder, protocolInfo ProtocolInfo) error {
118118
func NewIdRequest(protocolInfo ProtocolInfo) *IdRequest {
119119
req := new(IdRequest)
120120
req.requestCode = IdRequestCode
121-
req.protocolInfo = protocolInfo.Copy()
121+
req.protocolInfo = protocolInfo.Clone()
122122
return req
123123
}
124124

protocol_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ import (
88
. "github.com/tarantool/go-tarantool"
99
)
1010

11-
func TestProtocolInfoCopyPreservesFeatures(t *testing.T) {
11+
func TestProtocolInfoClonePreservesFeatures(t *testing.T) {
1212
original := ProtocolInfo{
1313
Version: ProtocolVersion(100),
1414
Features: []ProtocolFeature{ProtocolFeature(99), ProtocolFeature(100)},
1515
}
1616

17-
origCopy := original.Copy()
17+
origCopy := original.Clone()
1818

1919
original.Features[1] = ProtocolFeature(98)
2020

tarantool_test.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3010,7 +3010,7 @@ func TestConnectionClientFeaturesUmmutable(t *testing.T) {
30103010
defer conn.Close()
30113011

30123012
info := conn.ClientProtocolInfo()
3013-
infoOrig := info.Copy()
3013+
infoOrig := info.Clone()
30143014
info.Features[0] = ProtocolFeature(15532)
30153015

30163016
require.Equal(t, conn.ClientProtocolInfo(), infoOrig)
@@ -3024,7 +3024,7 @@ func TestConnectionServerFeaturesUmmutable(t *testing.T) {
30243024
defer conn.Close()
30253025

30263026
info := conn.ServerProtocolInfo()
3027-
infoOrig := info.Copy()
3027+
infoOrig := info.Clone()
30283028
info.Features[0] = ProtocolFeature(15532)
30293029

30303030
require.Equal(t, conn.ServerProtocolInfo(), infoOrig)
@@ -3034,7 +3034,7 @@ func TestConnectionServerFeaturesUmmutable(t *testing.T) {
30343034
func TestConnectionProtocolVersionRequirementSuccess(t *testing.T) {
30353035
test_helpers.SkipIfIdUnsupported(t)
30363036

3037-
connOpts := opts.Copy()
3037+
connOpts := opts.Clone()
30383038
connOpts.RequiredProtocolInfo = ProtocolInfo{
30393039
Version: ProtocolVersion(3),
30403040
}
@@ -3050,7 +3050,7 @@ func TestConnectionProtocolVersionRequirementSuccess(t *testing.T) {
30503050
func TestConnectionProtocolVersionRequirementFail(t *testing.T) {
30513051
test_helpers.SkipIfIdSupported(t)
30523052

3053-
connOpts := opts.Copy()
3053+
connOpts := opts.Clone()
30543054
connOpts.RequiredProtocolInfo = ProtocolInfo{
30553055
Version: ProtocolVersion(3),
30563056
}
@@ -3065,7 +3065,7 @@ func TestConnectionProtocolVersionRequirementFail(t *testing.T) {
30653065
func TestConnectionProtocolFeatureRequirementSuccess(t *testing.T) {
30663066
test_helpers.SkipIfIdUnsupported(t)
30673067

3068-
connOpts := opts.Copy()
3068+
connOpts := opts.Clone()
30693069
connOpts.RequiredProtocolInfo = ProtocolInfo{
30703070
Features: []ProtocolFeature{TransactionsFeature},
30713071
}
@@ -3081,7 +3081,7 @@ func TestConnectionProtocolFeatureRequirementSuccess(t *testing.T) {
30813081
func TestConnectionProtocolFeatureRequirementFail(t *testing.T) {
30823082
test_helpers.SkipIfIdSupported(t)
30833083

3084-
connOpts := opts.Copy()
3084+
connOpts := opts.Clone()
30853085
connOpts.RequiredProtocolInfo = ProtocolInfo{
30863086
Features: []ProtocolFeature{TransactionsFeature},
30873087
}
@@ -3096,7 +3096,7 @@ func TestConnectionProtocolFeatureRequirementFail(t *testing.T) {
30963096
func TestConnectionProtocolFeatureRequirementManyFail(t *testing.T) {
30973097
test_helpers.SkipIfIdSupported(t)
30983098

3099-
connOpts := opts.Copy()
3099+
connOpts := opts.Clone()
31003100
connOpts.RequiredProtocolInfo = ProtocolInfo{
31013101
Features: []ProtocolFeature{TransactionsFeature, ProtocolFeature(15532)},
31023102
}
@@ -3125,7 +3125,7 @@ func TestConnectionFeatureOptsImmutable(t *testing.T) {
31253125
retries := uint(10)
31263126
timeout := 100 * time.Millisecond
31273127

3128-
connOpts := opts.Copy()
3128+
connOpts := opts.Clone()
31293129
connOpts.Reconnect = timeout
31303130
connOpts.MaxReconnects = retries
31313131
connOpts.RequiredProtocolInfo = ProtocolInfo{

0 commit comments

Comments
 (0)