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 1.10 16/16] WIP: module api: add box_key_def_validate_key()
Date: Wed, 23 Sep 2020 04:40:29 +0300 [thread overview]
Message-ID: <8220fef6603624997e238414911c410cc6485754.1600824556.git.alexander.turenko@tarantool.org> (raw)
In-Reply-To: <cover.1600824556.git.alexander.turenko@tarantool.org>
XXX: Add a module API test.
Part of #5273
(cherry picked from commit 501646b13840c7f8166e47c7ce75385b76dc00b0)
---
| 1 +
src/box/key_def_api.c | 13 +++++++++++++
src/box/key_def_api.h | 15 +++++++++++++++
3 files changed, 29 insertions(+)
--git a/extra/exports b/extra/exports
index 1684da57d..a4ac03530 100644
--- a/extra/exports
+++ b/extra/exports
@@ -150,6 +150,7 @@ box_key_def_delete
box_key_def_dump_parts
box_key_def_new_ex
box_key_def_merge
+box_key_def_validate_key
box_key_part_def_create
box_tuple_format_default
box_tuple_new
diff --git a/src/box/key_def_api.c b/src/box/key_def_api.c
index cce605e35..55fbc53ce 100644
--- a/src/box/key_def_api.c
+++ b/src/box/key_def_api.c
@@ -282,4 +282,17 @@ box_tuple_extract_key_ex(box_tuple_t *tuple, box_key_def_t *key_def,
return tuple_extract_key(tuple, key_def, key_size_ptr);
}
+int
+box_key_def_validate_key(const box_key_def_t *key_def, const char *key,
+ bool allow_nullable)
+{
+ 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;
+ }
+ return key_validate_parts(key_def, key, part_count, allow_nullable);
+}
+
/* }}} API functions implementations */
diff --git a/src/box/key_def_api.h b/src/box/key_def_api.h
index cf4f3c9b7..b85ed7f3c 100644
--- a/src/box/key_def_api.h
+++ b/src/box/key_def_api.h
@@ -36,6 +36,7 @@ extern "C" {
#endif /* defined(__cplusplus) */
#include <stdint.h>
+#include <stdbool.h>
#include "trivia/util.h"
typedef struct tuple box_tuple_t;
@@ -242,6 +243,20 @@ API_EXPORT char *
box_tuple_extract_key_ex(box_tuple_t *tuple, box_key_def_t *key_def,
int ignored, 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.
+ * @param allow_nullable True if nullable parts are allowed.
+ *
+ * @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,
+ bool allow_nullable);
+
/** \endcond public */
/*
--
2.25.0
next prev parent reply other threads:[~2020-09-23 1:40 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-23 1:14 [Tarantool-patches] [PATCH 00/14] RFC: module api: extend for external key_def Lua module Alexander Turenko
2020-09-23 1:14 ` [Tarantool-patches] [PATCH 01/14] module api: get rid of typedef redefinitions Alexander Turenko
2020-09-23 1:14 ` [Tarantool-patches] [PATCH 02/14] WIP: module api: expose box region Alexander Turenko
2020-09-24 22:31 ` Vladislav Shpilevoy
2020-10-08 19:21 ` Alexander Turenko
2020-09-23 1:14 ` [Tarantool-patches] [PATCH 03/14] WIP: module api/lua: add luaL_iscdata() function Alexander Turenko
2020-09-24 22:32 ` Vladislav Shpilevoy
2020-10-08 21:46 ` Alexander Turenko
2020-09-23 1:14 ` [Tarantool-patches] [PATCH 04/14] WIP: module api/lua: expose luaT_tuple_new() Alexander Turenko
2020-09-23 1:14 ` [Tarantool-patches] [PATCH 05/14] WIP: module api/lua: add luaT_tuple_encode() Alexander Turenko
2020-09-24 22:32 ` Vladislav Shpilevoy
2020-10-12 19:06 ` Alexander Turenko
2020-09-23 1:14 ` [Tarantool-patches] [PATCH 06/14] WIP: refactoring: add API_EXPORT to lua/tuple functions Alexander Turenko
2020-09-23 1:14 ` [Tarantool-patches] [PATCH 07/14] WIP: refactoring: add API_EXPORT to key_def functions Alexander Turenko
2020-09-23 1:14 ` [Tarantool-patches] [PATCH 08/14] WIP: refactoring: extract key_def module API functions Alexander Turenko
2020-09-25 22:58 ` Vladislav Shpilevoy
2020-10-07 11:30 ` Alexander Turenko
2020-10-07 22:12 ` Vladislav Shpilevoy
2020-09-23 1:14 ` [Tarantool-patches] [PATCH 09/14] WIP: module api: add box_key_def_new_ex() Alexander Turenko
2020-09-25 22:58 ` Vladislav Shpilevoy
2020-10-09 21:54 ` Alexander Turenko
2020-09-23 1:14 ` [Tarantool-patches] [PATCH 10/14] WIP: module api: add box_key_def_dump_parts() Alexander Turenko
2020-09-25 22:58 ` Vladislav Shpilevoy
2020-10-09 9:33 ` Alexander Turenko
2020-09-23 1:14 ` [Tarantool-patches] [PATCH 11/14] WIP: module api: expose box_tuple_validate_key_parts() Alexander Turenko
2020-09-23 1:14 ` [Tarantool-patches] [PATCH 12/14] WIP: module api: expose box_key_def_merge() Alexander Turenko
2020-09-25 22:58 ` Vladislav Shpilevoy
2020-10-09 1:46 ` Alexander Turenko
2020-09-23 1:14 ` [Tarantool-patches] [PATCH 13/14] WIP: module api: expose box_tuple_extract_key_ex() Alexander Turenko
2020-09-25 22:58 ` Vladislav Shpilevoy
2020-10-09 1:14 ` Alexander Turenko
2020-10-10 1:21 ` Alexander Turenko
2020-09-23 1:14 ` [Tarantool-patches] [PATCH 14/14] WIP: module api: add box_key_def_validate_key() Alexander Turenko
2020-09-25 22:59 ` Vladislav Shpilevoy
2020-10-09 1:22 ` Alexander Turenko
2020-09-23 1:40 ` [Tarantool-patches] [PATCH 1.10 00/16] RFC: module api: extend for external key_def Lua module Alexander Turenko
2020-09-23 1:40 ` [Tarantool-patches] [PATCH 1.10 01/16] collation: allow to find a collation by a name Alexander Turenko
2020-09-23 1:40 ` [Tarantool-patches] [PATCH 1.10 02/16] refactoring: adjust contract of luaT_tuple_new() Alexander Turenko
2020-09-28 21:26 ` Vladislav Shpilevoy
2020-10-05 11:58 ` Alexander Turenko
2020-09-23 1:40 ` [Tarantool-patches] [PATCH 1.10 03/16] module api: get rid of typedef redefinitions Alexander Turenko
2020-09-23 1:40 ` [Tarantool-patches] [PATCH 1.10 04/16] WIP: module api: expose box region Alexander Turenko
2020-09-23 1:40 ` [Tarantool-patches] [PATCH 1.10 05/16] WIP: module api/lua: add luaL_iscdata() function Alexander Turenko
2020-09-23 1:40 ` [Tarantool-patches] [PATCH 1.10 06/16] WIP: module api/lua: expose luaT_tuple_new() Alexander Turenko
2020-09-23 1:40 ` [Tarantool-patches] [PATCH 1.10 07/16] WIP: module api/lua: add luaT_tuple_encode() Alexander Turenko
2020-09-23 1:40 ` [Tarantool-patches] [PATCH 1.10 08/16] WIP: refactoring: add API_EXPORT to lua/tuple functions Alexander Turenko
2020-09-23 1:40 ` [Tarantool-patches] [PATCH 1.10 09/16] WIP: refactoring: add API_EXPORT to key_def functions Alexander Turenko
2020-09-23 1:40 ` [Tarantool-patches] [PATCH 1.10 10/16] WIP: refactoring: extract key_def module API functions Alexander Turenko
2020-09-23 1:40 ` [Tarantool-patches] [PATCH 1.10 11/16] WIP: module api: add box_key_def_new_ex() Alexander Turenko
2020-09-23 1:40 ` [Tarantool-patches] [PATCH 1.10 12/16] WIP: module api: add box_key_def_dump_parts() Alexander Turenko
2020-09-23 1:40 ` [Tarantool-patches] [PATCH 1.10 13/16] WIP: module api: expose box_tuple_validate_key_parts() Alexander Turenko
2020-09-23 1:40 ` [Tarantool-patches] [PATCH 1.10 14/16] WIP: module api: expose box_key_def_merge() Alexander Turenko
2020-09-23 1:40 ` [Tarantool-patches] [PATCH 1.10 15/16] WIP: module api: expose box_tuple_extract_key_ex() Alexander Turenko
2020-09-23 1:40 ` Alexander Turenko [this message]
2020-10-05 7:26 ` [Tarantool-patches] [PATCH 00/14] RFC: module api: extend for external key_def Lua module Alexander Turenko
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=8220fef6603624997e238414911c410cc6485754.1600824556.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 1.10 16/16] 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