From: Vladislav Shpilevoy <v.shpilevoy@tarantool.org> To: Alexander Turenko <alexander.turenko@tarantool.org> Cc: tarantool-patches@dev.tarantool.org Subject: Re: [Tarantool-patches] [PATCH 4/5] error: provide MP_ERROR extension serializer Date: Tue, 19 May 2020 22:48:28 +0200 [thread overview] Message-ID: <143c9744-de57-2b69-55df-49fd14378f1b@tarantool.org> (raw) In-Reply-To: <20200519115151.yzemh35jqmsxaj54@tkn_work_nb> Thanks for the review! On 19/05/2020 13:51, Alexander Turenko wrote: >> + const char *field_to_key[MP_ERROR_MAX] = { >> + /* MP_ERROR_TYPE = */ "\"type\": ", >> + /* MP_ERROR_FILE = */ "\"file\": ", >> + /* MP_ERROR_LINE = */ "\"line\": ", >> + /* MP_ERROR_MESSAGE = */ "\"message\": ", >> + /* MP_ERROR_ERRNO = */ "\"errno\": ", >> + /* MP_ERROR_CODE = */ "\"code\": ", >> + /* MP_ERROR_FIELDS = */ "\"fields\": ", >> + }; > > Should be static? I can do it static, but only outside of the function and the of the whole template then. Otherwise we will have 2 copies of this array, because mp_print_error_one() is turned into 2 functions: mp_sprint_error_one() and mp_fprint_error_one(). ==================== diff --git a/src/box/mp_error.cc b/src/box/mp_error.cc index 23a74d0a9..badf7ee92 100644 --- a/src/box/mp_error.cc +++ b/src/box/mp_error.cc @@ -561,6 +561,16 @@ error_unpack_unsafe(const char **data) return err; } +static const char *const mp_error_field_to_json_key[MP_ERROR_MAX] = { + [MP_ERROR_TYPE] = "\"type\": ", + [MP_ERROR_FILE] = "\"file\": ", + [MP_ERROR_LINE] = "\"line\": ", + [MP_ERROR_MESSAGE] = "\"message\": ", + [MP_ERROR_ERRNO] = "\"errno\": ", + [MP_ERROR_CODE] = "\"code\": ", + [MP_ERROR_FIELDS] = "\"fields\": ", +}; + /** * Include this file into self with a few template parameters * to create mp_snprint_error() and mp_fprint_error() functions @@ -634,15 +644,6 @@ mp_print_error_one(MP_PRINT_ARGS_DECL, const char **data, int depth) MP_PRINT(total, "...}"); return total; } - const char *field_to_key[MP_ERROR_MAX] = { - [MP_ERROR_TYPE] = "\"type\": ", - [MP_ERROR_FILE] = "\"file\": ", - [MP_ERROR_LINE] = "\"line\": ", - [MP_ERROR_MESSAGE] = "\"message\": ", - [MP_ERROR_ERRNO] = "\"errno\": ", - [MP_ERROR_CODE] = "\"code\": ", - [MP_ERROR_FIELDS] = "\"fields\": ", - }; --depth; if (mp_typeof(**data) != MP_MAP) return -1; @@ -654,7 +655,7 @@ mp_print_error_one(MP_PRINT_ARGS_DECL, const char **data, int depth) return -1; uint64_t key = mp_decode_uint(data); if (key < MP_ERROR_MAX) - MP_PRINT(total, "%s", field_to_key[key]); + MP_PRINT(total, "%s", mp_error_field_to_json_key[key]); else MP_PRINT(total, "%llu: ", key); MP_PRINT_2(total, mp_print_common, data, depth);
next prev parent reply other threads:[~2020-05-19 20:48 UTC|newest] Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-05-11 23:45 [Tarantool-patches] [PATCH 0/5] mp_snprint() and mp_fprint() for decimal, uuid, error Vladislav Shpilevoy 2020-05-11 23:45 ` [Tarantool-patches] [PATCH 1/5] msgpuck: bump version to enable extension printer Vladislav Shpilevoy 2020-05-12 17:34 ` Cyrill Gorcunov 2020-05-11 23:45 ` [Tarantool-patches] [PATCH 2/5] decimal: provide MP_DECIMAL extension serializer Vladislav Shpilevoy 2020-05-12 15:13 ` Cyrill Gorcunov 2020-05-12 20:30 ` Vladislav Shpilevoy 2020-05-12 20:56 ` Cyrill Gorcunov 2020-05-12 17:35 ` Cyrill Gorcunov 2020-05-11 23:45 ` [Tarantool-patches] [PATCH 3/5] uuid: provide MP_UUID " Vladislav Shpilevoy 2020-05-12 17:36 ` Cyrill Gorcunov 2020-05-11 23:45 ` [Tarantool-patches] [PATCH 4/5] error: provide MP_ERROR " Vladislav Shpilevoy 2020-05-12 17:52 ` Cyrill Gorcunov 2020-05-12 20:38 ` Vladislav Shpilevoy 2020-05-12 21:27 ` Cyrill Gorcunov 2020-05-18 15:24 ` Serge Petrenko 2020-05-13 12:31 ` Nikita Pettik 2020-05-13 22:10 ` Vladislav Shpilevoy 2020-05-14 2:32 ` Nikita Pettik 2020-05-14 21:28 ` Vladislav Shpilevoy 2020-05-19 13:21 ` Nikita Pettik 2020-05-20 21:57 ` Vladislav Shpilevoy 2020-05-19 11:51 ` Alexander Turenko 2020-05-19 20:48 ` Vladislav Shpilevoy [this message] 2020-05-11 23:45 ` [Tarantool-patches] [PATCH 5/5] msgpuck: activate MP_EXT custom serializers Vladislav Shpilevoy 2020-05-12 17:52 ` Cyrill Gorcunov 2020-05-13 21:06 ` Nikita Pettik 2020-05-13 21:48 ` Vladislav Shpilevoy 2020-05-14 2:24 ` Nikita Pettik 2020-05-14 21:27 ` Vladislav Shpilevoy 2020-05-19 12:11 ` Alexander Turenko 2020-05-19 20:48 ` Vladislav Shpilevoy 2020-05-19 13:23 ` Nikita Pettik 2020-05-18 15:25 ` [Tarantool-patches] [PATCH 0/5] mp_snprint() and mp_fprint() for decimal, uuid, error Serge Petrenko 2020-05-21 18:25 ` Alexander Turenko
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=143c9744-de57-2b69-55df-49fd14378f1b@tarantool.org \ --to=v.shpilevoy@tarantool.org \ --cc=alexander.turenko@tarantool.org \ --cc=tarantool-patches@dev.tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH 4/5] error: provide MP_ERROR extension serializer' \ /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