From: Kirill Shcherbatov <kshcherbatov@tarantool.org> To: tarantool-patches@freelists.org Cc: vdavydov.dev@gmail.com, Kirill Shcherbatov <kshcherbatov@tarantool.org> Subject: [tarantool-patches] [PATCH v4 05/14] box: introduce tuple_format_sizeof routine Date: Thu, 11 Oct 2018 10:58:50 +0300 [thread overview] Message-ID: <95a45583991d6285ea53d2c8b9a24571d2c8a848.1539244271.git.kshcherbatov@tarantool.org> (raw) In-Reply-To: <cover.1539244271.git.kshcherbatov@tarantool.org> In-Reply-To: <cover.1539244271.git.kshcherbatov@tarantool.org> New tuple_format_sizeof routine calculates the size of memory for tuple_format allocation. Part of #1012. --- src/box/tuple_format.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/box/tuple_format.c b/src/box/tuple_format.c index d8acaa5..6a287f2 100644 --- a/src/box/tuple_format.c +++ b/src/box/tuple_format.c @@ -42,6 +42,18 @@ static const struct tuple_field tuple_field_default = { }; /** + * Calculate the size of tuple format allocation. + * @param field_count Count of tuple fields. + * @retval Size of memory allocation. + */ +static inline uint32_t +tuple_format_sizeof(uint32_t field_count) +{ + return sizeof(struct tuple_format) + + field_count * sizeof(struct tuple_field); +} + +/** * Add and initialize a new key_part to format. * @param format Format to initialize. * @param fields Fields definition if any. @@ -225,8 +237,7 @@ tuple_format_alloc(struct key_def * const *keys, uint16_t key_count, } } uint32_t field_count = MAX(space_field_count, index_field_count); - uint32_t total = sizeof(struct tuple_format) + - field_count * sizeof(struct tuple_field); + uint32_t total = tuple_format_sizeof(field_count); struct tuple_format *format = (struct tuple_format *) malloc(total); if (format == NULL) { -- 2.7.4
next prev parent reply other threads:[~2018-10-11 7:59 UTC|newest] Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-10-11 7:58 [PATCH v4 00/14] box: indexes by JSON path Kirill Shcherbatov 2018-10-11 7:58 ` [PATCH v4 01/14] box: refactor key_def_find routine Kirill Shcherbatov 2018-10-15 17:27 ` Vladimir Davydov 2018-10-11 7:58 ` [PATCH v4 10/14] box: introduce JSON indexes Kirill Shcherbatov 2018-10-16 9:33 ` Vladimir Davydov 2018-10-11 7:58 ` [PATCH v4 11/14] box: introduce has_json_paths flag in templates Kirill Shcherbatov 2018-10-11 7:58 ` [PATCH v4 12/14] box: tune tuple_field_raw_by_path for indexed data Kirill Shcherbatov 2018-10-11 7:58 ` [PATCH v4 13/14] box: introduce offset slot cache in key_part Kirill Shcherbatov 2018-10-11 7:58 ` [PATCH v4 14/14] box: specify indexes in user-friendly form Kirill Shcherbatov 2018-10-11 7:58 ` [PATCH v4 02/14] box: introduce key_def_parts_are_sequential Kirill Shcherbatov 2018-10-15 17:29 ` Vladimir Davydov 2018-10-11 7:58 ` [PATCH v4 03/14] box: introduce tuple_field_by_relative_path Kirill Shcherbatov 2018-10-15 17:46 ` Vladimir Davydov 2018-10-11 7:58 ` [PATCH v4 04/14] box: introduce tuple_format_add_key_part Kirill Shcherbatov 2018-10-15 19:39 ` Vladimir Davydov 2018-10-11 7:58 ` Kirill Shcherbatov [this message] 2018-10-15 17:52 ` [tarantool-patches] [PATCH v4 05/14] box: introduce tuple_format_sizeof routine Vladimir Davydov 2018-10-11 7:58 ` [PATCH v4 06/14] box: move tuple_field_go_to_{index,key} definition Kirill Shcherbatov 2018-10-16 8:15 ` Vladimir Davydov 2018-10-11 7:58 ` [PATCH v4 07/14] box: drop format const qualifier in *init_field_map Kirill Shcherbatov 2018-10-11 7:58 ` [PATCH v4 08/14] lib: implement JSON tree class for json library Kirill Shcherbatov 2018-10-16 8:26 ` Vladimir Davydov 2018-10-11 7:58 ` [PATCH v4 09/14] lib: introduce json_path_normalize routine Kirill Shcherbatov 2018-10-16 8:39 ` Vladimir Davydov
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=95a45583991d6285ea53d2c8b9a24571d2c8a848.1539244271.git.kshcherbatov@tarantool.org \ --to=kshcherbatov@tarantool.org \ --cc=tarantool-patches@freelists.org \ --cc=vdavydov.dev@gmail.com \ --subject='Re: [tarantool-patches] [PATCH v4 05/14] box: introduce tuple_format_sizeof routine' \ /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