Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ Versioning](http://semver.org/spec/v2.0.0.html) except to the first release.
and Future.GetIterator() methods, ResponseIterator and TimeoutResponseIterator types,
Future.pushes[] (#480).
* `LogAppendPushFailed` replaced with `LogBoxSessionPushUnsupported` (#480)
* Removed deprecated `Connection` methods, related interfaces and tests are updated (#479)

### Fixed

Expand Down
16 changes: 16 additions & 0 deletions MIGRATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,22 @@ TODO
* Removed deprecated `pool` methods, related interfaces and tests are updated.
* Removed `box.session.push()` support: Future.AppendPush() and Future.GetIterator()
methods, ResponseIterator and TimeoutResponseIterator types.
* Removed deprecated `Connection` methods, related interfaces and tests are updated.
*NOTE*: due to Future.GetTyped() doesn't decode SelectRequest into structure, substitute Connection.GetTyped() following the example:
```Go
var singleTpl = Tuple{}
err = conn.GetTyped(space, index, key, &singleTpl)
```
At now became:
```Go
var tpl []Tuple
err = conn.Do(NewSelectRequest(space).
Index(index).
Limit(1).
Key(key)
).GetTyped(&tpl)
singleTpl := tpl[0]
```

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

Expand Down
46 changes: 30 additions & 16 deletions boxerror_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,9 @@ func TestErrorTypeEval(t *testing.T) {

for name, testcase := range tupleCases {
t.Run(name, func(t *testing.T) {
data, err := conn.Eval("return ...", []interface{}{&testcase.tuple.val})
data, err := conn.Do(NewEvalRequest("return ...").
Args([]interface{}{&testcase.tuple.val}),
).Get()
require.Nil(t, err)
require.NotNil(t, data)
require.Equal(t, len(data), 1)
Expand All @@ -324,7 +326,9 @@ func TestErrorTypeEvalTyped(t *testing.T) {
for name, testcase := range tupleCases {
t.Run(name, func(t *testing.T) {
var res []BoxError
err := conn.EvalTyped("return ...", []interface{}{&testcase.tuple.val}, &res)
err := conn.Do(NewEvalRequest("return ...").
Args([]interface{}{&testcase.tuple.val}),
).GetTyped(&res)
require.Nil(t, err)
require.NotNil(t, res)
require.Equal(t, len(res), 1)
Expand All @@ -340,12 +344,12 @@ func TestErrorTypeInsert(t *testing.T) {
defer conn.Close()

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

for name, testcase := range tupleCases {
t.Run(name, func(t *testing.T) {
_, err = conn.Insert(space, &testcase.tuple)
_, err = conn.Do(NewInsertRequest(space).Tuple(&testcase.tuple)).Get()
require.Nil(t, err)

checkEval := fmt.Sprintf(`
Expand All @@ -365,7 +369,7 @@ func TestErrorTypeInsert(t *testing.T) {
// of connector BoxError are equal to the Tarantool ones
// since they may differ between different Tarantool versions
// and editions.
_, err := conn.Eval(checkEval, []interface{}{})
_, err := conn.Do(NewEvalRequest(checkEval).Args([]interface{}{})).Get()
require.Nilf(t, err, "Tuple has been successfully inserted")
})
}
Expand All @@ -378,13 +382,13 @@ func TestErrorTypeInsertTyped(t *testing.T) {
defer conn.Close()

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

for name, testcase := range tupleCases {
t.Run(name, func(t *testing.T) {
var res []TupleBoxError
err = conn.InsertTyped(space, &testcase.tuple, &res)
err = conn.Do(NewInsertRequest(space).Tuple(&testcase.tuple)).GetTyped(&res)
require.Nil(t, err)
require.NotNil(t, res)
require.Equal(t, len(res), 1)
Expand All @@ -407,7 +411,7 @@ func TestErrorTypeInsertTyped(t *testing.T) {
// of connector BoxError are equal to the Tarantool ones
// since they may differ between different Tarantool versions
// and editions.
_, err := conn.Eval(checkEval, []interface{}{})
_, err := conn.Do(NewEvalRequest(checkEval).Args([]interface{}{})).Get()
require.Nilf(t, err, "Tuple has been successfully inserted")
})
}
Expand All @@ -420,7 +424,7 @@ func TestErrorTypeSelect(t *testing.T) {
defer conn.Close()

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

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

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

var offset uint32 = 0
var limit uint32 = 1
data, err := conn.Select(space, index, offset, limit, IterEq,
[]interface{}{testcase.tuple.pk})
data, err := conn.Do(NewSelectRequest(space).
Index(index).
Offset(offset).
Limit(limit).
Iterator(IterEq).
Key([]interface{}{testcase.tuple.pk}),
).Get()
require.Nil(t, err)
require.NotNil(t, data)
require.Equalf(t, len(data), 1, "Exactly one tuple had been found")
Expand All @@ -464,7 +473,7 @@ func TestErrorTypeSelectTyped(t *testing.T) {
defer conn.Close()

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

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

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

var offset uint32 = 0
var limit uint32 = 1
var resp []TupleBoxError
err = conn.SelectTyped(space, index, offset, limit, IterEq,
[]interface{}{testcase.tuple.pk}, &resp)
err = conn.Do(NewSelectRequest(space).
Index(index).
Offset(offset).
Limit(limit).
Iterator(IterEq).
Key([]interface{}{testcase.tuple.pk}),
).GetTyped(&resp)
require.Nil(t, err)
require.NotNil(t, resp)
require.Equalf(t, len(resp), 1, "Exactly one tuple had been found")
Expand Down
2 changes: 1 addition & 1 deletion connection.go
Original file line number Diff line number Diff line change
Expand Up @@ -739,7 +739,7 @@ func (conn *Connection) pinger() {
return
case <-t.C:
}
conn.Ping()
conn.Do(NewPingRequest())
}
}

Expand Down
Loading
Loading