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 v3 15/16] module api: add box_key_def_validate_key() Date: Thu, 15 Oct 2020 01:41:50 +0200 [thread overview] Message-ID: <e1f03912-5406-5f68-87d0-c2844d1e4742@tarantool.org> (raw) In-Reply-To: <daa04e14f0c0d70e4857fbe246e640c11a6f7cb2.1602541394.git.alexander.turenko@tarantool.org> Thanks for the patch! See 2 comments below. On 13.10.2020 01:23, Alexander Turenko wrote: > The function allows to verify a key against a key definition. It accepts > a partial key. > > Part of #5273 > --- > src/box/key_def.c | 13 +++++ > src/box/key_def.h | 21 ++++++++ > src/exports.h | 1 + > test/app-tap/module_api.c | 88 ++++++++++++++++++++++++++++++++ > test/app-tap/module_api.test.lua | 2 +- > 5 files changed, 124 insertions(+), 1 deletion(-) > > diff --git a/src/box/key_def.c b/src/box/key_def.c > index da1c23135..55ac79362 100644 > --- a/src/box/key_def.c > +++ b/src/box/key_def.c > @@ -627,6 +627,19 @@ box_key_def_extract_key(box_key_def_t *key_def, box_tuple_t *tuple, > return tuple_extract_key(tuple, key_def, multikey_idx, key_size_ptr); > } > > +int > +box_key_def_validate_key(const box_key_def_t *key_def, const char *key) > +{ > + uint32_t part_count = mp_decode_array(&key); > + if (part_count > key_def->part_count) { > + diag_set(ClientError, ER_KEY_PART_COUNT, key_def->part_count, > + part_count); > + return -1; > + } > + const char *key_end; 1. Don't you want to make it an out parameter? We won't be able to add it later, in case it will be ever needed. > + return key_validate_parts(key_def, key, part_count, true, &key_end); > +} > + > /* }}} Module API functions */ > > diff --git a/src/box/key_def.h b/src/box/key_def.h > index 1b27836a8..440f2fb13 100644 > --- a/src/box/key_def.h > +++ b/src/box/key_def.h > @@ -545,6 +545,27 @@ API_EXPORT char * > box_key_def_extract_key(box_key_def_t *key_def, box_tuple_t *tuple, > int multikey_idx, uint32_t *key_size_ptr); > > +/** > + * Check a key against given key definition. > + * > + * Verifies key parts against given key_def's field types with > + * respect to nullability. > + * > + * A partial key (with less part than defined in @a key_def) is > + * verified by given key parts, the omitted tail is not verified > + * anyhow. > + * > + * Note: nil is accepted for nullable fields, but only for them. > + * > + * @param key_def Key definition. > + * @param key MessagePack'ed data for matching. > + * > + * @retval 0 The key is valid. > + * @retval -1 The key is invalid. 2. Maybe it is worth saying in all the new public functions, that if they return -1, it means diag is set, and is available via box_error_message() and shit.
next prev parent reply other threads:[~2020-10-14 23:41 UTC|newest] Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-10-12 23:23 [Tarantool-patches] [PATCH v3 00/16] module api: extend for external key_def Lua module Alexander Turenko 2020-10-12 23:23 ` [Tarantool-patches] [PATCH v3 01/16] module api: get rid of typedef redefinitions Alexander Turenko 2020-10-12 23:23 ` [Tarantool-patches] [PATCH v3 02/16] module api: expose box region Alexander Turenko 2020-10-14 23:41 ` Vladislav Shpilevoy 2020-10-15 13:17 ` Alexander Turenko 2020-10-12 23:23 ` [Tarantool-patches] [PATCH v3 03/16] module api/lua: add luaL_iscdata() function Alexander Turenko 2020-10-12 23:23 ` [Tarantool-patches] [PATCH v3 04/16] lua: factor out tuple encoding from luaT_tuple_new Alexander Turenko 2020-10-12 23:23 ` [Tarantool-patches] [PATCH v3 05/16] lua: don't raise a Lua error from luaT_tuple_new() Alexander Turenko 2020-10-14 23:41 ` Vladislav Shpilevoy 2020-10-15 13:17 ` Alexander Turenko 2020-10-12 23:23 ` [Tarantool-patches] [PATCH v3 06/16] module api/lua: add luaT_tuple_encode() Alexander Turenko 2020-10-12 23:23 ` [Tarantool-patches] [PATCH v3 07/16] module api/lua: expose luaT_tuple_new() Alexander Turenko 2020-10-12 23:23 ` [Tarantool-patches] [PATCH v3 08/16] module api/lua: add API_EXPORT to tuple functions Alexander Turenko 2020-10-14 23:41 ` Vladislav Shpilevoy 2020-10-15 2:35 ` Alexander Turenko 2020-10-12 23:23 ` [Tarantool-patches] [PATCH v3 09/16] module api: add API_EXPORT to key_def functions Alexander Turenko 2020-10-12 23:23 ` [Tarantool-patches] [PATCH v3 10/16] module api: add box_key_def_new_v2() Alexander Turenko 2020-10-12 23:23 ` [Tarantool-patches] [PATCH v3 11/16] module api: add box_key_def_dump_parts() Alexander Turenko 2020-10-12 23:23 ` [Tarantool-patches] [PATCH v3 12/16] module api: expose box_key_def_validate_tuple() Alexander Turenko 2020-10-12 23:23 ` [Tarantool-patches] [PATCH v3 13/16] module api: expose box_key_def_merge() Alexander Turenko 2020-10-14 23:41 ` Vladislav Shpilevoy 2020-10-12 23:23 ` [Tarantool-patches] [PATCH v3 14/16] module api: expose box_key_def_extract_key() Alexander Turenko 2020-10-14 23:41 ` Vladislav Shpilevoy 2020-10-15 2:39 ` Alexander Turenko 2020-10-12 23:23 ` [Tarantool-patches] [PATCH v3 15/16] module api: add box_key_def_validate_key() Alexander Turenko 2020-10-14 23:41 ` Vladislav Shpilevoy [this message] 2020-10-15 13:18 ` Alexander Turenko 2020-10-12 23:23 ` [Tarantool-patches] [PATCH v3 16/16] module api: add box_key_def_validate_full_key() Alexander Turenko 2020-10-14 23:41 ` [Tarantool-patches] [PATCH v3 00/16] module api: extend for external key_def Lua module Vladislav Shpilevoy 2020-10-15 3:09 ` Alexander Turenko 2020-10-15 13:19 ` Alexander Turenko 2020-10-16 6:05 ` Alexander Turenko 2020-10-15 20:12 ` Vladislav Shpilevoy
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=e1f03912-5406-5f68-87d0-c2844d1e4742@tarantool.org \ --to=v.shpilevoy@tarantool.org \ --cc=alexander.turenko@tarantool.org \ --cc=tarantool-patches@dev.tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v3 15/16] module api: add box_key_def_validate_key()' \ /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