From: Kirill Shcherbatov <kshcherbatov@tarantool.org> To: tarantool-patches@freelists.org, korablev@tarantool.org Cc: Kirill Shcherbatov <kshcherbatov@tarantool.org> Subject: [tarantool-patches] [PATCH v4 1/4] sql: rename sql_vdbe_mem_alloc_region helper Date: Wed, 21 Aug 2019 18:28:06 +0300 [thread overview] Message-ID: <28f5c2fe5c21b2d58329911cb420aa5f10949051.1566400979.git.kshcherbatov@tarantool.org> (raw) In-Reply-To: <cover.1566400979.git.kshcherbatov@tarantool.org> 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
next prev parent reply other threads:[~2019-08-21 15:28 UTC|newest] Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-08-21 15:28 [tarantool-patches] [PATCH v4 0/4] sql: uniform SQL and Lua functions subsystem Kirill Shcherbatov 2019-08-21 15:28 ` Kirill Shcherbatov [this message] 2019-08-22 13:04 ` [tarantool-patches] Re: [PATCH v4 1/4] sql: rename sql_vdbe_mem_alloc_region helper n.pettik 2019-08-23 15:02 ` Kirill Shcherbatov 2019-08-21 15:28 ` [tarantool-patches] [PATCH v4 2/4] sql: replace flag MINMAX with flags MIN and MAX Kirill Shcherbatov 2019-08-22 13:30 ` [tarantool-patches] " n.pettik 2019-08-21 15:28 ` [tarantool-patches] [PATCH v4 3/4] sql: get rid of FuncDef function hash Kirill Shcherbatov 2019-08-22 14:37 ` [tarantool-patches] " n.pettik 2019-08-23 15:02 ` [tarantool-patches] [PATCH v4 4/5] " Kirill Shcherbatov 2019-08-23 15:02 ` [tarantool-patches] [PATCH v4 3/5] sql: remove name overloading for SQL builtins Kirill Shcherbatov 2019-08-28 15:05 ` [tarantool-patches] " Nikita Pettik 2019-08-23 15:02 ` [tarantool-patches] Re: [PATCH v4 3/4] sql: get rid of FuncDef function hash Kirill Shcherbatov 2019-08-21 15:28 ` [tarantool-patches] [PATCH v4 4/4] sql: support user-defined functions in SQL Kirill Shcherbatov 2019-08-22 15:23 ` [tarantool-patches] " n.pettik 2019-08-23 15:02 ` Kirill Shcherbatov 2019-08-29 15:09 ` [tarantool-patches] Re: [PATCH v4 0/4] sql: uniform SQL and Lua functions subsystem Nikita Pettik 2019-08-29 17:12 ` Kirill Yukhin
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=28f5c2fe5c21b2d58329911cb420aa5f10949051.1566400979.git.kshcherbatov@tarantool.org \ --to=kshcherbatov@tarantool.org \ --cc=korablev@tarantool.org \ --cc=tarantool-patches@freelists.org \ --subject='Re: [tarantool-patches] [PATCH v4 1/4] sql: rename sql_vdbe_mem_alloc_region helper' \ /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