From: Nikita Pettik <korablev@tarantool.org>
To: Vladislav Shpilevoy <v.shpilevoy@tarantool.org>
Cc: tarantool-patches@dev.tarantool.org
Subject: Re: [Tarantool-patches] [PATCH v2 09/10] iproto: refactor error encoding with mpstream
Date: Wed, 1 Apr 2020 15:54:22 +0000 [thread overview]
Message-ID: <20200401155422.GB26447@tarantool.org> (raw)
In-Reply-To: <b1541e1b-ea0e-8473-1277-7ba76c34de9e@tarantool.org>
On 31 Mar 01:24, Vladislav Shpilevoy wrote:
> Thanks for the patch!
>
> > diff --git a/src/box/xrow.c b/src/box/xrow.c
> > index 5e3cb0709..256dd4d91 100644
> > --- a/src/box/xrow.c
> > +++ b/src/box/xrow.c
> > @@ -478,46 +475,77 @@ iproto_reply_vote(struct obuf *out, const struct ballot *ballot,
> > int
> > iproto_reply_error(struct obuf *out, const struct error *e, uint64_t sync,
> > uint32_t schema_version)
> > {
> > - uint32_t msg_len = strlen(e->errmsg);
> > - uint32_t errcode = box_error_code(e);
> > -
> > - struct iproto_body_bin body = iproto_error_bin;
> > char *header = (char *)obuf_alloc(out, IPROTO_HEADER_LEN);
> > if (header == NULL)
> > return -1;
> >
> > + bool is_error = false;
> > + struct mpstream stream;
> > + mpstream_init(&stream, out, obuf_reserve_cb, obuf_alloc_cb,
> > + mpstream_error_handler, &is_error);
> > +
> > + uint32_t used = obuf_size(out);
> > + mpstream_iproto_encode_error(&stream, e);
> > + mpstream_flush(&stream);
> > +
> > + uint32_t errcode = box_error_code(e);
> > iproto_header_encode(header, iproto_encode_error(errcode), sync,
> > - schema_version, sizeof(body) + msg_len);
> > - body.v_data_len = mp_bswap_u32(msg_len);
> > + schema_version, obuf_size(out) - used);
> > +
> > /* Malformed packet appears to be a lesser evil than abort. */
> > - return obuf_dup(out, &body, sizeof(body)) != sizeof(body) ||
> > - obuf_dup(out, e->errmsg, msg_len) != msg_len ? -1 : 0;
> > + return is_error;
>
> The function is supposed to return 0/-1. So better keep this
> convention. You can declare is_error as 'int rc', and set it to
> -1 in mpstream_error_handler(). Should be fine. Or make it
>
> return is_error ? -1 : 0;
I prefer the latter option. Fixed.
next prev parent reply other threads:[~2020-04-01 15:54 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-25 1:42 [Tarantool-patches] [PATCH v2 00/10] Stacked diagnostics Nikita Pettik
2020-03-25 1:42 ` [Tarantool-patches] [PATCH v2 01/10] box: rfc for stacked diagnostic area Nikita Pettik
2020-03-25 8:27 ` Konstantin Osipov
2020-03-25 14:08 ` Nikita Pettik
2020-03-25 1:42 ` [Tarantool-patches] [PATCH v2 02/10] box: rename diag_add_error to diag_set_error Nikita Pettik
2020-03-25 8:27 ` Konstantin Osipov
2020-03-26 0:22 ` Vladislav Shpilevoy
2020-03-26 12:31 ` Nikita Pettik
2020-03-25 1:42 ` [Tarantool-patches] [PATCH v2 03/10] test: move box.error tests to box/error.test.lua Nikita Pettik
2020-03-25 8:28 ` Konstantin Osipov
2020-03-26 0:22 ` Vladislav Shpilevoy
2020-03-26 12:31 ` Nikita Pettik
2020-03-25 1:43 ` [Tarantool-patches] [PATCH v2 04/10] box/error: introduce box.error.set() method Nikita Pettik
2020-03-25 8:33 ` Konstantin Osipov
2020-03-25 17:41 ` Nikita Pettik
2020-03-26 0:22 ` Vladislav Shpilevoy
2020-03-26 12:31 ` Nikita Pettik
2020-03-25 1:43 ` [Tarantool-patches] [PATCH v2 05/10] box/error: don't set error created via box.error.new to diag Nikita Pettik
2020-03-26 16:50 ` Konstantin Osipov
2020-03-26 17:59 ` Nikita Pettik
2020-03-26 18:06 ` Nikita Pettik
2020-03-26 18:07 ` Alexander Turenko
2020-03-27 0:19 ` Vladislav Shpilevoy
2020-03-27 13:09 ` Nikita Pettik
2020-03-25 1:43 ` [Tarantool-patches] [PATCH v2 06/10] box: introduce stacked diagnostic area Nikita Pettik
2020-03-26 16:54 ` Konstantin Osipov
2020-03-26 18:03 ` Nikita Pettik
2020-03-26 18:08 ` Konstantin Osipov
2020-03-28 18:40 ` Vladislav Shpilevoy
2020-04-01 16:09 ` Nikita Pettik
2020-04-02 0:29 ` Vladislav Shpilevoy
2020-04-02 17:42 ` Nikita Pettik
2020-04-02 22:20 ` Vladislav Shpilevoy
2020-04-03 1:54 ` Nikita Pettik
2020-04-03 23:17 ` Vladislav Shpilevoy
2020-03-28 18:59 ` Vladislav Shpilevoy
2020-03-31 17:44 ` Nikita Pettik
2020-04-02 0:29 ` Vladislav Shpilevoy
2020-04-02 14:16 ` Nikita Pettik
2020-03-25 1:43 ` [Tarantool-patches] [PATCH v2 07/10] box: use stacked diagnostic area for functional indexes Nikita Pettik
2020-03-30 23:24 ` Vladislav Shpilevoy
2020-04-01 15:53 ` Nikita Pettik
2020-03-25 1:43 ` [Tarantool-patches] [PATCH v2 08/10] box/error: clarify purpose of reference counting in struct error Nikita Pettik
2020-03-30 23:24 ` Vladislav Shpilevoy
2020-03-25 1:43 ` [Tarantool-patches] [PATCH v2 09/10] iproto: refactor error encoding with mpstream Nikita Pettik
2020-03-30 23:24 ` Vladislav Shpilevoy
2020-04-01 15:54 ` Nikita Pettik [this message]
2020-03-25 1:43 ` [Tarantool-patches] [PATCH v2 10/10] iproto: support error stacked diagnostic area Nikita Pettik
2020-03-30 23:24 ` Vladislav Shpilevoy
2020-04-01 16:26 ` Nikita Pettik
2020-04-01 22:24 ` Nikita Pettik
2020-04-02 0:29 ` Vladislav Shpilevoy
2020-04-02 14:01 ` Nikita Pettik
2020-04-02 22:20 ` Vladislav Shpilevoy
2020-04-03 2:16 ` Nikita Pettik
2020-04-03 23:17 ` Vladislav Shpilevoy
2020-04-06 11:07 ` Nikita Pettik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200401155422.GB26447@tarantool.org \
--to=korablev@tarantool.org \
--cc=tarantool-patches@dev.tarantool.org \
--cc=v.shpilevoy@tarantool.org \
--subject='Re: [Tarantool-patches] [PATCH v2 09/10] iproto: refactor error encoding with mpstream' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox