draft: Refactoring of SpaceRequest

Author: dmyger

arrow/arrow_test.go

@@ -80,7 +80,7 @@ func TestInsert_invalid(t *testing.T) {
 				require.ErrorContains(t, err, a.expected)
 				return
 			}
-			req := tarantool.NewInsertArrowRequest(space).Arrow(arr)
+			req := arrow.NewInsertRequest(space, arr)
 
 			_, err = conn.Do(req).Get()
 			require.ErrorContains(t, err, a.expected)

arrow/request.go

@@ -0,0 +1,74 @@
+package arrow
+
+import (
+	"context"
+
+	"github.com/tarantool/go-iproto"
+	"github.com/tarantool/go-tarantool/v2"
+	"github.com/vmihailenco/msgpack/v5"
+)
+
+// INSERT Arrow request.
+//
+// FIXME: replace with iproto.IPROTO_INSERT_ARROW when iproto will released.
+// https://github.com/tarantool/go-replica/issues/30
+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-replica/issues/30
+const iprotoArrowKey = iproto.Key(0x36)
+
+// InsertRequest helps you to create an insert request object for execution
+// by a Connection.
+type InsertRequest struct {
+	tarantool.SpaceRequest
+	arrow interface{}
+}
+
+// NewInsertRequest returns a new empty InsertArrowRequest.
+func NewInsertRequest(space interface{}, arrow interface{}) *InsertRequest {
+	return &InsertRequest{
+		SpaceRequest: tarantool.NewSpaceRequest(iprotoInsertArrowType, space),
+		arrow:        arrow,
+	}
+}
+
+// Arrow sets the arrow for insertion the insert arrow request.
+// Note: default value is nil.
+func (req *InsertRequest) Arrow(arrow interface{}) *InsertRequest {
+	req.arrow = arrow
+	return req
+}
+
+func (req *InsertRequest) fillInsertArrow(res tarantool.SchemaResolver, enc *msgpack.Encoder) error {
+	if err := enc.EncodeMapLen(2); err != nil {
+		return err
+	}
+	if err := req.SpaceRequest.Encode(res, enc); err != nil {
+		return err
+	}
+
+	if err := enc.EncodeUint(uint64(iprotoArrowKey)); err != nil {
+		return err
+	}
+	return enc.Encode(req.arrow)
+}
+
+// Body fills an msgpack.Encoder with the insert arrow request body.
+func (req *InsertRequest) Body(res tarantool.SchemaResolver, enc *msgpack.Encoder) error {
+
+	return req.fillInsertArrow(res, enc)
+}
+
+// Context sets a passed context to the request.
+//
+// Pay attention that when using context with request objects,
+// the timeout option for Connection does not affect the lifetime
+// of the request. For those purposes use context.WithTimeout() as
+// the root context.
+func (req *InsertRequest) Context(ctx context.Context) *InsertRequest {
+	req.SpaceRequest.Context(ctx)
+	return req
+}

request.go

@@ -13,18 +13,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-replica/issues/30
-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-replica/issues/30
-const iprotoArrowKey = iproto.Key(0x36)
-
 type spaceEncoder struct {
 	Id   uint32
 	Name string
@@ -148,20 +136,6 @@ func fillInsert(enc *msgpack.Encoder, spaceEnc spaceEncoder, tuple interface{})
 	return enc.Encode(tuple)
 }
 
