From d96251a5b5cbd8e0a697f8c95aece3e5767fca3a Mon Sep 17 00:00:00 2001 From: Dmitriy Gertsog Date: Fri, 11 Oct 2024 13:13:11 +0300 Subject: [PATCH] api: update iproto.Arrow constants Closes #412 --- arrow/request.go | 16 ++-------------- arrow/request_test.go | 8 +------- go.mod | 2 +- go.sum | 8 ++------ 4 files changed, 6 insertions(+), 28 deletions(-) diff --git a/arrow/request.go b/arrow/request.go index 2b6a9e29..332720d3 100644 --- a/arrow/request.go +++ b/arrow/request.go @@ -9,18 +9,6 @@ import ( "github.com/vmihailenco/msgpack/v5" ) -// INSERT Arrow request. -// -// FIXME: replace with iproto.IPROTO_INSERT_ARROW when iproto will released. -// https://github.com/tarantool/go-tarantool/issues/412 -const iprotoInsertArrowType = iproto.Type(17) - -// The data in Arrow format. -// -// FIXME: replace with iproto.IPROTO_ARROW when iproto will released. -// https://github.com/tarantool/go-tarantool/issues/412 -const iprotoArrowKey = iproto.Key(0x36) - // InsertRequest helps you to create an insert request object for execution // by a Connection. type InsertRequest struct { @@ -39,7 +27,7 @@ func NewInsertRequest(space interface{}, arrow Arrow) *InsertRequest { // Type returns a IPROTO_INSERT_ARROW type for the request. func (r *InsertRequest) Type() iproto.Type { - return iprotoInsertArrowType + return iproto.IPROTO_INSERT_ARROW } // Async returns false to the request return a response. @@ -78,7 +66,7 @@ func (r *InsertRequest) Body(res tarantool.SchemaResolver, enc *msgpack.Encoder) if err := tarantool.EncodeSpace(res, enc, r.space); err != nil { return err } - if err := enc.EncodeUint(uint64(iprotoArrowKey)); err != nil { + if err := enc.EncodeUint(uint64(iproto.IPROTO_ARROW)); err != nil { return err } return enc.Encode(r.arrow) diff --git a/arrow/request_test.go b/arrow/request_test.go index 5cddaefb..fba6b556 100644 --- a/arrow/request_test.go +++ b/arrow/request_test.go @@ -13,17 +13,11 @@ import ( "github.com/vmihailenco/msgpack/v5" ) -// INSERT Arrow request. -// -// FIXME: replace with iproto.IPROTO_INSERT_ARROW when iproto will released. -// https://github.com/tarantool/go-tarantool/issues/412 -const iprotoInsertArrowType = iproto.Type(17) - const validSpace uint32 = 1 // Any valid value != default. func TestInsertRequestType(t *testing.T) { request := arrow.NewInsertRequest(validSpace, arrow.Arrow{}) - require.Equal(t, iprotoInsertArrowType, request.Type()) + require.Equal(t, iproto.IPROTO_INSERT_ARROW, request.Type()) } func TestInsertRequestAsync(t *testing.T) { diff --git a/go.mod b/go.mod index 30381a8b..ba396f15 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/google/uuid v1.3.0 github.com/shopspring/decimal v1.3.1 github.com/stretchr/testify v1.9.0 - github.com/tarantool/go-iproto v1.0.0 + github.com/tarantool/go-iproto v1.0.1-0.20241010173538-44b6566ef267 github.com/vmihailenco/msgpack/v5 v5.3.5 ) diff --git a/go.sum b/go.sum index bf592667..e532373e 100644 --- a/go.sum +++ b/go.sum @@ -1,4 +1,3 @@ -github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -10,19 +9,16 @@ github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5g github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -github.com/tarantool/go-iproto v1.0.0 h1:quC4hdFhCuFYaCqOFgUxH2foRkhAy+TlEy7gQLhdVjw= -github.com/tarantool/go-iproto v1.0.0/go.mod h1:LNCtdyZxojUed8SbOiYHoc3v9NvaZTB7p96hUySMlIo= +github.com/tarantool/go-iproto v1.0.1-0.20241010173538-44b6566ef267 h1:GenzvYfP9io9aEdZFmnopfcBOXmJg6MgBWyd4t8z4oI= +github.com/tarantool/go-iproto v1.0.1-0.20241010173538-44b6566ef267/go.mod h1:LNCtdyZxojUed8SbOiYHoc3v9NvaZTB7p96hUySMlIo= github.com/vmihailenco/msgpack/v5 v5.3.5 h1:5gO0H1iULLWGhs2H5tbAHIZTV8/cYafcFOr9znI5mJU= github.com/vmihailenco/msgpack/v5 v5.3.5/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc= github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g= github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=