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 9D262275E9 for ; Wed, 21 Aug 2019 11:28:13 -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 fswJYxj5PyXi for ; Wed, 21 Aug 2019 11:28:13 -0400 (EDT) Received: from smtp54.i.mail.ru (smtp54.i.mail.ru [217.69.128.34]) (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 D6EE0274E2 for ; Wed, 21 Aug 2019 11:28:12 -0400 (EDT) From: Kirill Shcherbatov Subject: [tarantool-patches] [PATCH v4 1/4] sql: rename sql_vdbe_mem_alloc_region helper Date: Wed, 21 Aug 2019 18:28:06 +0300 Message-Id: <28f5c2fe5c21b2d58329911cb420aa5f10949051.1566400979.git.kshcherbatov@tarantool.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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, korablev@tarantool.org Cc: Kirill Shcherbatov Changed sql_vdbe_mem_alloc_region routine name to the sql_vdbe_mem_alloc_blob_region because we are going to introduce a new function with a really similar (but more appropriate) name vdbemem_alloc_on_region in following patch. Needed for #2200, #4113, #2233 --- src/box/sql/vdbe.h | 2 +- src/box/sql/vdbe.c | 2 +- src/box/sql/vdbeaux.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/box/sql/vdbe.h b/src/box/sql/vdbe.h index 8f16202ba..e5a85fe0e 100644 --- a/src/box/sql/vdbe.h +++ b/src/box/sql/vdbe.h @@ -278,7 +278,7 @@ int sqlVdbeRecordCompare(struct sql *db, int key_count, const void *key1, UnpackedRecord *key2); UnpackedRecord *sqlVdbeAllocUnpackedRecord(struct sql *, struct key_def *); -int sql_vdbe_mem_alloc_region(Mem *, uint32_t); +int sql_vdbe_mem_alloc_blob_region(Mem *, uint32_t); void sqlVdbeLinkSubProgram(Vdbe *, SubProgram *); diff --git a/src/box/sql/vdbe.c b/src/box/sql/vdbe.c index 16e005844..a2f78607a 100644 --- a/src/box/sql/vdbe.c +++ b/src/box/sql/vdbe.c @@ -3919,7 +3919,7 @@ case OP_RowData: { } testcase( n==0); - if (sql_vdbe_mem_alloc_region(pOut, n) != 0) + if (sql_vdbe_mem_alloc_blob_region(pOut, n) != 0) goto abort_due_to_error; sqlCursorPayload(pCrsr, 0, n, pOut->z); UPDATE_MAX_BLOBSIZE(pOut); diff --git a/src/box/sql/vdbeaux.c b/src/box/sql/vdbeaux.c index e7accc745..5bcf2ccd8 100644 --- a/src/box/sql/vdbeaux.c +++ b/src/box/sql/vdbeaux.c @@ -2805,7 +2805,7 @@ sqlVdbeAllocUnpackedRecord(struct sql *db, struct key_def *key_def) /* Allocate memory for internal VDBE structure on region. */ int -sql_vdbe_mem_alloc_region(Mem *vdbe_mem, uint32_t size) +sql_vdbe_mem_alloc_blob_region(Mem *vdbe_mem, uint32_t size) { vdbe_mem->n = size; vdbe_mem->z = region_alloc(&fiber()->gc, size); -- 2.22.1