Skip to content

TNTP-3334: IPROTO_IS_SYNC support for begin/commit #447

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ Versioning](http://semver.org/spec/v2.0.0.html) except to the first release.
- Implemented box.session.su request and sugar interface only for current session granting (#426).
- Defined `ErrConcurrentSchemaUpdate` constant for "concurrent schema update" error.
Now you can check this error with `errors.Is(err, tarantool.ErrConcurrentSchemaUpdate)`.
- Implemented support for `IPROTO_IS_SYNC` flag in stream transactions,
added `IsSync(bool)` method for `BeginRequest`/`CommitRequest` (#447).

### Changed

Expand Down
84 changes: 84 additions & 0 deletions example_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -998,6 +998,90 @@ func ExampleBeginRequest_TxnIsolation() {
fmt.Printf("Select after Rollback: response is %#v\n", data)
}

func ExampleBeginRequest_IsSync() {
conn := exampleConnect(dialer, opts)
defer conn.Close()

// Tarantool supports IS_SYNC flag for BeginRequest since version 3.1.0.
isLess, err := test_helpers.IsTarantoolVersionLess(3, 1, 0)
if err != nil || isLess {
return
}

stream, err := conn.NewStream()
if err != nil {
fmt.Printf("error getting the stream: %s\n", err)
return
}

// Begin transaction with synchronous mode
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// Begin transaction with synchronous mode
// Begin transaction with synchronous mode.

req := tarantool.NewBeginRequest().IsSync(true)
resp, err := stream.Do(req).GetResponse()
switch {
case err != nil:
fmt.Printf("error getting the response: %s\n", err)
case resp.Header().Error != tarantool.ErrorNo:
fmt.Printf("response error code: %s\n", resp.Header().Error)
default:
fmt.Println("Success.")
}
}

func ExampleCommitRequest_IsSync() {
conn := exampleConnect(dialer, opts)
defer conn.Close()

// Tarantool supports IS_SYNC flag for CommitRequest since version 3.1.0.
isLess, err := test_helpers.IsTarantoolVersionLess(3, 1, 0)
if err != nil || isLess {
return
}

var req tarantool.Request

stream, err := conn.NewStream()
if err != nil {
fmt.Printf("error getting the stream: %s\n", err)
return
}

// Begin transaction.
req = tarantool.NewBeginRequest()
resp, err := stream.Do(req).GetResponse()
switch {
case err != nil:
fmt.Printf("error getting the response: %s\n", err)
return
case resp.Header().Error != tarantool.ErrorNo:
fmt.Printf("response error code: %s\n", resp.Header().Error)
return
}

// Insert in stream.
req = tarantool.NewReplaceRequest("test").Tuple([]interface{}{1, "test"})
resp, err = stream.Do(req).GetResponse()
switch {
case err != nil:
fmt.Printf("error getting the response: %s\n", err)
return
case resp.Header().Error != tarantool.ErrorNo:
fmt.Printf("response error code: %s\n", resp.Header().Error)
return
}

// Commit transaction in sync mode.
req = tarantool.NewCommitRequest().IsSync(true)
resp, err = stream.Do(req).GetResponse()
switch {
case err != nil:
fmt.Printf("error getting the response: %s\n", err)
case resp.Header().Error != tarantool.ErrorNo:
fmt.Printf("response error code: %s\n", resp.Header().Error)
default:
fmt.Println("Success.")
}
}

func ExampleErrorNo() {
conn := exampleConnect(dialer, opts)
defer conn.Close()
Expand Down
158 changes: 0 additions & 158 deletions export_test.go

This file was deleted.

64 changes: 38 additions & 26 deletions prepared.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,26 +22,6 @@ type Prepared struct {
Conn *Connection
}

func fillPrepare(enc *msgpack.Encoder, expr string) error {
enc.EncodeMapLen(1)
enc.EncodeUint(uint64(iproto.IPROTO_SQL_TEXT))
return enc.EncodeString(expr)
}

func fillUnprepare(enc *msgpack.Encoder, stmt Prepared) error {
enc.EncodeMapLen(1)
enc.EncodeUint(uint64(iproto.IPROTO_STMT_ID))
return enc.EncodeUint(uint64(stmt.StatementID))
}

func fillExecutePrepared(enc *msgpack.Encoder, stmt Prepared, args interface{}) error {
enc.EncodeMapLen(2)
enc.EncodeUint(uint64(iproto.IPROTO_STMT_ID))
enc.EncodeUint(uint64(stmt.StatementID))
enc.EncodeUint(uint64(iproto.IPROTO_SQL_BIND))
return encodeSQLBind(enc, args)
}

// NewPreparedFromResponse constructs a Prepared object.
func NewPreparedFromResponse(conn *Connection, resp Response) (*Prepared, error) {
if resp == nil {
Expand Down Expand Up @@ -81,8 +61,16 @@ func NewPrepareRequest(expr string) *PrepareRequest {
}

// Body fills an msgpack.Encoder with the execute request body.
func (req *PrepareRequest) Body(res SchemaResolver, enc *msgpack.Encoder) error {
return fillPrepare(enc, req.expr)
func (req *PrepareRequest) Body(_ SchemaResolver, enc *msgpack.Encoder) error {
err := enc.EncodeMapLen(1)
if err != nil {
return err
}
err = enc.EncodeUint(uint64(iproto.IPROTO_SQL_TEXT))
if err != nil {
return err
}
return enc.EncodeString(req.expr)
Comment on lines +65 to +73
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a code style issue, but please add a blank line after an error check.

Suggested change
err := enc.EncodeMapLen(1)
if err != nil {
return err
}
err = enc.EncodeUint(uint64(iproto.IPROTO_SQL_TEXT))
if err != nil {
return err
}
return enc.EncodeString(req.expr)
err := enc.EncodeMapLen(1)
if err != nil {
return err
}
err = enc.EncodeUint(uint64(iproto.IPROTO_SQL_TEXT))
if err != nil {
return err
}
return enc.EncodeString(req.expr)

}

// Context sets a passed context to the request.
Expand Down Expand Up @@ -126,8 +114,16 @@ func (req *UnprepareRequest) Conn() *Connection {
}

// Body fills an msgpack.Encoder with the execute request body.
func (req *UnprepareRequest) Body(res SchemaResolver, enc *msgpack.Encoder) error {
return fillUnprepare(enc, *req.stmt)
func (req *UnprepareRequest) Body(_ SchemaResolver, enc *msgpack.Encoder) error {
err := enc.EncodeMapLen(1)
if err != nil {
return err
}
err = enc.EncodeUint(uint64(iproto.IPROTO_STMT_ID))
if err != nil {
return err
}
return enc.EncodeUint(uint64(req.stmt.StatementID))
}

// Context sets a passed context to the request.
Expand Down Expand Up @@ -171,8 +167,24 @@ func (req *ExecutePreparedRequest) Args(args interface{}) *ExecutePreparedReques
}

// Body fills an msgpack.Encoder with the execute request body.
func (req *ExecutePreparedRequest) Body(res SchemaResolver, enc *msgpack.Encoder) error {
return fillExecutePrepared(enc, *req.stmt, req.args)
func (req *ExecutePreparedRequest) Body(_ SchemaResolver, enc *msgpack.Encoder) error {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For here and all other functions.
Just a cosmetic: it would a bit better to add empty lines between blocks.
At least if we add linters from tt they will force add such lines.

err := enc.EncodeMapLen(2)
if err != nil {
return err
}
err = enc.EncodeUint(uint64(iproto.IPROTO_STMT_ID))
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
err = enc.EncodeUint(uint64(iproto.IPROTO_STMT_ID))
err = enc.EncodeUint(uint64(iproto.IPROTO_STMT_ID))

if err != nil {
return err
}
err = enc.EncodeUint(uint64(req.stmt.StatementID))
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
err = enc.EncodeUint(uint64(req.stmt.StatementID))
err = enc.EncodeUint(uint64(req.stmt.StatementID))

if err != nil {
return err
}
err = enc.EncodeUint(uint64(iproto.IPROTO_SQL_BIND))
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
err = enc.EncodeUint(uint64(iproto.IPROTO_SQL_BIND))
err = enc.EncodeUint(uint64(iproto.IPROTO_SQL_BIND))

if err != nil {
return err
}
return encodeSQLBind(enc, req.args)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
return encodeSQLBind(enc, req.args)
return encodeSQLBind(enc, req.args)

}

// Context sets a passed context to the request.
Expand Down
Loading
Loading