Skip to content

Commit aecaf88

Browse files
committed
api: removed Connection deprecated methods
Removed deprecated `Connection` methods. Related tests are updated (deleted or refactored). Closes #479
1 parent e72726b commit aecaf88

File tree

7 files changed

+218
-509
lines changed

7 files changed

+218
-509
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ Versioning](http://semver.org/spec/v2.0.0.html) except to the first release.
2424
and Future.GetIterator() methods, ResponseIterator and TimeoutResponseIterator types,
2525
Future.pushes[] (#480).
2626
* `LogAppendPushFailed` replaced with `LogBoxSessionPushUnsupported` (#480)
27+
* Removed deprecated `Connection` methods, related interfaces and tests are updated (#479)
2728

2829
### Fixed
2930

MIGRATION.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,22 @@ TODO
1414
* Removed deprecated `pool` methods, related interfaces and tests are updated.
1515
* Removed `box.session.push()` support: Future.AppendPush() and Future.GetIterator()
1616
methods, ResponseIterator and TimeoutResponseIterator types.
17+
* Removed deprecated `Connection` methods, related interfaces and tests are updated.
18+
*NOTE*: due to Future.GetTyped() doesn't decode SelectRequest into structure, substitute Connection.GetTyped() following the example:
19+
```Go
20+
var singleTpl = Tuple{}
21+
err = conn.GetTyped(spaceNo, indexNo, []interface{}{uint(10)}, &singleTpl)
22+
```
23+
At now became:
24+
```Go
25+
var tpl [1]Tuple
26+
err = conn.Do(NewSelectRequest(spaceNo).
27+
Index(indexNo).
28+
Limit(1).
29+
Key([]interface{}{uint(10)})
30+
).GetTyped(&tpl)
31+
singleTpl := tpl[0]
32+
```
1733

1834
## Migration from v1.x.x to v2.x.x
1935

boxerror_test.go

Lines changed: 28 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ func TestErrorTypeEval(t *testing.T) {
304304

305305
for name, testcase := range tupleCases {
306306
t.Run(name, func(t *testing.T) {
307-
data, err := conn.Eval("return ...", []interface{}{&testcase.tuple.val})
307+
data, err := conn.Do(NewEvalRequest("return ...").Args([]interface{}{&testcase.tuple.val})).Get()
308308
require.Nil(t, err)
309309
require.NotNil(t, data)
310310
require.Equal(t, len(data), 1)
@@ -324,7 +324,9 @@ func TestErrorTypeEvalTyped(t *testing.T) {
324324
for name, testcase := range tupleCases {
325325
t.Run(name, func(t *testing.T) {
326326
var res []BoxError
327-
err := conn.EvalTyped("return ...", []interface{}{&testcase.tuple.val}, &res)
327+
err := conn.Do(NewEvalRequest("return ...").
328+
Args([]interface{}{&testcase.tuple.val}),
329+
).GetTyped(&res)
328330
require.Nil(t, err)
329331
require.NotNil(t, res)
330332
require.Equal(t, len(res), 1)
@@ -340,12 +342,12 @@ func TestErrorTypeInsert(t *testing.T) {
340342
defer conn.Close()
341343

342344
truncateEval := fmt.Sprintf("box.space[%q]:truncate()", space)
343-
_, err := conn.Eval(truncateEval, []interface{}{})
345+
_, err := conn.Do(NewEvalRequest(truncateEval).Args([]interface{}{})).Get()
344346
require.Nil(t, err)
345347

346348
for name, testcase := range tupleCases {
347349
t.Run(name, func(t *testing.T) {
348-
_, err = conn.Insert(space, &testcase.tuple)
350+
_, err = conn.Do(NewInsertRequest(space).Tuple(&testcase.tuple)).Get()
349351
require.Nil(t, err)
350352

351353
checkEval := fmt.Sprintf(`
@@ -365,7 +367,7 @@ func TestErrorTypeInsert(t *testing.T) {
365367
// of connector BoxError are equal to the Tarantool ones
366368
// since they may differ between different Tarantool versions
367369
// and editions.
368-
_, err := conn.Eval(checkEval, []interface{}{})
370+
_, err := conn.Do(NewEvalRequest(checkEval).Args([]interface{}{})).Get()
369371
require.Nilf(t, err, "Tuple has been successfully inserted")
370372
})
371373
}
@@ -378,13 +380,13 @@ func TestErrorTypeInsertTyped(t *testing.T) {
378380
defer conn.Close()
379381

380382
truncateEval := fmt.Sprintf("box.space[%q]:truncate()", space)
381-
_, err := conn.Eval(truncateEval, []interface{}{})
383+
_, err := conn.Do(NewEvalRequest(truncateEval).Args([]interface{}{})).Get()
382384
require.Nil(t, err)
383385

384386
for name, testcase := range tupleCases {
385387
t.Run(name, func(t *testing.T) {
386388
var res []TupleBoxError
387-
err = conn.InsertTyped(space, &testcase.tuple, &res)
389+
err = conn.Do(NewInsertRequest(space).Tuple(&testcase.tuple)).GetTyped(&res)
388390
require.Nil(t, err)
389391
require.NotNil(t, res)
390392
require.Equal(t, len(res), 1)
@@ -407,7 +409,7 @@ func TestErrorTypeInsertTyped(t *testing.T) {
407409
// of connector BoxError are equal to the Tarantool ones
408410
// since they may differ between different Tarantool versions
409411
// and editions.
410-
_, err := conn.Eval(checkEval, []interface{}{})
412+
_, err := conn.Do(NewEvalRequest(checkEval).Args([]interface{}{})).Get()
411413
require.Nilf(t, err, "Tuple has been successfully inserted")
412414
})
413415
}
@@ -420,7 +422,7 @@ func TestErrorTypeSelect(t *testing.T) {
420422
defer conn.Close()
421423

422424
truncateEval := fmt.Sprintf("box.space[%q]:truncate()", space)
423-
_, err := conn.Eval(truncateEval, []interface{}{})
425+
_, err := conn.Do(NewEvalRequest(truncateEval).Args([]interface{}{})).Get()
424426
require.Nil(t, err)
425427

426428
for name, testcase := range tupleCases {
@@ -433,13 +435,18 @@ func TestErrorTypeSelect(t *testing.T) {
433435
assert(tuple ~= nil)
434436
`, testcase.ttObj, space, testcase.tuple.pk)
435437

436-
_, err := conn.Eval(insertEval, []interface{}{})
438+
_, err := conn.Do(NewEvalRequest(insertEval).Args([]interface{}{})).Get()
437439
require.Nilf(t, err, "Tuple has been successfully inserted")
438440

439441
var offset uint32 = 0
440442
var limit uint32 = 1
441-
data, err := conn.Select(space, index, offset, limit, IterEq,
442-
[]interface{}{testcase.tuple.pk})
443+
data, err := conn.Do(NewSelectRequest(space).
444+
Index(index).
445+
Offset(offset).
446+
Limit(limit).
447+
Iterator(IterEq).
448+
Key([]interface{}{testcase.tuple.pk}),
449+
).Get()
443450
require.Nil(t, err)
444451
require.NotNil(t, data)
445452
require.Equalf(t, len(data), 1, "Exactly one tuple had been found")
@@ -464,7 +471,7 @@ func TestErrorTypeSelectTyped(t *testing.T) {
464471
defer conn.Close()
465472

466473
truncateEval := fmt.Sprintf("box.space[%q]:truncate()", space)
467-
_, err := conn.Eval(truncateEval, []interface{}{})
474+
_, err := conn.Do(NewEvalRequest(truncateEval).Args([]interface{}{})).Get()
468475
require.Nil(t, err)
469476

470477
for name, testcase := range tupleCases {
@@ -477,14 +484,19 @@ func TestErrorTypeSelectTyped(t *testing.T) {
477484
assert(tuple ~= nil)
478485
`, testcase.ttObj, space, testcase.tuple.pk)
479486

480-
_, err := conn.Eval(insertEval, []interface{}{})
487+
_, err := conn.Do(NewEvalRequest(insertEval).Args([]interface{}{})).Get()
481488
require.Nilf(t, err, "Tuple has been successfully inserted")
482489

483490
var offset uint32 = 0
484491
var limit uint32 = 1
485492
var resp []TupleBoxError
486-
err = conn.SelectTyped(space, index, offset, limit, IterEq,
487-
[]interface{}{testcase.tuple.pk}, &resp)
493+
err = conn.Do(NewSelectRequest(space).
494+
Index(index).
495+
Offset(offset).
496+
Limit(limit).
497+
Iterator(IterEq).
498+
Key([]interface{}{testcase.tuple.pk}),
499+
).GetTyped(&resp)
488500
require.Nil(t, err)
489501
require.NotNil(t, resp)
490502
require.Equalf(t, len(resp), 1, "Exactly one tuple had been found")

connection.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -739,7 +739,7 @@ func (conn *Connection) pinger() {
739739
return
740740
case <-t.C:
741741
}
742-
conn.Ping()
742+
conn.Do(NewPingRequest())
743743
}
744744
}
745745

0 commit comments

Comments
 (0)