-func fillInsertArrow(enc *msgpack.Encoder, spaceEnc spaceEncoder, arrow interface{}) error {
-	if err := enc.EncodeMapLen(2); err != nil {
-		return err
-	}
-	if err := spaceEnc.Encode(enc); err != nil {
-		return err
-	}
-
-	if err := enc.EncodeUint(uint64(iprotoArrowKey)); err != nil {
-		return err
-	}
-	return enc.Encode(arrow)
-}
-
 func fillSelect(enc *msgpack.Encoder, spaceEnc spaceEncoder, indexEnc indexEncoder,
 	offset, limit uint32, iterator Iter, key, after interface{}, fetchPos bool) error {
 	mapLen := 6
@@ -888,17 +862,41 @@ func (req *baseRequest) Response(header Header, body io.Reader) (Response, error
 	return &resp, nil
 }
 
-type spaceRequest struct {
+type SpaceRequest struct {
 	baseRequest
 	space interface{}
 }
 
-func (req *spaceRequest) setSpace(space interface{}) {
+func (r *SpaceRequest) Context(ctx context.Context) {
+	r.ctx = ctx
+}
+
+func NewSpaceRequest(rtype iproto.Type, space interface{}) SpaceRequest {
+	return SpaceRequest{
+		baseRequest: baseRequest{
+			rtype: rtype,
+		},
+		space: space,
+	}
+}
+
+func (req *SpaceRequest) setSpace(space interface{}) {
 	req.space = space
 }
 
+func (req *SpaceRequest) Encode(res SchemaResolver, enc *msgpack.Encoder) error {
+	spaceEnc, err := newSpaceEncoder(res, req.space)
+	if err != nil {
+		return err
+	}
+	if err := spaceEnc.Encode(enc); err != nil {
+		return err
+	}
+	return nil
+}
+
 type spaceIndexRequest struct {
-	spaceRequest
+	SpaceRequest
 	index interface{}
 }
 
@@ -1141,7 +1139,7 @@ func (req *SelectRequest) Response(header Header, body io.Reader) (Response, err
 // InsertRequest helps you to create an insert request object for execution
 // by a Connection.
 type InsertRequest struct {
-	spaceRequest
+	SpaceRequest
 	tuple interface{}
 }
 
@@ -1182,54 +1180,10 @@ func (req *InsertRequest) Context(ctx context.Context) *InsertRequest {
 	return req
 }
 
-// InsertArrowRequest helps you to create an insert request object for execution
-// by a Connection.
-type InsertArrowRequest struct {
-	spaceRequest
-	arrow interface{}
-}
-
-// NewInsertArrowRequest returns a new empty InsertArrowRequest.
-func NewInsertArrowRequest(space interface{}) *InsertArrowRequest {
-	req := new(InsertArrowRequest)
-	req.rtype = iprotoInsertArrowType
-	req.setSpace(space)
-	req.arrow = []interface{}{}
-	return req
-}
-
-// Arrow sets the arrow for insertion the insert arrow request.
-// Note: default value is nil.
-func (req *InsertArrowRequest) Arrow(arrow interface{}) *InsertArrowRequest {
-	req.arrow = arrow
-	return req
-}
-
-// Body fills an msgpack.Encoder with the insert arrow request body.
-func (req *InsertArrowRequest) Body(res SchemaResolver, enc *msgpack.Encoder) error {
-	spaceEnc, err := newSpaceEncoder(res, req.space)
-	if err != nil {
-		return err
-	}
-
-	return fillInsertArrow(enc, spaceEnc, req.arrow)
-}
-
-// Context sets a passed context to the request.
-//
-// Pay attention that when using context with request objects,
-// the timeout option for Connection does not affect the lifetime
-// of the request. For those purposes use context.WithTimeout() as
-// the root context.
-func (req *InsertArrowRequest) Context(ctx context.Context) *InsertArrowRequest {
-	req.ctx = ctx
-	return req
-}
-
 // ReplaceRequest helps you to create a replace request object for execution
 // by a Connection.
 type ReplaceRequest struct {
-	spaceRequest
+	SpaceRequest
 	tuple interface{}
 }
 
@@ -1391,7 +1345,7 @@ func (req *UpdateRequest) Context(ctx context.Context) *UpdateRequest {
 // UpsertRequest helps you to create an upsert request object for execution
 // by a Connection.
 type UpsertRequest struct {
-	spaceRequest
+	SpaceRequest
 	tuple interface{}
 	ops   *Operations
 }