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 A60CB446445 for ; Sun, 11 Oct 2020 15:57:47 +0300 (MSK) From: Alexander Turenko Date: Sun, 11 Oct 2020 15:57:46 +0300 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH v2 13/15] WIP: module api: expose box_key_def_merge() 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 Part of #5273 --- src/box/key_def.c | 6 ++++++ src/box/key_def.h | 14 ++++++++++++++ src/exports.h | 1 + 3 files changed, 21 insertions(+) diff --git a/src/box/key_def.c b/src/box/key_def.c index e7ecb6ec5..25a8decf0 100644 --- a/src/box/key_def.c +++ b/src/box/key_def.c @@ -614,6 +614,12 @@ box_tuple_compare_with_key(box_tuple_t *tuple_a, const char *key_b, } +box_key_def_t * +box_key_def_merge(const box_key_def_t *first, const box_key_def_t *second) +{ + return key_def_merge(first, second); +} + /* }}} Module API functions */ int diff --git a/src/box/key_def.h b/src/box/key_def.h index f33c20430..224b56eb9 100644 --- a/src/box/key_def.h +++ b/src/box/key_def.h @@ -498,6 +498,20 @@ API_EXPORT int box_tuple_compare_with_key(box_tuple_t *tuple_a, const char *key_b, box_key_def_t *key_def); +/** + * Allocate a new key_def with a set union of key parts from + * first and second key defs. + * + * Parts of the new key_def consist of the first key_def's parts + * and those parts of the second key_def that were not among the + * first parts. + * + * @retval not NULL Ok. + * @retval NULL Memory error. + */ +API_EXPORT box_key_def_t * +box_key_def_merge(const box_key_def_t *first, const box_key_def_t *second); + /** \endcond public */ /* diff --git a/src/exports.h b/src/exports.h index 71ec1a9b5..223390d52 100644 --- a/src/exports.h +++ b/src/exports.h @@ -31,6 +31,7 @@ EXPORT(box_iterator_free) EXPORT(box_iterator_next) EXPORT(box_key_def_delete) EXPORT(box_key_def_dump_parts) +EXPORT(box_key_def_merge) EXPORT(box_key_def_new) EXPORT(box_key_def_new_v2) EXPORT(box_key_def_validate_tuple) -- 2.25.0