From 7436010f2d5e697ae4d2819055b12eb73f24e907 Mon Sep 17 00:00:00 2001 From: Eugene Blikh Date: Fri, 5 Sep 2025 15:39:47 +0300 Subject: [PATCH] package: update go and package versions * Module version update from v2 to v3, * Go version dep updated from 1.20 to 1.24, * Added stub record for migration guide. --- .github/workflows/reusable_testing.yml | 2 +- .github/workflows/testing.yml | 10 ++++----- CHANGELOG.md | 2 ++ MIGRATION.md | 28 +++++++++++++++++--------- README.md | 20 +++++++++--------- arrow/arrow_test.go | 3 ++- arrow/example_test.go | 4 ++-- arrow/request.go | 3 ++- arrow/request_test.go | 5 +++-- arrow/tarantool_test.go | 6 +++--- auth_test.go | 2 +- box/box.go | 2 +- box/box_test.go | 5 +++-- box/example_test.go | 4 ++-- box/info.go | 3 ++- box/info_test.go | 2 +- box/schema.go | 4 +++- box/schema_user.go | 3 ++- box/schema_user_test.go | 4 ++-- box/session.go | 2 +- box/session_test.go | 4 ++-- box/tarantool_test.go | 7 ++++--- box_error_test.go | 4 ++-- client_tools_test.go | 2 +- crud/common.go | 2 +- crud/count.go | 4 ++-- crud/delete.go | 4 ++-- crud/error_test.go | 3 ++- crud/example_test.go | 8 ++++---- crud/get.go | 4 ++-- crud/insert.go | 6 +++--- crud/insert_many.go | 6 +++--- crud/len.go | 4 ++-- crud/max.go | 4 ++-- crud/min.go | 4 ++-- crud/operations_test.go | 2 +- crud/replace.go | 6 +++--- crud/replace_many.go | 6 +++--- crud/request_test.go | 4 ++-- crud/result_test.go | 3 ++- crud/schema.go | 2 +- crud/select.go | 4 ++-- crud/stats.go | 2 +- crud/storage_info.go | 4 ++-- crud/tarantool_test.go | 8 ++++---- crud/truncate.go | 4 ++-- crud/update.go | 4 ++-- crud/upsert.go | 6 +++--- crud/upsert_many.go | 10 ++++----- datetime/datetime_test.go | 6 +++--- datetime/example_test.go | 4 ++-- datetime/interval_test.go | 6 +++--- decimal/decimal_test.go | 6 +++--- decimal/example_test.go | 4 ++-- decimal/fuzzing_test.go | 3 ++- dial_test.go | 4 ++-- example_custom_unpacking_test.go | 4 ++-- example_test.go | 6 +++--- future_test.go | 4 ++-- go.mod | 4 ++-- golden_test.go | 2 +- pool/connection_pool.go | 2 +- pool/connection_pool_test.go | 10 ++++----- pool/connector.go | 2 +- pool/connector_test.go | 5 +++-- pool/example_test.go | 8 ++++---- pool/pooler.go | 2 +- pool/round_robin.go | 2 +- pool/round_robin_test.go | 2 +- pool/watcher.go | 2 +- protocol_test.go | 2 +- queue/example_connection_pool_test.go | 9 +++++---- queue/example_msgpack_test.go | 4 ++-- queue/example_test.go | 4 ++-- queue/queue.go | 2 +- queue/queue_test.go | 12 +++++------ request_test.go | 2 +- response_test.go | 3 ++- schema_test.go | 4 ++-- settings/example_test.go | 6 +++--- settings/request.go | 2 +- settings/request_test.go | 4 ++-- settings/tarantool_test.go | 7 ++++--- shutdown_test.go | 5 +++-- tarantool_test.go | 16 +++++++-------- test_helpers/doer.go | 2 +- test_helpers/example_test.go | 5 +++-- test_helpers/main.go | 2 +- test_helpers/pool_helper.go | 4 ++-- test_helpers/request.go | 2 +- test_helpers/response.go | 2 +- test_helpers/tcs/prepare.go | 4 ++-- test_helpers/tcs/tcs.go | 4 ++-- test_helpers/utils.go | 3 ++- testdata/sidecar/main.go | 2 +- uuid/example_test.go | 5 +++-- uuid/uuid_test.go | 6 +++--- 97 files changed, 244 insertions(+), 212 deletions(-) diff --git a/.github/workflows/reusable_testing.yml b/.github/workflows/reusable_testing.yml index 895859314..015ae6404 100644 --- a/.github/workflows/reusable_testing.yml +++ b/.github/workflows/reusable_testing.yml @@ -36,7 +36,7 @@ jobs: - name: Setup golang for connector and tests uses: actions/setup-go@v5 with: - go-version: '1.20' + go-version: '1.24' - name: Setup tt run: | diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index bf0b0dd2b..fe9d32646 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -16,7 +16,7 @@ jobs: strategy: fail-fast: false matrix: - golang: ['1.20', 'stable'] + golang: ['1.24', 'stable'] tarantool: ['1.10'] coveralls: [false] fuzzing: [false] @@ -36,17 +36,17 @@ jobs: strategy: fail-fast: false matrix: - golang: ['1.20', 'stable'] + golang: ['1.24', 'stable'] tarantool: ['2.11', '3.4', 'master'] coveralls: [false] fuzzing: [false] include: - tarantool: 'master' coveralls: true - golang: '1.20' + golang: '1.24' - tarantool: 'master' fuzzing: true - golang: '1.20' + golang: '1.24' coveralls: false uses: ./.github/workflows/reusable-run.yml with: @@ -71,7 +71,7 @@ jobs: fail-fast: false matrix: golang: - - '1.20' + - '1.24' - 'stable' runs-on: - macos-13 diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e536967e..fd0d1385c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,8 @@ Versioning](http://semver.org/spec/v2.0.0.html) except to the first release. ### Changed +* Required Go version is `1.24` now. + ### Fixed ## [v2.4.0] - 2025-07-11 diff --git a/MIGRATION.md b/MIGRATION.md index fdd4893dc..54f4e3034 100644 --- a/MIGRATION.md +++ b/MIGRATION.md @@ -1,8 +1,18 @@ # Migration guide +## Migration from v2.x.x to v3.x.x + +* [Major changes](#major-changes-v3) + +TODO + +### Major changes + +* Required Go version is `1.24` now. + ## Migration from v1.x.x to v2.x.x -* [Major changes](#major-changes) +* [Major changes](#major-changes-v2) * [Main package](#main-package) * [Go version](#go-version) * [msgpack/v5](#msgpackv5) @@ -25,7 +35,7 @@ * [crud package](#crud-package) * [test_helpers package](#test_helpers-package) -### Major changes +### Major changes * The `go_tarantool_call_17` build tag is no longer needed, since by default the `CallRequest` is `Call17Request`. @@ -50,9 +60,9 @@ import ( "fmt" "github.com/tarantool/go-tarantool" - _ "github.com/tarantool/go-tarantool/v2/datetime" - _ "github.com/tarantool/go-tarantool/v2/decimal" - _ "github.com/tarantool/go-tarantool/v2/uuid" + _ "github.com/tarantool/go-tarantool/v3/datetime" + _ "github.com/tarantool/go-tarantool/v3/decimal" + _ "github.com/tarantool/go-tarantool/v3/uuid" ) func main() { @@ -82,10 +92,10 @@ import ( "fmt" "time" - "github.com/tarantool/go-tarantool/v2" - _ "github.com/tarantool/go-tarantool/v2/datetime" - _ "github.com/tarantool/go-tarantool/v2/decimal" - _ "github.com/tarantool/go-tarantool/v2/uuid" + "github.com/tarantool/go-tarantool/v3" + _ "github.com/tarantool/go-tarantool/v3/datetime" + _ "github.com/tarantool/go-tarantool/v3/decimal" + _ "github.com/tarantool/go-tarantool/v3/uuid" ) func main() { diff --git a/README.md b/README.md index f5c533390..6950724ca 100644 --- a/README.md +++ b/README.md @@ -36,10 +36,10 @@ faster than other packages according to public benchmarks. We assume that you have Tarantool version 1.10+ and a modern Linux or BSD operating system. -You need a current version of `go`, version 1.20 or later (use `go version` to +You need a current version of `go`, version 1.24 or later (use `go version` to check the version number). Do not use `gccgo-go`. -**Note:** If your `go` version is older than 1.20 or if `go` is not installed, +**Note:** If your `go` version is older than 1.24 or if `go` is not installed, download and run the latest tarball from [golang.org][golang-dl]. The package `go-tarantool` is located in [tarantool/go-tarantool][go-tarantool] @@ -98,10 +98,10 @@ import ( "fmt" "time" - "github.com/tarantool/go-tarantool/v2" - _ "github.com/tarantool/go-tarantool/v2/datetime" - _ "github.com/tarantool/go-tarantool/v2/decimal" - _ "github.com/tarantool/go-tarantool/v2/uuid" + "github.com/tarantool/go-tarantool/v3" + _ "github.com/tarantool/go-tarantool/v3/datetime" + _ "github.com/tarantool/go-tarantool/v3/decimal" + _ "github.com/tarantool/go-tarantool/v3/uuid" ) func main() { @@ -184,10 +184,10 @@ import ( "fmt" "time" - "github.com/tarantool/go-tarantool/v2" - _ "github.com/tarantool/go-tarantool/v2/datetime" - _ "github.com/tarantool/go-tarantool/v2/decimal" - _ "github.com/tarantool/go-tarantool/v2/uuid" + "github.com/tarantool/go-tarantool/v3" + _ "github.com/tarantool/go-tarantool/v3/datetime" + _ "github.com/tarantool/go-tarantool/v3/decimal" + _ "github.com/tarantool/go-tarantool/v3/uuid" "github.com/tarantool/go-tlsdialer" ) diff --git a/arrow/arrow_test.go b/arrow/arrow_test.go index 5e8b440c4..c3f40090c 100644 --- a/arrow/arrow_test.go +++ b/arrow/arrow_test.go @@ -6,8 +6,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "github.com/tarantool/go-tarantool/v2/arrow" "github.com/vmihailenco/msgpack/v5" + + "github.com/tarantool/go-tarantool/v3/arrow" ) var longArrow, _ = hex.DecodeString("ffffffff70000000040000009effffff0400010004000000" + diff --git a/arrow/example_test.go b/arrow/example_test.go index e85d195cd..3510a777d 100644 --- a/arrow/example_test.go +++ b/arrow/example_test.go @@ -15,8 +15,8 @@ import ( "log" "time" - "github.com/tarantool/go-tarantool/v2" - "github.com/tarantool/go-tarantool/v2/arrow" + "github.com/tarantool/go-tarantool/v3" + "github.com/tarantool/go-tarantool/v3/arrow" ) var arrowBinData, _ = hex.DecodeString("ffffffff70000000040000009effffff0400010004000000" + diff --git a/arrow/request.go b/arrow/request.go index 332720d3e..82b55f399 100644 --- a/arrow/request.go +++ b/arrow/request.go @@ -5,8 +5,9 @@ import ( "io" "github.com/tarantool/go-iproto" - "github.com/tarantool/go-tarantool/v2" "github.com/vmihailenco/msgpack/v5" + + "github.com/tarantool/go-tarantool/v3" ) // InsertRequest helps you to create an insert request object for execution diff --git a/arrow/request_test.go b/arrow/request_test.go index fba6b5563..251b2b31d 100644 --- a/arrow/request_test.go +++ b/arrow/request_test.go @@ -8,9 +8,10 @@ import ( "github.com/stretchr/testify/require" "github.com/tarantool/go-iproto" - "github.com/tarantool/go-tarantool/v2" - "github.com/tarantool/go-tarantool/v2/arrow" "github.com/vmihailenco/msgpack/v5" + + "github.com/tarantool/go-tarantool/v3" + "github.com/tarantool/go-tarantool/v3/arrow" ) const validSpace uint32 = 1 // Any valid value != default. diff --git a/arrow/tarantool_test.go b/arrow/tarantool_test.go index 728b38f8b..cc2ad552e 100644 --- a/arrow/tarantool_test.go +++ b/arrow/tarantool_test.go @@ -11,9 +11,9 @@ import ( "github.com/stretchr/testify/require" "github.com/tarantool/go-iproto" - "github.com/tarantool/go-tarantool/v2" - "github.com/tarantool/go-tarantool/v2/arrow" - "github.com/tarantool/go-tarantool/v2/test_helpers" + "github.com/tarantool/go-tarantool/v3" + "github.com/tarantool/go-tarantool/v3/arrow" + "github.com/tarantool/go-tarantool/v3/test_helpers" ) var isArrowSupported = false diff --git a/auth_test.go b/auth_test.go index 712226d63..a9a0b34e9 100644 --- a/auth_test.go +++ b/auth_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - . "github.com/tarantool/go-tarantool/v2" + . "github.com/tarantool/go-tarantool/v3" ) func TestAuth_String(t *testing.T) { diff --git a/box/box.go b/box/box.go index c9b0e71dd..a4cc1780e 100644 --- a/box/box.go +++ b/box/box.go @@ -1,7 +1,7 @@ package box import ( - "github.com/tarantool/go-tarantool/v2" + "github.com/tarantool/go-tarantool/v3" ) // Box is a helper that wraps box.* requests. diff --git a/box/box_test.go b/box/box_test.go index 0180473ed..59ceaf6e3 100644 --- a/box/box_test.go +++ b/box/box_test.go @@ -7,8 +7,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/tarantool/go-tarantool/v2/box" - "github.com/tarantool/go-tarantool/v2/test_helpers" + + "github.com/tarantool/go-tarantool/v3/box" + "github.com/tarantool/go-tarantool/v3/test_helpers" ) func TestNew(t *testing.T) { diff --git a/box/example_test.go b/box/example_test.go index eac3f5e1a..fa65189a8 100644 --- a/box/example_test.go +++ b/box/example_test.go @@ -15,8 +15,8 @@ import ( "log" "time" - "github.com/tarantool/go-tarantool/v2" - "github.com/tarantool/go-tarantool/v2/box" + "github.com/tarantool/go-tarantool/v3" + "github.com/tarantool/go-tarantool/v3/box" ) func ExampleBox_Info() { diff --git a/box/info.go b/box/info.go index aa682822c..edd4894cd 100644 --- a/box/info.go +++ b/box/info.go @@ -3,8 +3,9 @@ package box import ( "fmt" - "github.com/tarantool/go-tarantool/v2" "github.com/vmihailenco/msgpack/v5" + + "github.com/tarantool/go-tarantool/v3" ) var _ tarantool.Request = (*InfoRequest)(nil) diff --git a/box/info_test.go b/box/info_test.go index 2cf00f69b..d4e8e9539 100644 --- a/box/info_test.go +++ b/box/info_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" "github.com/vmihailenco/msgpack/v5" - "github.com/tarantool/go-tarantool/v2/box" + "github.com/tarantool/go-tarantool/v3/box" ) func TestInfo(t *testing.T) { diff --git a/box/schema.go b/box/schema.go index 25017e5a4..036c76c6d 100644 --- a/box/schema.go +++ b/box/schema.go @@ -1,6 +1,8 @@ package box -import "github.com/tarantool/go-tarantool/v2" +import ( + "github.com/tarantool/go-tarantool/v3" +) // Schema represents the schema-related operations in Tarantool. // It holds a connection to interact with the Tarantool instance. diff --git a/box/schema_user.go b/box/schema_user.go index 80874da92..6e9f558a5 100644 --- a/box/schema_user.go +++ b/box/schema_user.go @@ -5,8 +5,9 @@ import ( "fmt" "strings" - "github.com/tarantool/go-tarantool/v2" "github.com/vmihailenco/msgpack/v5" + + "github.com/tarantool/go-tarantool/v3" ) // SchemaUser provides methods to interact with schema-related user operations in Tarantool. diff --git a/box/schema_user_test.go b/box/schema_user_test.go index b9f3e18de..985e9fe86 100644 --- a/box/schema_user_test.go +++ b/box/schema_user_test.go @@ -7,11 +7,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/tarantool/go-tarantool/v2" "github.com/vmihailenco/msgpack/v5" "github.com/vmihailenco/msgpack/v5/msgpcode" - "github.com/tarantool/go-tarantool/v2/box" + "github.com/tarantool/go-tarantool/v3" + "github.com/tarantool/go-tarantool/v3/box" ) func TestUserExistsResponse_DecodeMsgpack(t *testing.T) { diff --git a/box/session.go b/box/session.go index b63113581..5a01b32a3 100644 --- a/box/session.go +++ b/box/session.go @@ -3,7 +3,7 @@ package box import ( "context" - "github.com/tarantool/go-tarantool/v2" + "github.com/tarantool/go-tarantool/v3" ) // Session struct represents a connection session to Tarantool. diff --git a/box/session_test.go b/box/session_test.go index 07ada0436..39b80d1d4 100644 --- a/box/session_test.go +++ b/box/session_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/tarantool/go-tarantool/v2/box" - th "github.com/tarantool/go-tarantool/v2/test_helpers" + "github.com/tarantool/go-tarantool/v3/box" + th "github.com/tarantool/go-tarantool/v3/test_helpers" ) func TestBox_Session(t *testing.T) { diff --git a/box/tarantool_test.go b/box/tarantool_test.go index 0eb9e94b9..4244a98e9 100644 --- a/box/tarantool_test.go +++ b/box/tarantool_test.go @@ -11,9 +11,10 @@ import ( "github.com/google/uuid" "github.com/stretchr/testify/require" "github.com/tarantool/go-iproto" - "github.com/tarantool/go-tarantool/v2" - "github.com/tarantool/go-tarantool/v2/box" - "github.com/tarantool/go-tarantool/v2/test_helpers" + + "github.com/tarantool/go-tarantool/v3" + "github.com/tarantool/go-tarantool/v3/box" + "github.com/tarantool/go-tarantool/v3/test_helpers" ) var server = "127.0.0.1:3013" diff --git a/box_error_test.go b/box_error_test.go index 3d7f7345d..acb051d31 100644 --- a/box_error_test.go +++ b/box_error_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/require" "github.com/vmihailenco/msgpack/v5" - . "github.com/tarantool/go-tarantool/v2" - "github.com/tarantool/go-tarantool/v2/test_helpers" + . "github.com/tarantool/go-tarantool/v3" + "github.com/tarantool/go-tarantool/v3/test_helpers" ) var samples = map[string]BoxError{ diff --git a/client_tools_test.go b/client_tools_test.go index fdd109152..fc911acf9 100644 --- a/client_tools_test.go +++ b/client_tools_test.go @@ -6,7 +6,7 @@ import ( "github.com/vmihailenco/msgpack/v5" - "github.com/tarantool/go-tarantool/v2" + "github.com/tarantool/go-tarantool/v3" ) func TestOperations_EncodeMsgpack(t *testing.T) { diff --git a/crud/common.go b/crud/common.go index 061818487..df3c4a795 100644 --- a/crud/common.go +++ b/crud/common.go @@ -59,7 +59,7 @@ import ( "github.com/tarantool/go-iproto" - "github.com/tarantool/go-tarantool/v2" + "github.com/tarantool/go-tarantool/v3" ) type baseRequest struct { diff --git a/crud/count.go b/crud/count.go index 9deb1e44c..b90198658 100644 --- a/crud/count.go +++ b/crud/count.go @@ -5,7 +5,7 @@ import ( "github.com/vmihailenco/msgpack/v5" - "github.com/tarantool/go-tarantool/v2" + "github.com/tarantool/go-tarantool/v3" ) // CountResult describes result for `crud.count` method. @@ -73,7 +73,7 @@ type CountRequest struct { } type countArgs struct { - _msgpack struct{} `msgpack:",asArray"` //nolint: structcheck,unused + _msgpack struct{} `msgpack:",asArray"` // nolint: structcheck,unused Space string Conditions []Condition Opts CountOpts diff --git a/crud/delete.go b/crud/delete.go index f37da7ac5..075b25b3c 100644 --- a/crud/delete.go +++ b/crud/delete.go @@ -5,7 +5,7 @@ import ( "github.com/vmihailenco/msgpack/v5" - "github.com/tarantool/go-tarantool/v2" + "github.com/tarantool/go-tarantool/v3" ) // DeleteOpts describes options for `crud.delete` method. @@ -20,7 +20,7 @@ type DeleteRequest struct { } type deleteArgs struct { - _msgpack struct{} `msgpack:",asArray"` //nolint: structcheck,unused + _msgpack struct{} `msgpack:",asArray"` // nolint: structcheck,unused Space string Key Tuple Opts DeleteOpts diff --git a/crud/error_test.go b/crud/error_test.go index a3db035bf..71fda30d4 100644 --- a/crud/error_test.go +++ b/crud/error_test.go @@ -4,7 +4,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "github.com/tarantool/go-tarantool/v2/crud" + + "github.com/tarantool/go-tarantool/v3/crud" ) func TestErrorMany(t *testing.T) { diff --git a/crud/example_test.go b/crud/example_test.go index 7f9e34e0c..1b97308ae 100644 --- a/crud/example_test.go +++ b/crud/example_test.go @@ -6,8 +6,8 @@ import ( "reflect" "time" - "github.com/tarantool/go-tarantool/v2" - "github.com/tarantool/go-tarantool/v2/crud" + "github.com/tarantool/go-tarantool/v3" + "github.com/tarantool/go-tarantool/v3/crud" ) const ( @@ -65,7 +65,7 @@ func ExampleResult_rowsCustomType() { Tuple([]interface{}{uint(2010), nil, "bla"}) type Tuple struct { - _msgpack struct{} `msgpack:",asArray"` //nolint: structcheck,unused + _msgpack struct{} `msgpack:",asArray"` // nolint: structcheck,unused Id uint64 BucketId uint64 Name string @@ -92,7 +92,7 @@ func ExampleTuples_customType() { // The type will be encoded/decoded as an array. type Tuple struct { - _msgpack struct{} `msgpack:",asArray"` //nolint: structcheck,unused + _msgpack struct{} `msgpack:",asArray"` // nolint: structcheck,unused Id uint64 BucketId *uint64 Name string diff --git a/crud/get.go b/crud/get.go index 6ab91440e..5a31473ef 100644 --- a/crud/get.go +++ b/crud/get.go @@ -5,7 +5,7 @@ import ( "github.com/vmihailenco/msgpack/v5" - "github.com/tarantool/go-tarantool/v2" + "github.com/tarantool/go-tarantool/v3" ) // GetOpts describes options for `crud.get` method. @@ -66,7 +66,7 @@ type GetRequest struct { } type getArgs struct { - _msgpack struct{} `msgpack:",asArray"` //nolint: structcheck,unused + _msgpack struct{} `msgpack:",asArray"` // nolint: structcheck,unused Space string Key Tuple Opts GetOpts diff --git a/crud/insert.go b/crud/insert.go index c696d201f..4e56c6d91 100644 --- a/crud/insert.go +++ b/crud/insert.go @@ -5,7 +5,7 @@ import ( "github.com/vmihailenco/msgpack/v5" - "github.com/tarantool/go-tarantool/v2" + "github.com/tarantool/go-tarantool/v3" ) // InsertOpts describes options for `crud.insert` method. @@ -20,7 +20,7 @@ type InsertRequest struct { } type insertArgs struct { - _msgpack struct{} `msgpack:",asArray"` //nolint: structcheck,unused + _msgpack struct{} `msgpack:",asArray"` // nolint: structcheck,unused Space string Tuple Tuple Opts InsertOpts @@ -78,7 +78,7 @@ type InsertObjectRequest struct { } type insertObjectArgs struct { - _msgpack struct{} `msgpack:",asArray"` //nolint: structcheck,unused + _msgpack struct{} `msgpack:",asArray"` // nolint: structcheck,unused Space string Object Object Opts InsertObjectOpts diff --git a/crud/insert_many.go b/crud/insert_many.go index 866c1ceb5..17748564d 100644 --- a/crud/insert_many.go +++ b/crud/insert_many.go @@ -5,7 +5,7 @@ import ( "github.com/vmihailenco/msgpack/v5" - "github.com/tarantool/go-tarantool/v2" + "github.com/tarantool/go-tarantool/v3" ) // InsertManyOpts describes options for `crud.insert_many` method. @@ -20,7 +20,7 @@ type InsertManyRequest struct { } type insertManyArgs struct { - _msgpack struct{} `msgpack:",asArray"` //nolint: structcheck,unused + _msgpack struct{} `msgpack:",asArray"` // nolint: structcheck,unused Space string Tuples Tuples Opts InsertManyOpts @@ -78,7 +78,7 @@ type InsertObjectManyRequest struct { } type insertObjectManyArgs struct { - _msgpack struct{} `msgpack:",asArray"` //nolint: structcheck,unused + _msgpack struct{} `msgpack:",asArray"` // nolint: structcheck,unused Space string Objects Objects Opts InsertObjectManyOpts diff --git a/crud/len.go b/crud/len.go index 5fef700d7..a1da72f72 100644 --- a/crud/len.go +++ b/crud/len.go @@ -5,7 +5,7 @@ import ( "github.com/vmihailenco/msgpack/v5" - "github.com/tarantool/go-tarantool/v2" + "github.com/tarantool/go-tarantool/v3" ) // LenResult describes result for `crud.len` method. @@ -22,7 +22,7 @@ type LenRequest struct { } type lenArgs struct { - _msgpack struct{} `msgpack:",asArray"` //nolint: structcheck,unused + _msgpack struct{} `msgpack:",asArray"` // nolint: structcheck,unused Space string Opts LenOpts } diff --git a/crud/max.go b/crud/max.go index 727a17ac5..961e7724b 100644 --- a/crud/max.go +++ b/crud/max.go @@ -5,7 +5,7 @@ import ( "github.com/vmihailenco/msgpack/v5" - "github.com/tarantool/go-tarantool/v2" + "github.com/tarantool/go-tarantool/v3" ) // MaxOpts describes options for `crud.max` method. @@ -20,7 +20,7 @@ type MaxRequest struct { } type maxArgs struct { - _msgpack struct{} `msgpack:",asArray"` //nolint: structcheck,unused + _msgpack struct{} `msgpack:",asArray"` // nolint: structcheck,unused Space string Index interface{} Opts MaxOpts diff --git a/crud/min.go b/crud/min.go index ab3bcfe07..2bbf9b816 100644 --- a/crud/min.go +++ b/crud/min.go @@ -5,7 +5,7 @@ import ( "github.com/vmihailenco/msgpack/v5" - "github.com/tarantool/go-tarantool/v2" + "github.com/tarantool/go-tarantool/v3" ) // MinOpts describes options for `crud.min` method. @@ -20,7 +20,7 @@ type MinRequest struct { } type minArgs struct { - _msgpack struct{} `msgpack:",asArray"` //nolint: structcheck,unused + _msgpack struct{} `msgpack:",asArray"` // nolint: structcheck,unused Space string Index interface{} Opts MinOpts diff --git a/crud/operations_test.go b/crud/operations_test.go index 0ff3e818a..a7f61a8a7 100644 --- a/crud/operations_test.go +++ b/crud/operations_test.go @@ -6,7 +6,7 @@ import ( "github.com/vmihailenco/msgpack/v5" - "github.com/tarantool/go-tarantool/v2/crud" + "github.com/tarantool/go-tarantool/v3/crud" ) func TestOperation_EncodeMsgpack(t *testing.T) { diff --git a/crud/replace.go b/crud/replace.go index 8231c9aa5..b47bba9ab 100644 --- a/crud/replace.go +++ b/crud/replace.go @@ -5,7 +5,7 @@ import ( "github.com/vmihailenco/msgpack/v5" - "github.com/tarantool/go-tarantool/v2" + "github.com/tarantool/go-tarantool/v3" ) // ReplaceOpts describes options for `crud.replace` method. @@ -20,7 +20,7 @@ type ReplaceRequest struct { } type replaceArgs struct { - _msgpack struct{} `msgpack:",asArray"` //nolint: structcheck,unused + _msgpack struct{} `msgpack:",asArray"` // nolint: structcheck,unused Space string Tuple Tuple Opts ReplaceOpts @@ -78,7 +78,7 @@ type ReplaceObjectRequest struct { } type replaceObjectArgs struct { - _msgpack struct{} `msgpack:",asArray"` //nolint: structcheck,unused + _msgpack struct{} `msgpack:",asArray"` // nolint: structcheck,unused Space string Object Object Opts ReplaceObjectOpts diff --git a/crud/replace_many.go b/crud/replace_many.go index 5a5143ef8..024b863b7 100644 --- a/crud/replace_many.go +++ b/crud/replace_many.go @@ -5,7 +5,7 @@ import ( "github.com/vmihailenco/msgpack/v5" - "github.com/tarantool/go-tarantool/v2" + "github.com/tarantool/go-tarantool/v3" ) // ReplaceManyOpts describes options for `crud.replace_many` method. @@ -20,7 +20,7 @@ type ReplaceManyRequest struct { } type replaceManyArgs struct { - _msgpack struct{} `msgpack:",asArray"` //nolint: structcheck,unused + _msgpack struct{} `msgpack:",asArray"` // nolint: structcheck,unused Space string Tuples Tuples Opts ReplaceManyOpts @@ -78,7 +78,7 @@ type ReplaceObjectManyRequest struct { } type replaceObjectManyArgs struct { - _msgpack struct{} `msgpack:",asArray"` //nolint: structcheck,unused + _msgpack struct{} `msgpack:",asArray"` // nolint: structcheck,unused Space string Objects Objects Opts ReplaceObjectManyOpts diff --git a/crud/request_test.go b/crud/request_test.go index 7c889cf40..ba2bae859 100644 --- a/crud/request_test.go +++ b/crud/request_test.go @@ -9,8 +9,8 @@ import ( "github.com/tarantool/go-iproto" "github.com/vmihailenco/msgpack/v5" - "github.com/tarantool/go-tarantool/v2" - "github.com/tarantool/go-tarantool/v2/crud" + "github.com/tarantool/go-tarantool/v3" + "github.com/tarantool/go-tarantool/v3/crud" ) const validSpace = "test" // Any valid value != default. diff --git a/crud/result_test.go b/crud/result_test.go index c67649f96..578eebed1 100644 --- a/crud/result_test.go +++ b/crud/result_test.go @@ -6,8 +6,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "github.com/tarantool/go-tarantool/v2/crud" "github.com/vmihailenco/msgpack/v5" + + "github.com/tarantool/go-tarantool/v3/crud" ) func TestResult_DecodeMsgpack(t *testing.T) { diff --git a/crud/schema.go b/crud/schema.go index 6f3b94a97..4c2d661ec 100644 --- a/crud/schema.go +++ b/crud/schema.go @@ -7,7 +7,7 @@ import ( "github.com/vmihailenco/msgpack/v5" "github.com/vmihailenco/msgpack/v5/msgpcode" - "github.com/tarantool/go-tarantool/v2" + "github.com/tarantool/go-tarantool/v3" ) func msgpackIsMap(code byte) bool { diff --git a/crud/select.go b/crud/select.go index 24dbd0cb0..b52eb7003 100644 --- a/crud/select.go +++ b/crud/select.go @@ -5,7 +5,7 @@ import ( "github.com/vmihailenco/msgpack/v5" - "github.com/tarantool/go-tarantool/v2" + "github.com/tarantool/go-tarantool/v3" ) // SelectOpts describes options for `crud.select` method. @@ -90,7 +90,7 @@ type SelectRequest struct { } type selectArgs struct { - _msgpack struct{} `msgpack:",asArray"` //nolint: structcheck,unused + _msgpack struct{} `msgpack:",asArray"` // nolint: structcheck,unused Space string Conditions []Condition Opts SelectOpts diff --git a/crud/stats.go b/crud/stats.go index 47737f33a..c4f6988a0 100644 --- a/crud/stats.go +++ b/crud/stats.go @@ -5,7 +5,7 @@ import ( "github.com/vmihailenco/msgpack/v5" - "github.com/tarantool/go-tarantool/v2" + "github.com/tarantool/go-tarantool/v3" ) // StatsRequest helps you to create request object to call `crud.stats` diff --git a/crud/storage_info.go b/crud/storage_info.go index e2d67aadb..b39bf37a5 100644 --- a/crud/storage_info.go +++ b/crud/storage_info.go @@ -5,7 +5,7 @@ import ( "github.com/vmihailenco/msgpack/v5" - "github.com/tarantool/go-tarantool/v2" + "github.com/tarantool/go-tarantool/v3" ) // StatusTable describes information for instance. @@ -98,7 +98,7 @@ type StorageInfoRequest struct { } type storageInfoArgs struct { - _msgpack struct{} `msgpack:",asArray"` //nolint: structcheck,unused + _msgpack struct{} `msgpack:",asArray"` // nolint: structcheck,unused Opts StorageInfoOpts } diff --git a/crud/tarantool_test.go b/crud/tarantool_test.go index 8ee28cf09..0e1c1791a 100644 --- a/crud/tarantool_test.go +++ b/crud/tarantool_test.go @@ -10,9 +10,9 @@ import ( "github.com/stretchr/testify/require" "github.com/tarantool/go-iproto" - "github.com/tarantool/go-tarantool/v2" - "github.com/tarantool/go-tarantool/v2/crud" - "github.com/tarantool/go-tarantool/v2/test_helpers" + "github.com/tarantool/go-tarantool/v3" + "github.com/tarantool/go-tarantool/v3/crud" + "github.com/tarantool/go-tarantool/v3/test_helpers" ) var server = "127.0.0.1:3013" @@ -182,7 +182,7 @@ func connect(t testing.TB) *tarantool.Connection { } ret := struct { - _msgpack struct{} `msgpack:",asArray"` //nolint: structcheck,unused + _msgpack struct{} `msgpack:",asArray"` // nolint: structcheck,unused Result bool }{} err = conn.Do(tarantool.NewCall17Request("is_ready")).GetTyped(&ret) diff --git a/crud/truncate.go b/crud/truncate.go index 9f80063d1..8313785d9 100644 --- a/crud/truncate.go +++ b/crud/truncate.go @@ -5,7 +5,7 @@ import ( "github.com/vmihailenco/msgpack/v5" - "github.com/tarantool/go-tarantool/v2" + "github.com/tarantool/go-tarantool/v3" ) // TruncateResult describes result for `crud.truncate` method. @@ -22,7 +22,7 @@ type TruncateRequest struct { } type truncateArgs struct { - _msgpack struct{} `msgpack:",asArray"` //nolint: structcheck,unused + _msgpack struct{} `msgpack:",asArray"` // nolint: structcheck,unused Space string Opts TruncateOpts } diff --git a/crud/update.go b/crud/update.go index 41ebd2c09..4bdeb01ce 100644 --- a/crud/update.go +++ b/crud/update.go @@ -5,7 +5,7 @@ import ( "github.com/vmihailenco/msgpack/v5" - "github.com/tarantool/go-tarantool/v2" + "github.com/tarantool/go-tarantool/v3" ) // UpdateOpts describes options for `crud.update` method. @@ -21,7 +21,7 @@ type UpdateRequest struct { } type updateArgs struct { - _msgpack struct{} `msgpack:",asArray"` //nolint: structcheck,unused + _msgpack struct{} `msgpack:",asArray"` // nolint: structcheck,unused Space string Key Tuple Operations []Operation diff --git a/crud/upsert.go b/crud/upsert.go index e44523d45..d55d1da1b 100644 --- a/crud/upsert.go +++ b/crud/upsert.go @@ -5,7 +5,7 @@ import ( "github.com/vmihailenco/msgpack/v5" - "github.com/tarantool/go-tarantool/v2" + "github.com/tarantool/go-tarantool/v3" ) // UpsertOpts describes options for `crud.upsert` method. @@ -21,7 +21,7 @@ type UpsertRequest struct { } type upsertArgs struct { - _msgpack struct{} `msgpack:",asArray"` //nolint: structcheck,unused + _msgpack struct{} `msgpack:",asArray"` // nolint: structcheck,unused Space string Tuple Tuple Operations []Operation @@ -90,7 +90,7 @@ type UpsertObjectRequest struct { } type upsertObjectArgs struct { - _msgpack struct{} `msgpack:",asArray"` //nolint: structcheck,unused + _msgpack struct{} `msgpack:",asArray"` // nolint: structcheck,unused Space string Object Object Operations []Operation diff --git a/crud/upsert_many.go b/crud/upsert_many.go index b0ccedf09..dad7dd158 100644 --- a/crud/upsert_many.go +++ b/crud/upsert_many.go @@ -5,7 +5,7 @@ import ( "github.com/vmihailenco/msgpack/v5" - "github.com/tarantool/go-tarantool/v2" + "github.com/tarantool/go-tarantool/v3" ) // UpsertManyOpts describes options for `crud.upsert_many` method. @@ -13,7 +13,7 @@ type UpsertManyOpts = OperationManyOpts // TupleOperationsData contains tuple with operations to be applied to tuple. type TupleOperationsData struct { - _msgpack struct{} `msgpack:",asArray"` //nolint: structcheck,unused + _msgpack struct{} `msgpack:",asArray"` // nolint: structcheck,unused Tuple Tuple Operations []Operation } @@ -27,7 +27,7 @@ type UpsertManyRequest struct { } type upsertManyArgs struct { - _msgpack struct{} `msgpack:",asArray"` //nolint: structcheck,unused + _msgpack struct{} `msgpack:",asArray"` // nolint: structcheck,unused Space string TuplesOperationsData []TupleOperationsData Opts UpsertManyOpts @@ -79,7 +79,7 @@ type UpsertObjectManyOpts = OperationManyOpts // ObjectOperationsData contains object with operations to be applied to object. type ObjectOperationsData struct { - _msgpack struct{} `msgpack:",asArray"` //nolint: structcheck,unused + _msgpack struct{} `msgpack:",asArray"` // nolint: structcheck,unused Object Object Operations []Operation } @@ -93,7 +93,7 @@ type UpsertObjectManyRequest struct { } type upsertObjectManyArgs struct { - _msgpack struct{} `msgpack:",asArray"` //nolint: structcheck,unused + _msgpack struct{} `msgpack:",asArray"` // nolint: structcheck,unused Space string ObjectsOperationsData []ObjectOperationsData Opts UpsertObjectManyOpts diff --git a/datetime/datetime_test.go b/datetime/datetime_test.go index 8be50e0e7..d01153892 100644 --- a/datetime/datetime_test.go +++ b/datetime/datetime_test.go @@ -11,9 +11,9 @@ import ( "github.com/vmihailenco/msgpack/v5" - . "github.com/tarantool/go-tarantool/v2" - . "github.com/tarantool/go-tarantool/v2/datetime" - "github.com/tarantool/go-tarantool/v2/test_helpers" + . "github.com/tarantool/go-tarantool/v3" + . "github.com/tarantool/go-tarantool/v3/datetime" + "github.com/tarantool/go-tarantool/v3/test_helpers" ) var noTimezoneLoc = time.FixedZone(NoTimezone, 0) diff --git a/datetime/example_test.go b/datetime/example_test.go index ac5f40500..df5d55563 100644 --- a/datetime/example_test.go +++ b/datetime/example_test.go @@ -13,8 +13,8 @@ import ( "fmt" "time" - "github.com/tarantool/go-tarantool/v2" - . "github.com/tarantool/go-tarantool/v2/datetime" + "github.com/tarantool/go-tarantool/v3" + . "github.com/tarantool/go-tarantool/v3/datetime" ) // Example demonstrates how to use tuples with datetime. To enable support of diff --git a/datetime/interval_test.go b/datetime/interval_test.go index 95142fe47..2f4bb8a66 100644 --- a/datetime/interval_test.go +++ b/datetime/interval_test.go @@ -5,9 +5,9 @@ import ( "reflect" "testing" - "github.com/tarantool/go-tarantool/v2" - . "github.com/tarantool/go-tarantool/v2/datetime" - "github.com/tarantool/go-tarantool/v2/test_helpers" + "github.com/tarantool/go-tarantool/v3" + . "github.com/tarantool/go-tarantool/v3/datetime" + "github.com/tarantool/go-tarantool/v3/test_helpers" ) func TestIntervalAdd(t *testing.T) { diff --git a/decimal/decimal_test.go b/decimal/decimal_test.go index 573daa8f6..f75494204 100644 --- a/decimal/decimal_test.go +++ b/decimal/decimal_test.go @@ -12,9 +12,9 @@ import ( "github.com/shopspring/decimal" "github.com/vmihailenco/msgpack/v5" - . "github.com/tarantool/go-tarantool/v2" - . "github.com/tarantool/go-tarantool/v2/decimal" - "github.com/tarantool/go-tarantool/v2/test_helpers" + . "github.com/tarantool/go-tarantool/v3" + . "github.com/tarantool/go-tarantool/v3/decimal" + "github.com/tarantool/go-tarantool/v3/test_helpers" ) var isDecimalSupported = false diff --git a/decimal/example_test.go b/decimal/example_test.go index 5597590dc..7903b077e 100644 --- a/decimal/example_test.go +++ b/decimal/example_test.go @@ -13,8 +13,8 @@ import ( "log" "time" - "github.com/tarantool/go-tarantool/v2" - . "github.com/tarantool/go-tarantool/v2/decimal" + "github.com/tarantool/go-tarantool/v3" + . "github.com/tarantool/go-tarantool/v3/decimal" ) // To enable support of decimal in msgpack with diff --git a/decimal/fuzzing_test.go b/decimal/fuzzing_test.go index 5ec2a2b8f..b6c49dcd9 100644 --- a/decimal/fuzzing_test.go +++ b/decimal/fuzzing_test.go @@ -7,7 +7,8 @@ import ( "testing" "github.com/shopspring/decimal" - . "github.com/tarantool/go-tarantool/v2/decimal" + + . "github.com/tarantool/go-tarantool/v3/decimal" ) func strToDecimal(t *testing.T, buf string, exp int) decimal.Decimal { diff --git a/dial_test.go b/dial_test.go index 87b9af5d8..2d0dee8ce 100644 --- a/dial_test.go +++ b/dial_test.go @@ -16,8 +16,8 @@ import ( "github.com/stretchr/testify/require" "github.com/tarantool/go-iproto" - "github.com/tarantool/go-tarantool/v2" - "github.com/tarantool/go-tarantool/v2/test_helpers" + "github.com/tarantool/go-tarantool/v3" + "github.com/tarantool/go-tarantool/v3/test_helpers" ) type mockErrorDialer struct { diff --git a/example_custom_unpacking_test.go b/example_custom_unpacking_test.go index a2706f3f6..d8c790a25 100644 --- a/example_custom_unpacking_test.go +++ b/example_custom_unpacking_test.go @@ -8,7 +8,7 @@ import ( "github.com/vmihailenco/msgpack/v5" - "github.com/tarantool/go-tarantool/v2" + "github.com/tarantool/go-tarantool/v3" ) type Tuple2 struct { @@ -19,7 +19,7 @@ type Tuple2 struct { // Same effect in a "magic" way, but slower. type Tuple3 struct { - _msgpack struct{} `msgpack:",asArray"` //nolint: structcheck,unused + _msgpack struct{} `msgpack:",asArray"` // nolint: structcheck,unused Cid uint Orig string diff --git a/example_test.go b/example_test.go index 463f3289c..e1b9d5766 100644 --- a/example_test.go +++ b/example_test.go @@ -9,14 +9,14 @@ import ( "github.com/tarantool/go-iproto" - "github.com/tarantool/go-tarantool/v2" - "github.com/tarantool/go-tarantool/v2/test_helpers" + "github.com/tarantool/go-tarantool/v3" + "github.com/tarantool/go-tarantool/v3/test_helpers" ) type Tuple struct { // Instruct msgpack to pack this struct as array, so no custom packer // is needed. - _msgpack struct{} `msgpack:",asArray"` //nolint: structcheck,unused + _msgpack struct{} `msgpack:",asArray"` // nolint: structcheck,unused Id uint Msg string Name string diff --git a/future_test.go b/future_test.go index fbb30fe62..fe13bc103 100644 --- a/future_test.go +++ b/future_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/tarantool/go-iproto" - . "github.com/tarantool/go-tarantool/v2" - "github.com/tarantool/go-tarantool/v2/test_helpers" + . "github.com/tarantool/go-tarantool/v3" + "github.com/tarantool/go-tarantool/v3/test_helpers" "github.com/vmihailenco/msgpack/v5" ) diff --git a/go.mod b/go.mod index 5b44eb1c5..c1d57fa18 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ -module github.com/tarantool/go-tarantool/v2 +module github.com/tarantool/go-tarantool/v3 -go 1.20 +go 1.24 require ( github.com/google/uuid v1.3.0 diff --git a/golden_test.go b/golden_test.go index 271a98ce3..c2ee52f89 100644 --- a/golden_test.go +++ b/golden_test.go @@ -17,7 +17,7 @@ import ( "github.com/tarantool/go-iproto" "github.com/vmihailenco/msgpack/v5" - "github.com/tarantool/go-tarantool/v2" + "github.com/tarantool/go-tarantool/v3" ) // golden_test.go contains tests that will check that the msgpack diff --git a/pool/connection_pool.go b/pool/connection_pool.go index e62cb2b3e..572fe6cde 100644 --- a/pool/connection_pool.go +++ b/pool/connection_pool.go @@ -20,7 +20,7 @@ import ( "github.com/tarantool/go-iproto" - "github.com/tarantool/go-tarantool/v2" + "github.com/tarantool/go-tarantool/v3" ) var ( diff --git a/pool/connection_pool_test.go b/pool/connection_pool_test.go index 8120c613d..e0fcc8c47 100644 --- a/pool/connection_pool_test.go +++ b/pool/connection_pool_test.go @@ -15,12 +15,12 @@ import ( "time" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" "github.com/vmihailenco/msgpack/v5" - "github.com/stretchr/testify/require" - "github.com/tarantool/go-tarantool/v2" - "github.com/tarantool/go-tarantool/v2/pool" - "github.com/tarantool/go-tarantool/v2/test_helpers" + "github.com/tarantool/go-tarantool/v3" + "github.com/tarantool/go-tarantool/v3/pool" + "github.com/tarantool/go-tarantool/v3/test_helpers" ) var user = "test" @@ -2572,7 +2572,7 @@ func TestSelect(t *testing.T) { err = test_helpers.InsertOnInstances(ctx, makeDialers(allServers), connOpts, spaceNo, anyTpl) require.Nil(t, err) - //default: ANY + // default: ANY data, err := connPool.Select(spaceNo, indexNo, 0, 1, tarantool.IterEq, anyKey) require.Nilf(t, err, "failed to Select") require.NotNilf(t, data, "response is nil after Select") diff --git a/pool/connector.go b/pool/connector.go index 23cc7275d..391b83b75 100644 --- a/pool/connector.go +++ b/pool/connector.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/tarantool/go-tarantool/v2" + "github.com/tarantool/go-tarantool/v3" ) // ConnectorAdapter allows to use Pooler as Connector. diff --git a/pool/connector_test.go b/pool/connector_test.go index 87bebbd53..9b8106c12 100644 --- a/pool/connector_test.go +++ b/pool/connector_test.go @@ -7,8 +7,9 @@ import ( "time" "github.com/stretchr/testify/require" - "github.com/tarantool/go-tarantool/v2" - . "github.com/tarantool/go-tarantool/v2/pool" + + "github.com/tarantool/go-tarantool/v3" + . "github.com/tarantool/go-tarantool/v3/pool" ) var testMode Mode = RW diff --git a/pool/example_test.go b/pool/example_test.go index dce8bb1af..6cf339baf 100644 --- a/pool/example_test.go +++ b/pool/example_test.go @@ -6,15 +6,15 @@ import ( "github.com/tarantool/go-iproto" - "github.com/tarantool/go-tarantool/v2" - "github.com/tarantool/go-tarantool/v2/pool" - "github.com/tarantool/go-tarantool/v2/test_helpers" + "github.com/tarantool/go-tarantool/v3" + "github.com/tarantool/go-tarantool/v3/pool" + "github.com/tarantool/go-tarantool/v3/test_helpers" ) type Tuple struct { // Instruct msgpack to pack this struct as array, so no custom packer // is needed. - _msgpack struct{} `msgpack:",asArray"` //nolint: structcheck,unused + _msgpack struct{} `msgpack:",asArray"` // nolint: structcheck,unused Key string Value string } diff --git a/pool/pooler.go b/pool/pooler.go index d4c0f1b5e..fd3df3401 100644 --- a/pool/pooler.go +++ b/pool/pooler.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/tarantool/go-tarantool/v2" + "github.com/tarantool/go-tarantool/v3" ) // TopologyEditor is the interface that must be implemented by a connection pool. diff --git a/pool/round_robin.go b/pool/round_robin.go index 82cf26f39..f3ccb014c 100644 --- a/pool/round_robin.go +++ b/pool/round_robin.go @@ -4,7 +4,7 @@ import ( "sync" "sync/atomic" - "github.com/tarantool/go-tarantool/v2" + "github.com/tarantool/go-tarantool/v3" ) type roundRobinStrategy struct { diff --git a/pool/round_robin_test.go b/pool/round_robin_test.go index 6f028f2de..dcc219fd4 100644 --- a/pool/round_robin_test.go +++ b/pool/round_robin_test.go @@ -3,7 +3,7 @@ package pool import ( "testing" - "github.com/tarantool/go-tarantool/v2" + "github.com/tarantool/go-tarantool/v3" ) const ( diff --git a/pool/watcher.go b/pool/watcher.go index f7c08213e..aee3103fd 100644 --- a/pool/watcher.go +++ b/pool/watcher.go @@ -3,7 +3,7 @@ package pool import ( "sync" - "github.com/tarantool/go-tarantool/v2" + "github.com/tarantool/go-tarantool/v3" ) // watcherContainer is a very simple implementation of a thread-safe container diff --git a/protocol_test.go b/protocol_test.go index 81ed2d3b5..c79a8afd3 100644 --- a/protocol_test.go +++ b/protocol_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" "github.com/tarantool/go-iproto" - . "github.com/tarantool/go-tarantool/v2" + . "github.com/tarantool/go-tarantool/v3" ) func TestProtocolInfoClonePreservesFeatures(t *testing.T) { diff --git a/queue/example_connection_pool_test.go b/queue/example_connection_pool_test.go index a126e13a1..8b5aab7cb 100644 --- a/queue/example_connection_pool_test.go +++ b/queue/example_connection_pool_test.go @@ -8,10 +8,11 @@ import ( "time" "github.com/google/uuid" - "github.com/tarantool/go-tarantool/v2" - "github.com/tarantool/go-tarantool/v2/pool" - "github.com/tarantool/go-tarantool/v2/queue" - "github.com/tarantool/go-tarantool/v2/test_helpers" + + "github.com/tarantool/go-tarantool/v3" + "github.com/tarantool/go-tarantool/v3/pool" + "github.com/tarantool/go-tarantool/v3/queue" + "github.com/tarantool/go-tarantool/v3/test_helpers" ) // QueueConnectionHandler handles new connections in a ConnectionPool. diff --git a/queue/example_msgpack_test.go b/queue/example_msgpack_test.go index cdd1a4e1c..53e54dc72 100644 --- a/queue/example_msgpack_test.go +++ b/queue/example_msgpack_test.go @@ -16,8 +16,8 @@ import ( "github.com/vmihailenco/msgpack/v5" - "github.com/tarantool/go-tarantool/v2" - "github.com/tarantool/go-tarantool/v2/queue" + "github.com/tarantool/go-tarantool/v3" + "github.com/tarantool/go-tarantool/v3/queue" ) type dummyData struct { diff --git a/queue/example_test.go b/queue/example_test.go index 1b411603a..99efa769b 100644 --- a/queue/example_test.go +++ b/queue/example_test.go @@ -13,8 +13,8 @@ import ( "fmt" "time" - "github.com/tarantool/go-tarantool/v2" - "github.com/tarantool/go-tarantool/v2/queue" + "github.com/tarantool/go-tarantool/v3" + "github.com/tarantool/go-tarantool/v3/queue" ) // Example demonstrates an operations like Put and Take with queue. diff --git a/queue/queue.go b/queue/queue.go index 99b1a722f..c8f968dff 100644 --- a/queue/queue.go +++ b/queue/queue.go @@ -15,7 +15,7 @@ import ( "github.com/google/uuid" "github.com/vmihailenco/msgpack/v5" - "github.com/tarantool/go-tarantool/v2" + "github.com/tarantool/go-tarantool/v3" ) // Queue is a handle to Tarantool queue's tube. diff --git a/queue/queue_test.go b/queue/queue_test.go index 840c18b4f..81f768e18 100644 --- a/queue/queue_test.go +++ b/queue/queue_test.go @@ -10,9 +10,9 @@ import ( "github.com/vmihailenco/msgpack/v5" - . "github.com/tarantool/go-tarantool/v2" - "github.com/tarantool/go-tarantool/v2/queue" - "github.com/tarantool/go-tarantool/v2/test_helpers" + . "github.com/tarantool/go-tarantool/v3" + "github.com/tarantool/go-tarantool/v3/queue" + "github.com/tarantool/go-tarantool/v3/test_helpers" ) const ( @@ -31,8 +31,8 @@ var dialer = NetDialer{ var opts = Opts{ Timeout: 5 * time.Second, - //Concurrency: 32, - //RateLimit: 4*1024, + // Concurrency: 32, + // RateLimit: 4*1024, } func createQueue(t *testing.T, conn *Connection, name string, cfg queue.Cfg) queue.Queue { @@ -54,7 +54,7 @@ func dropQueue(t *testing.T, q queue.Queue) { } } -/////////QUEUE///////// +// ///////QUEUE///////// func TestFifoQueue(t *testing.T) { conn := test_helpers.ConnectWithValidation(t, dialer, opts) diff --git a/request_test.go b/request_test.go index 43e22d311..fb4290299 100644 --- a/request_test.go +++ b/request_test.go @@ -12,7 +12,7 @@ import ( "github.com/tarantool/go-iproto" "github.com/vmihailenco/msgpack/v5" - . "github.com/tarantool/go-tarantool/v2" + . "github.com/tarantool/go-tarantool/v3" ) const invalidSpaceMsg = "invalid space" diff --git a/response_test.go b/response_test.go index 1edbf018e..e58b4d47c 100644 --- a/response_test.go +++ b/response_test.go @@ -7,8 +7,9 @@ import ( "github.com/stretchr/testify/require" "github.com/tarantool/go-iproto" - "github.com/tarantool/go-tarantool/v2" "github.com/vmihailenco/msgpack/v5" + + "github.com/tarantool/go-tarantool/v3" ) func encodeResponseData(t *testing.T, data interface{}) io.Reader { diff --git a/schema_test.go b/schema_test.go index cbc863917..e30d52690 100644 --- a/schema_test.go +++ b/schema_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/require" "github.com/vmihailenco/msgpack/v5" - "github.com/tarantool/go-tarantool/v2" - "github.com/tarantool/go-tarantool/v2/test_helpers" + "github.com/tarantool/go-tarantool/v3" + "github.com/tarantool/go-tarantool/v3/test_helpers" ) func TestGetSchema_ok(t *testing.T) { diff --git a/settings/example_test.go b/settings/example_test.go index e51cadef0..fdad495f3 100644 --- a/settings/example_test.go +++ b/settings/example_test.go @@ -5,9 +5,9 @@ import ( "fmt" "time" - "github.com/tarantool/go-tarantool/v2" - "github.com/tarantool/go-tarantool/v2/settings" - "github.com/tarantool/go-tarantool/v2/test_helpers" + "github.com/tarantool/go-tarantool/v3" + "github.com/tarantool/go-tarantool/v3/settings" + "github.com/tarantool/go-tarantool/v3/test_helpers" ) var exampleDialer = tarantool.NetDialer{ diff --git a/settings/request.go b/settings/request.go index 1c106dc8d..10c6cac25 100644 --- a/settings/request.go +++ b/settings/request.go @@ -65,7 +65,7 @@ import ( "github.com/tarantool/go-iproto" "github.com/vmihailenco/msgpack/v5" - "github.com/tarantool/go-tarantool/v2" + "github.com/tarantool/go-tarantool/v3" ) // SetRequest helps to set session settings. diff --git a/settings/request_test.go b/settings/request_test.go index b4c537a29..bb6c9e5c5 100644 --- a/settings/request_test.go +++ b/settings/request_test.go @@ -9,8 +9,8 @@ import ( "github.com/tarantool/go-iproto" "github.com/vmihailenco/msgpack/v5" - "github.com/tarantool/go-tarantool/v2" - . "github.com/tarantool/go-tarantool/v2/settings" + "github.com/tarantool/go-tarantool/v3" + . "github.com/tarantool/go-tarantool/v3/settings" ) type ValidSchemeResolver struct { diff --git a/settings/tarantool_test.go b/settings/tarantool_test.go index 56cee33ce..891959397 100644 --- a/settings/tarantool_test.go +++ b/settings/tarantool_test.go @@ -7,9 +7,10 @@ import ( "time" "github.com/stretchr/testify/require" - "github.com/tarantool/go-tarantool/v2" - . "github.com/tarantool/go-tarantool/v2/settings" - "github.com/tarantool/go-tarantool/v2/test_helpers" + + "github.com/tarantool/go-tarantool/v3" + . "github.com/tarantool/go-tarantool/v3/settings" + "github.com/tarantool/go-tarantool/v3/test_helpers" ) // There is no way to skip tests in testing.M, diff --git a/shutdown_test.go b/shutdown_test.go index 4df34aef5..434600824 100644 --- a/shutdown_test.go +++ b/shutdown_test.go @@ -13,8 +13,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - . "github.com/tarantool/go-tarantool/v2" - "github.com/tarantool/go-tarantool/v2/test_helpers" + + . "github.com/tarantool/go-tarantool/v3" + "github.com/tarantool/go-tarantool/v3/test_helpers" ) var shtdnServer = "127.0.0.1:3014" diff --git a/tarantool_test.go b/tarantool_test.go index 4902e96f4..437f7f96e 100644 --- a/tarantool_test.go +++ b/tarantool_test.go @@ -23,8 +23,8 @@ import ( "github.com/tarantool/go-iproto" "github.com/vmihailenco/msgpack/v5" - . "github.com/tarantool/go-tarantool/v2" - "github.com/tarantool/go-tarantool/v2/test_helpers" + . "github.com/tarantool/go-tarantool/v3" + "github.com/tarantool/go-tarantool/v3/test_helpers" ) var startOpts test_helpers.StartOpts = test_helpers.StartOpts{ @@ -89,8 +89,8 @@ var indexNo = uint32(0) var indexName = "primary" var opts = Opts{ Timeout: 5 * time.Second, - //Concurrency: 32, - //RateLimit: 4*1024, + // Concurrency: 32, + // RateLimit: 4*1024, } const N = 500 @@ -888,7 +888,7 @@ func TestFutureMultipleGetTypedWithError(t *testing.T) { } } -/////////////////// +// ///////////////// func TestClient(t *testing.T) { var err error @@ -2716,7 +2716,7 @@ func TestCallRequest(t *testing.T) { func TestClientRequestObjectsWithNilContext(t *testing.T) { conn := test_helpers.ConnectWithValidation(t, dialer, opts) defer conn.Close() - req := NewPingRequest().Context(nil) //nolint + req := NewPingRequest().Context(nil) // nolint data, err := conn.Do(req).Get() if err != nil { t.Fatalf("Failed to Ping: %s", err) @@ -3269,7 +3269,7 @@ func TestClientIdRequestObjectWithNilContext(t *testing.T) { req := NewIdRequest(ProtocolInfo{ Version: ProtocolVersion(1), Features: []iproto.Feature{iproto.IPROTO_FEATURE_STREAMS}, - }).Context(nil) //nolint + }).Context(nil) // nolint data, err := conn.Do(req).Get() require.Nilf(t, err, "No errors on Id request execution") require.NotNilf(t, data, "Response data not empty") @@ -3293,7 +3293,7 @@ func TestClientIdRequestObjectWithPassedCanceledContext(t *testing.T) { req := NewIdRequest(ProtocolInfo{ Version: ProtocolVersion(1), Features: []iproto.Feature{iproto.IPROTO_FEATURE_STREAMS}, - }).Context(ctx) //nolint + }).Context(ctx) // nolint cancel() resp, err := conn.Do(req).Get() require.Nilf(t, resp, "Response is empty") diff --git a/test_helpers/doer.go b/test_helpers/doer.go index c33ff0e69..b61692c43 100644 --- a/test_helpers/doer.go +++ b/test_helpers/doer.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/tarantool/go-tarantool/v2" + "github.com/tarantool/go-tarantool/v3" ) type doerResponse struct { diff --git a/test_helpers/example_test.go b/test_helpers/example_test.go index 6272d737d..3b1ed5d64 100644 --- a/test_helpers/example_test.go +++ b/test_helpers/example_test.go @@ -5,8 +5,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tarantool/go-tarantool/v2" - "github.com/tarantool/go-tarantool/v2/test_helpers" + + "github.com/tarantool/go-tarantool/v3" + "github.com/tarantool/go-tarantool/v3/test_helpers" ) func TestExampleMockDoer(t *testing.T) { diff --git a/test_helpers/main.go b/test_helpers/main.go index 4ebe4c622..35c57f810 100644 --- a/test_helpers/main.go +++ b/test_helpers/main.go @@ -24,7 +24,7 @@ import ( "strconv" "time" - "github.com/tarantool/go-tarantool/v2" + "github.com/tarantool/go-tarantool/v3" ) type StartOpts struct { diff --git a/test_helpers/pool_helper.go b/test_helpers/pool_helper.go index 599e56594..7831b9f6e 100644 --- a/test_helpers/pool_helper.go +++ b/test_helpers/pool_helper.go @@ -8,8 +8,8 @@ import ( "sync" "time" - "github.com/tarantool/go-tarantool/v2" - "github.com/tarantool/go-tarantool/v2/pool" + "github.com/tarantool/go-tarantool/v3" + "github.com/tarantool/go-tarantool/v3/pool" ) type ListenOnInstanceArgs struct { diff --git a/test_helpers/request.go b/test_helpers/request.go index 3756a2b54..003a97ab3 100644 --- a/test_helpers/request.go +++ b/test_helpers/request.go @@ -7,7 +7,7 @@ import ( "github.com/tarantool/go-iproto" "github.com/vmihailenco/msgpack/v5" - "github.com/tarantool/go-tarantool/v2" + "github.com/tarantool/go-tarantool/v3" ) // MockRequest is an empty mock request used for testing purposes. diff --git a/test_helpers/response.go b/test_helpers/response.go index f8757f563..630ac7726 100644 --- a/test_helpers/response.go +++ b/test_helpers/response.go @@ -7,7 +7,7 @@ import ( "github.com/vmihailenco/msgpack/v5" - "github.com/tarantool/go-tarantool/v2" + "github.com/tarantool/go-tarantool/v3" ) // MockResponse is a mock response used for testing purposes. diff --git a/test_helpers/tcs/prepare.go b/test_helpers/tcs/prepare.go index c7b87d0f6..92a13afb1 100644 --- a/test_helpers/tcs/prepare.go +++ b/test_helpers/tcs/prepare.go @@ -8,8 +8,8 @@ import ( "text/template" "time" - "github.com/tarantool/go-tarantool/v2" - "github.com/tarantool/go-tarantool/v2/test_helpers" + "github.com/tarantool/go-tarantool/v3" + "github.com/tarantool/go-tarantool/v3/test_helpers" ) const ( diff --git a/test_helpers/tcs/tcs.go b/test_helpers/tcs/tcs.go index 1ba26a19e..a54ba5fda 100644 --- a/test_helpers/tcs/tcs.go +++ b/test_helpers/tcs/tcs.go @@ -7,8 +7,8 @@ import ( "net" "testing" - "github.com/tarantool/go-tarantool/v2" - "github.com/tarantool/go-tarantool/v2/test_helpers" + "github.com/tarantool/go-tarantool/v3" + "github.com/tarantool/go-tarantool/v3/test_helpers" ) // ErrNotSupported identifies result of `Start()` why storage was not started. diff --git a/test_helpers/utils.go b/test_helpers/utils.go index 579f507c9..d844a822a 100644 --- a/test_helpers/utils.go +++ b/test_helpers/utils.go @@ -6,7 +6,8 @@ import ( "time" "github.com/stretchr/testify/require" - "github.com/tarantool/go-tarantool/v2" + + "github.com/tarantool/go-tarantool/v3" ) // ConnectWithValidation tries to connect to a Tarantool instance. diff --git a/testdata/sidecar/main.go b/testdata/sidecar/main.go index 971b8694c..a2c571b87 100644 --- a/testdata/sidecar/main.go +++ b/testdata/sidecar/main.go @@ -5,7 +5,7 @@ import ( "os" "strconv" - "github.com/tarantool/go-tarantool/v2" + "github.com/tarantool/go-tarantool/v3" ) func main() { diff --git a/uuid/example_test.go b/uuid/example_test.go index c79dc35be..8673d390c 100644 --- a/uuid/example_test.go +++ b/uuid/example_test.go @@ -15,8 +15,9 @@ import ( "time" "github.com/google/uuid" - "github.com/tarantool/go-tarantool/v2" - _ "github.com/tarantool/go-tarantool/v2/uuid" + + "github.com/tarantool/go-tarantool/v3" + _ "github.com/tarantool/go-tarantool/v3/uuid" ) var exampleOpts = tarantool.Opts{ diff --git a/uuid/uuid_test.go b/uuid/uuid_test.go index 0ce317979..22ffd7eb5 100644 --- a/uuid/uuid_test.go +++ b/uuid/uuid_test.go @@ -10,9 +10,9 @@ import ( "github.com/google/uuid" "github.com/vmihailenco/msgpack/v5" - . "github.com/tarantool/go-tarantool/v2" - "github.com/tarantool/go-tarantool/v2/test_helpers" - _ "github.com/tarantool/go-tarantool/v2/uuid" + . "github.com/tarantool/go-tarantool/v3" + "github.com/tarantool/go-tarantool/v3/test_helpers" + _ "github.com/tarantool/go-tarantool/v3/uuid" ) // There is no way to skip tests in testing.M,