From: Alexander Turenko <alexander.turenko@tarantool.org> To: Vladislav Shpilevoy <v.shpilevoy@tarantool.org> Cc: tarantool-patches@dev.tarantool.org, Alexander Turenko <alexander.turenko@tarantool.org> Subject: [Tarantool-patches] [PATCH v2 15/15] WIP: module api: add box_key_def_validate_key() Date: Sun, 11 Oct 2020 15:57:48 +0300 [thread overview] Message-ID: <7daa5cabc03884e44aefd1015419b6e251eb888e.1602420460.git.alexander.turenko@tarantool.org> (raw) In-Reply-To: <cover.1602420460.git.alexander.turenko@tarantool.org> XXX: Add a module API test. Part of #5273 --- src/box/key_def.c | 13 +++++++++++++ src/box/key_def.h | 12 ++++++++++++ src/exports.h | 1 + 3 files changed, 26 insertions(+) diff --git a/src/box/key_def.c b/src/box/key_def.c index c13951375..af4e8f4cd 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; + return key_validate_parts(key_def, key, part_count, true, &key_end); +} + /* }}} Module API functions */ int diff --git a/src/box/key_def.h b/src/box/key_def.h index d0ce92be3..9222c9240 100644 --- a/src/box/key_def.h +++ b/src/box/key_def.h @@ -532,6 +532,18 @@ 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 that parts of the key match with the key definition. + * + * @param key_def Key definition. + * @param key MessagePack'ed data for matching. + * + * @retval 0 The key is valid. + * @retval -1 The key is invalid. + */ +API_EXPORT int +box_key_def_validate_key(const box_key_def_t *key_def, const char *key); + /** \endcond public */ /* diff --git a/src/exports.h b/src/exports.h index a0c7ac84d..1d7deb518 100644 --- a/src/exports.h +++ b/src/exports.h @@ -35,6 +35,7 @@ EXPORT(box_key_def_extract_key) EXPORT(box_key_def_merge) EXPORT(box_key_def_new) EXPORT(box_key_def_new_v2) +EXPORT(box_key_def_validate_key) EXPORT(box_key_def_validate_tuple) EXPORT(box_key_part_def_create) EXPORT(box_latch_delete) -- 2.25.0
prev parent reply other threads:[~2020-10-11 12:57 UTC|newest] Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-10-11 12:57 [Tarantool-patches] [PATCH v2 00/15] RFC: module api: extend for external key_def Lua module Alexander Turenko 2020-10-11 12:57 ` [Tarantool-patches] [PATCH v2 01/15] module api: get rid of typedef redefinitions Alexander Turenko 2020-10-11 12:57 ` [Tarantool-patches] [PATCH v2 02/15] module api: expose box region Alexander Turenko 2020-10-11 15:26 ` Vladislav Shpilevoy 2020-10-12 6:07 ` Alexander Turenko 2020-10-11 12:57 ` [Tarantool-patches] [PATCH v2 03/15] module api/lua: add luaL_iscdata() function Alexander Turenko 2020-10-11 12:57 ` [Tarantool-patches] [PATCH v2 04/15] lua: factor out tuple encoding from luaT_tuple_new Alexander Turenko 2020-10-11 12:57 ` [Tarantool-patches] [PATCH v2 05/15] lua: don't raise a Lua error from luaT_tuple_new() Alexander Turenko 2020-10-11 15:25 ` Vladislav Shpilevoy 2020-10-12 10:37 ` Alexander Turenko 2020-10-12 13:34 ` Timur Safin 2020-10-14 23:41 ` Vladislav Shpilevoy 2020-10-15 19:43 ` Alexander Turenko 2020-10-15 22:10 ` Vladislav Shpilevoy 2020-10-11 17:47 ` Igor Munkin 2020-10-11 18:08 ` Igor Munkin 2020-10-12 10:37 ` Alexander Turenko 2020-10-12 10:51 ` Igor Munkin 2020-10-12 18:41 ` Alexander Turenko 2020-10-11 12:57 ` [Tarantool-patches] [PATCH v2 06/15] WIP: module api/lua: add luaT_tuple_encode() Alexander Turenko 2020-10-11 15:25 ` Vladislav Shpilevoy 2020-10-12 10:35 ` Alexander Turenko 2020-10-11 12:57 ` [Tarantool-patches] [PATCH v2 07/15] module api/lua: expose luaT_tuple_new() Alexander Turenko 2020-10-11 15:25 ` Vladislav Shpilevoy 2020-10-12 6:11 ` Alexander Turenko 2020-10-11 12:57 ` [Tarantool-patches] [PATCH v2 08/15] module api/lua: add API_EXPORT to tuple functions Alexander Turenko 2020-10-11 12:57 ` [Tarantool-patches] [PATCH v2 09/15] module api: add API_EXPORT to key_def functions Alexander Turenko 2020-10-11 12:57 ` [Tarantool-patches] [PATCH v2 10/15] module api: add box_key_def_new_v2() Alexander Turenko 2020-10-11 15:25 ` Vladislav Shpilevoy 2020-10-12 7:21 ` Alexander Turenko 2020-10-11 12:57 ` [Tarantool-patches] [PATCH v2 11/15] module api: add box_key_def_dump_parts() Alexander Turenko 2020-10-11 15:25 ` Vladislav Shpilevoy 2020-10-12 6:50 ` Alexander Turenko 2020-10-11 12:57 ` [Tarantool-patches] [PATCH v2 12/15] module api: expose box_key_def_validate_tuple() Alexander Turenko 2020-10-11 12:57 ` [Tarantool-patches] [PATCH v2 13/15] WIP: module api: expose box_key_def_merge() Alexander Turenko 2020-10-11 12:57 ` [Tarantool-patches] [PATCH v2 14/15] WIP: module api: expose box_key_def_extract_key() Alexander Turenko 2020-10-11 12:57 ` Alexander Turenko [this message]
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=7daa5cabc03884e44aefd1015419b6e251eb888e.1602420460.git.alexander.turenko@tarantool.org \ --to=alexander.turenko@tarantool.org \ --cc=tarantool-patches@dev.tarantool.org \ --cc=v.shpilevoy@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v2 15/15] WIP: 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