From: Konstantin Osipov <kostja@tarantool.org> To: tarantool-patches@freelists.org Cc: v.shpilevoy@tarantool.org, Kirill Shcherbatov <kshcherbatov@tarantool.org> Subject: [tarantool-patches] Re: [PATCH v7 2/7] box: introduce OPT_ARRAY opt_type to decode arrays Date: Wed, 23 May 2018 20:53:45 +0300 [thread overview] Message-ID: <20180523175345.GC4266@atlas> (raw) In-Reply-To: <a375ffbb13de423b9bd207c70599053f43813c3e.1527084287.git.kshcherbatov@tarantool.org> * Kirill Shcherbatov <kshcherbatov@tarantool.org> [18/05/23 20:33]: > As we need to store Checks array in opt_def MsgPack in future > introduced special type and decode callback to_array used in opt_set > function. > > Part of #3272. > --- > src/box/opt_def.c | 9 +++++++++ > src/box/opt_def.h | 19 ++++++++++++++----- > 2 files changed, 23 insertions(+), 5 deletions(-) > > diff --git a/src/box/opt_def.c b/src/box/opt_def.c > index cd93c23..c8440c9 100644 > --- a/src/box/opt_def.c > +++ b/src/box/opt_def.c > @@ -44,6 +44,7 @@ const char *opt_type_strs[] = { > /* [OPT_STR] = */ "string", > /* [OPT_STRPTR] = */ "string", > /* [OPT_ENUM] = */ "enum", > + /* [OPT_ARRAY] = */ "array", > }; > > static int > @@ -135,6 +136,14 @@ opt_set(void *opts, const struct opt_def *def, const char **val, > unreachable(); > }; > break; > + case OPT_ARRAY: > + if (mp_typeof(**val) != MP_ARRAY) > + return -1; > + ival = mp_decode_array(val); > + assert(def->to_array != NULL); > + if (def->to_array(val, ival, opt) != 0) > + return -1; > + break; > default: > unreachable(); > } > diff --git a/src/box/opt_def.h b/src/box/opt_def.h > index 633832a..71fef3a 100644 > --- a/src/box/opt_def.h > +++ b/src/box/opt_def.h > @@ -47,12 +47,14 @@ enum opt_type { > OPT_STR, /* char[] */ > OPT_STRPTR, /* char* */ > OPT_ENUM, /* enum */ > + OPT_ARRAY, /* array */ > opt_type_MAX, > }; > > extern const char *opt_type_strs[]; > > typedef int64_t (*opt_def_to_enum_cb)(const char *str, uint32_t len); > +typedef int (*opt_def_to_array_cb)(const char **str, uint32_t len, char *opt); While the previous callback is self-explanatory, this one requires a comment. Actually a comment for both won't hurt. What should the callback return? who does own the memory used by the return value? What is the error handling convention? > struct opt_def { > const char *name; > @@ -64,19 +66,26 @@ struct opt_def { > int enum_size; > const char **enum_strs; > uint32_t enum_max; > - /** If not NULL, used to get a enum value by a string. */ > - opt_def_to_enum_cb to_enum; > + /** If not NULL, used to get a value by a string. */ The comment became worse, not better. > + union { > + opt_def_to_enum_cb to_enum; > + opt_def_to_array_cb to_array; > + }; > }; Otherwise LGTM. -- Konstantin Osipov, Moscow, Russia, +7 903 626 22 32 http://tarantool.io - www.twitter.com/kostja_osipov
next prev parent reply other threads:[~2018-05-23 17:53 UTC|newest] Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-05-23 14:05 [tarantool-patches] [PATCH v7 0/7] sql: remove Checks to server Kirill Shcherbatov 2018-05-23 14:05 ` [tarantool-patches] [PATCH v7 1/7] sql: remove parser construct, destruct to sql.h Kirill Shcherbatov 2018-05-23 17:46 ` [tarantool-patches] " Konstantin Osipov 2018-05-24 19:26 ` Vladislav Shpilevoy 2018-05-25 12:05 ` Kirill Shcherbatov 2018-05-23 14:05 ` [tarantool-patches] [PATCH v7 2/7] box: introduce OPT_ARRAY opt_type to decode arrays Kirill Shcherbatov 2018-05-23 17:53 ` Konstantin Osipov [this message] 2018-05-24 7:32 ` [tarantool-patches] " Kirill Shcherbatov 2018-05-24 19:26 ` Vladislav Shpilevoy 2018-05-25 11:54 ` Kirill Shcherbatov 2018-05-23 14:05 ` [tarantool-patches] [PATCH v7 3/7] sql: introduce expr_len for sql_expr_compile Kirill Shcherbatov 2018-05-24 19:26 ` [tarantool-patches] " Vladislav Shpilevoy 2018-05-25 11:54 ` Kirill Shcherbatov 2018-05-23 14:05 ` [tarantool-patches] [PATCH v7 4/7] sql: rename sql_expr_free to sql_expr_delete Kirill Shcherbatov 2018-05-23 18:00 ` [tarantool-patches] " Konstantin Osipov 2018-05-24 19:26 ` Vladislav Shpilevoy 2018-05-25 11:54 ` Kirill Shcherbatov 2018-05-23 14:05 ` [tarantool-patches] [PATCH v7 5/7] sql: change sqlite3AddCheckConstraint signature Kirill Shcherbatov 2018-05-23 18:01 ` [tarantool-patches] " Konstantin Osipov 2018-05-24 19:26 ` Vladislav Shpilevoy 2018-05-25 11:53 ` Kirill Shcherbatov 2018-05-29 11:51 ` n.pettik 2018-05-30 8:32 ` Kirill Shcherbatov 2018-05-23 14:05 ` [tarantool-patches] [PATCH v7 6/7] sql: export funcs defined on Expr, ExprList to sql.h Kirill Shcherbatov 2018-05-23 18:15 ` [tarantool-patches] " Konstantin Osipov 2018-05-24 7:33 ` Kirill Shcherbatov 2018-05-24 19:26 ` Vladislav Shpilevoy 2018-05-25 11:53 ` Kirill Shcherbatov 2018-05-28 11:19 ` Vladislav Shpilevoy 2018-05-28 14:59 ` Kirill Shcherbatov 2018-05-23 14:05 ` [tarantool-patches] [PATCH v7 7/7] sql: remove Checks to server Kirill Shcherbatov 2018-05-24 19:26 ` [tarantool-patches] " Vladislav Shpilevoy 2018-05-25 11:53 ` Kirill Shcherbatov 2018-05-28 11:19 ` Vladislav Shpilevoy 2018-05-28 14:59 ` Kirill Shcherbatov 2018-05-28 18:50 ` Vladislav Shpilevoy 2018-05-29 11:49 ` n.pettik 2018-05-30 8:32 ` Kirill Shcherbatov 2018-05-30 10:42 ` n.pettik 2018-05-25 12:04 ` [tarantool-patches] Re: [PATCH v7 0/7] " Kirill Shcherbatov 2018-05-28 11:19 ` Vladislav Shpilevoy 2018-05-30 11:03 ` n.pettik 2018-05-31 17:44 ` Kirill Yukhin
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=20180523175345.GC4266@atlas \ --to=kostja@tarantool.org \ --cc=kshcherbatov@tarantool.org \ --cc=tarantool-patches@freelists.org \ --cc=v.shpilevoy@tarantool.org \ --subject='[tarantool-patches] Re: [PATCH v7 2/7] box: introduce OPT_ARRAY opt_type to decode arrays' \ /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