From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp40.i.mail.ru (smtp40.i.mail.ru [94.100.177.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id E799C446447 for ; Sun, 11 Oct 2020 15:57:50 +0300 (MSK) From: Alexander Turenko Date: Sun, 11 Oct 2020 15:57:48 +0300 Message-Id: <7daa5cabc03884e44aefd1015419b6e251eb888e.1602420460.git.alexander.turenko@tarantool.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH v2 15/15] WIP: module api: add box_key_def_validate_key() List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Vladislav Shpilevoy Cc: tarantool-patches@dev.tarantool.org, Alexander Turenko 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