From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp48.i.mail.ru (smtp48.i.mail.ru [94.100.177.108]) (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 E1F1F44643C for ; Wed, 23 Sep 2020 04:14:24 +0300 (MSK) From: Alexander Turenko Date: Wed, 23 Sep 2020 04:14:15 +0300 Message-Id: <94bccf8d2647debb1c1184af95713d48acf4c504.1600817803.git.alexander.turenko@tarantool.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH 10/14] WIP: module api: add box_key_def_dump_parts() 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 The function dumps an opacue structure into a non-opacue array of structures in order to allow an external module to obtain information about the key definition. XXX: Add a module API test. Part of #5273 --- src/box/key_def_api.c | 64 +++++++++++++++++++++++++++++++++++++++++++ src/box/key_def_api.h | 10 +++++++ src/exports.h | 1 + 3 files changed, 75 insertions(+) diff --git a/src/box/key_def_api.c b/src/box/key_def_api.c index 19590095d..25dd416aa 100644 --- a/src/box/key_def_api.c +++ b/src/box/key_def_api.c @@ -205,6 +205,70 @@ box_key_def_delete(box_key_def_t *key_def) key_def_delete(key_def); } +box_key_part_def_t * +box_key_def_dump_parts(const box_key_def_t *key_def, uint32_t *part_count_ptr) +{ + struct region *region = &fiber()->gc; + size_t region_svp = region_used(region); + size_t size; + box_key_part_def_t *parts = region_alloc_array( + region, typeof(parts[0]), key_def->part_count, &size); + if (parts == NULL) { + diag_set(OutOfMemory, size, "region_alloc_array", "parts"); + return NULL; + } + + for (uint32_t i = 0; i < key_def->part_count; i++) { + const struct key_part *part = &key_def->parts[i]; + box_key_part_def_t *part_def = &parts[i]; + box_key_part_def_create(part_def); + + /* Set part->{fieldno,flags,field_type}. */ + part_def->fieldno = part->fieldno; + part_def->flags = 0; + if (key_part_is_nullable(part)) + part_def->flags |= BOX_KEY_PART_DEF_IS_NULLABLE_MASK; + assert(part->type >= 0 && part->type < field_type_MAX); + part_def->field_type = field_type_strs[part->type]; + + /* Set part->collation. */ + if (part->coll_id != COLL_NONE) { + struct coll_id *coll_id = coll_by_id(part->coll_id); + /* + * A collation may be removed after + * key_def creation. + */ + if (coll_id == NULL) { + diag_set(CollationError, + "key_def holds dead collation id %d", + part->coll_id); + region_truncate(region, region_svp); + return NULL; + } + part_def->collation = coll_id->name; + } + + /* Set part->path. */ + if (part->path != NULL) { + char *path = region_alloc(region, part->path_len + 1); + if (path == NULL) { + diag_set(OutOfMemory, part->path_len + 1, + "region", "part_def->path"); + region_truncate(region, region_svp); + return NULL; + } + memcpy(path, part->path, part->path_len); + path[part->path_len] = '\0'; + part_def->path = path; + } + } + + if (part_count_ptr != NULL) + *part_count_ptr = key_def->part_count; + + return parts; +} + int box_tuple_compare(box_tuple_t *tuple_a, box_tuple_t *tuple_b, box_key_def_t *key_def) diff --git a/src/box/key_def_api.h b/src/box/key_def_api.h index 328a58c70..f78203a3a 100644 --- a/src/box/key_def_api.h +++ b/src/box/key_def_api.h @@ -180,6 +180,16 @@ box_key_def_new_ex(box_key_part_def_t *parts, uint32_t part_count); API_EXPORT void box_key_def_delete(box_key_def_t *key_def); +/** + * Dump key part definitions of given key_def. + * + * The function allocates key parts and storage for pointer fields + * (e.g. JSON paths) on the box region. + * @sa (). + */ +API_EXPORT box_key_part_def_t * +box_key_def_dump_parts(const box_key_def_t *key_def, uint32_t *part_count_ptr); + /** * Compare tuples using the key definition. * @param tuple_a first tuple diff --git a/src/exports.h b/src/exports.h index 80dd952c7..ff03cfa68 100644 --- a/src/exports.h +++ b/src/exports.h @@ -30,6 +30,7 @@ EXPORT(box_insert) EXPORT(box_iterator_free) EXPORT(box_iterator_next) EXPORT(box_key_def_delete) +EXPORT(box_key_def_dump_parts) EXPORT(box_key_def_new) EXPORT(box_key_def_new_ex) EXPORT(box_key_part_def_create) -- 2.25.0