From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id 4C763261DB for ; Sat, 9 Jun 2018 06:44:34 -0400 (EDT) Received: from turing.freelists.org ([127.0.0.1]) by localhost (turing.freelists.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nWFpfYGxTbQK for ; Sat, 9 Jun 2018 06:44:34 -0400 (EDT) Received: from fallback.mail.ru (fallback9.m.smailru.net [94.100.178.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id F0E75257C5 for ; Sat, 9 Jun 2018 06:44:33 -0400 (EDT) Received: from [10.161.17.67] (port=57976 helo=smtpng2.m.smailru.net) by fallback9.m.smailru.net with esmtp (envelope-from ) id 1fRaeE-00007p-Rx for tarantool-patches@freelists.org; Sat, 09 Jun 2018 12:59:03 +0300 From: Kirill Shcherbatov Subject: [tarantool-patches] [PATCH v2 05/11] box: port schema_find_id to C Date: Sat, 9 Jun 2018 12:58:45 +0300 Message-Id: In-Reply-To: References: In-Reply-To: References: Sender: tarantool-patches-bounce@freelists.org Errors-to: tarantool-patches-bounce@freelists.org Reply-To: tarantool-patches@freelists.org List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-Id: tarantool-patches List-subscribe: List-owner: List-post: List-archive: To: tarantool-patches@freelists.org Cc: v.shpilevoy@tarantool.org, Kirill Shcherbatov Part of #3273. --- src/box/schema.cc | 54 ++++++++++++++++++++++++++++++++++++++---------------- src/box/schema.h | 23 ++++++++++++++++------- src/box/user.cc | 4 +++- 3 files changed, 57 insertions(+), 24 deletions(-) diff --git a/src/box/schema.cc b/src/box/schema.cc index 2ddf920..5d32e61 100644 --- a/src/box/schema.cc +++ b/src/box/schema.cc @@ -222,30 +222,52 @@ sc_space_new(uint32_t id, const char *name, struct key_def *key_def, trigger_run_xc(&on_alter_space, space); } -uint32_t +int schema_find_id(uint32_t system_space_id, uint32_t index_id, - const char *name, uint32_t len) + const char *name, uint32_t len, uint32_t *object_id) { - if (len > BOX_NAME_MAX) - return BOX_ID_NIL; - struct space *space = space_cache_find_xc(system_space_id); - struct index *index = index_find_system_xc(space, index_id); + if (len > BOX_NAME_MAX) { + diag_set(SystemError, + "name length %d is greater than BOX_NAME_MAX", len); + return -1; + } + struct space *space = space_cache_find(system_space_id); + if (space == NULL) + return -1; + if (!space_is_memtx(space)) { + diag_set(ClientError, ER_UNSUPPORTED, + space->engine->name, "system data"); + return -1; + } + struct index *index = index_find(space, index_id); + if (index == NULL) + return -1; uint32_t size = mp_sizeof_str(len); struct region *region = &fiber()->gc; uint32_t used = region_used(region); - char *key = (char *) region_alloc_xc(region, size); - auto guard = make_scoped_guard([=] { region_truncate(region, used); }); + char *key = (char *)region_alloc(region, size); + if (key == NULL) { + diag_set(OutOfMemory, size, "region", "key"); + return -1; + } mp_encode_str(key, name, len); - - struct iterator *it = index_create_iterator_xc(index, ITER_EQ, key, 1); - IteratorGuard iter_guard(it); - - struct tuple *tuple = iterator_next_xc(it); - if (tuple) { + struct iterator *it = index_create_iterator(index, ITER_EQ, key, 1); + if (it == NULL) { + region_truncate(region, used); + return -1; + } + struct tuple *tuple; + int rc = iterator_next(it, &tuple); + if (rc == 0) { /* id is always field #1 */ - return tuple_field_u32_xc(tuple, 0); + if (tuple == NULL) + *object_id = BOX_ID_NIL; + else if (tuple_field_u32(tuple, 0, object_id) != 0) + return -1; } - return BOX_ID_NIL; + iterator_delete(it); + region_truncate(region, used); + return rc; } /** diff --git a/src/box/schema.h b/src/box/schema.h index 1f7414f..cd9bb5b 100644 --- a/src/box/schema.h +++ b/src/box/schema.h @@ -102,6 +102,22 @@ space_is_system(struct space *space); struct sequence * sequence_by_id(uint32_t id); +/** + * Find space id by name in specified system space with index. + * + * @param system_space_id identifier of the system space. + * @param index_id identifier of the index to lookup. + * @param name of object to lookup. + * @param len length of a name. + * @param object_id[out] object_id or BOX_ID_NIL - not found. + * + * @retval 0 on success. + * @retval -1 on error. + */ +int +schema_find_id(uint32_t system_space_id, uint32_t index_id, + const char *name, uint32_t len, uint32_t *object_id); + #if defined(__cplusplus) } /* extern "C" */ @@ -134,13 +150,6 @@ schema_free(); struct space *schema_space(uint32_t id); -/* - * Find object id by object name. - */ -uint32_t -schema_find_id(uint32_t system_space_id, uint32_t index_id, - const char *name, uint32_t len); - /** * Insert a new function or update the old one. * diff --git a/src/box/user.cc b/src/box/user.cc index 7fa66da..3e7f466 100644 --- a/src/box/user.cc +++ b/src/box/user.cc @@ -450,7 +450,9 @@ user_find(uint32_t uid) struct user * user_find_by_name(const char *name, uint32_t len) { - uint32_t uid = schema_find_id(BOX_USER_ID, 2, name, len); + uint32_t uid; + if (schema_find_id(BOX_USER_ID, 2, name, len, &uid) != 0) + diag_raise(); struct user *user = user_by_id(uid); if (user == NULL || user->def->type != SC_USER) { diag_set(ClientError, ER_NO_SUCH_USER, tt_cstr(name, len)); -- 2.7.4