From: Mergen Imeev via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: s.ostanevich@corp.mail.ru, tsafin@tarantool.org Cc: tarantool-patches@dev.tarantool.org Subject: [Tarantool-patches] [PATCH v1 08/10] sql: refactor vdbeapi.c Date: Mon, 1 Feb 2021 11:15:04 +0300 [thread overview] Message-ID: <6c2ff351a24f14dd47516bdaf20537ae699a5edf.1612166870.git.imeevma@gmail.com> (raw) In-Reply-To: <cover.1612166870.git.imeevma@gmail.com> --- src/box/sql/vdbeapi.c | 53 ++++++++++++------------------------------- 1 file changed, 15 insertions(+), 38 deletions(-) diff --git a/src/box/sql/vdbeapi.c b/src/box/sql/vdbeapi.c index 7c59ef83f..54ec113b3 100644 --- a/src/box/sql/vdbeapi.c +++ b/src/box/sql/vdbeapi.c @@ -111,7 +111,7 @@ sql_clear_bindings(sql_stmt * pStmt) Vdbe *p = (Vdbe *) pStmt; for (i = 0; i < p->nVar; i++) { sqlVdbeMemRelease(&p->aVar[i]); - p->aVar[i].flags = MEM_Null; + mem_set_null(&p->aVar[i]); } return rc; } @@ -130,12 +130,12 @@ const void * sql_value_blob(sql_value * pVal) { Mem *p = (Mem *) pVal; - if (p->flags & (MEM_Blob | MEM_Str)) { + if (mem_is_varstring(p)) { if (ExpandBlob(p) != 0) { - assert(p->flags == MEM_Null && p->z == 0); + assert(mem_is_null(p) && p->z == 0); return 0; } - p->flags |= MEM_Blob; + mem_convert_to_binary(p); return p->n ? p->z : 0; } else { return sql_value_text(pVal); @@ -232,7 +232,7 @@ sql_value_dup(const sql_value * pOrig) memcpy(pNew, pOrig, MEMCELLSIZE); pNew->flags &= ~MEM_Dyn; pNew->db = 0; - if (pNew->flags & (MEM_Str | MEM_Blob)) { + if (mem_is_varstring(pNew)) { pNew->flags &= ~(MEM_Static | MEM_Dyn); pNew->flags |= MEM_Ephem; if (sqlVdbeMemMakeWriteable(pNew) != 0) { @@ -588,39 +588,17 @@ sql_data_count(sql_stmt * pStmt) static const Mem * columnNullValue(void) { - /* Even though the Mem structure contains an element - * of type i64, on certain architectures (x86) with certain compiler - * switches (-Os), gcc may align this Mem object on a 4-byte boundary - * instead of an 8-byte one. This all works fine, except that when - * running with SQL_DEBUG defined the sql code sometimes assert()s - * that a Mem structure is located on an 8-byte boundary. To prevent - * these assert()s from failing, when building with SQL_DEBUG defined - * using gcc, we force nullMem to be 8-byte aligned using the magical - * __attribute__((aligned(8))) macro. - */ - static const Mem nullMem #if defined(SQL_DEBUG) && defined(__GNUC__) - __attribute__ ((aligned(8))) -#endif - = { - /* .u = */ { - 0}, - /* .flags = */ (u16) MEM_Null, - /* .eSubtype = */ (u8) 0, - /* .field_type = */ field_type_MAX, - /* .n = */ (int)0, - /* .z = */ (char *)0, - /* .zMalloc = */ (char *)0, - /* .szMalloc = */ (int)0, - /* .uTemp = */ (u32) 0, - /* .db = */ (sql *) 0, - /* .xDel = */ (void (*)(void *))0, -#ifdef SQL_DEBUG - /* .pScopyFrom = */ (Mem *) 0, - /* .pFiller = */ (void *)0, + static struct Mem nullMem __attribute__ ((aligned(8))); +#else + static struct Mem nullMem; #endif - }; - return &nullMem; + static struct Mem *null_mem_ptr = NULL; + if (null_mem_ptr == NULL) { + mem_init(&nullMem); + null_mem_ptr = &nullMem; + } + return null_mem_ptr; } /* @@ -879,8 +857,7 @@ vdbeUnbind(Vdbe * p, int i) i--; pVar = &p->aVar[i]; sqlVdbeMemRelease(pVar); - pVar->flags = MEM_Null; - pVar->field_type = field_type_MAX; + mem_set_null(pVar); return 0; } -- 2.25.1
next prev parent reply other threads:[~2021-02-01 8:18 UTC|newest] Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-02-01 8:14 [Tarantool-patches] [PATCH v1 00/10] Encapsulate MEM type changing and checking Mergen Imeev via Tarantool-patches 2021-02-01 8:14 ` [Tarantool-patches] [PATCH v1 01/10] sql: introduce mem_set_*() functions Mergen Imeev via Tarantool-patches 2021-02-01 8:14 ` [Tarantool-patches] [PATCH v1 02/10] sql: Initialize MEM in sqlVdbeAllocUnpackedRecord() Mergen Imeev via Tarantool-patches 2021-02-01 8:14 ` [Tarantool-patches] [PATCH v1 03/10] sql: introduce mem_is_*() functions Mergen Imeev via Tarantool-patches 2021-02-01 8:14 ` [Tarantool-patches] [PATCH v1 04/10] sql: introduce mem_convert_to_binary() Mergen Imeev via Tarantool-patches 2021-02-01 8:14 ` [Tarantool-patches] [PATCH v1 05/10] sql: refactor vdbesort.c Mergen Imeev via Tarantool-patches 2021-02-01 8:15 ` [Tarantool-patches] [PATCH v1 06/10] sql: refactor sql/func.c Mergen Imeev via Tarantool-patches 2021-02-01 8:15 ` [Tarantool-patches] [PATCH v1 07/10] sql: refactor vdbetrace.c Mergen Imeev via Tarantool-patches 2021-02-01 8:15 ` Mergen Imeev via Tarantool-patches [this message] 2021-02-01 8:15 ` [Tarantool-patches] [PATCH v1 09/10] sql: refactor vdbeaux.c Mergen Imeev via Tarantool-patches 2021-02-09 9:51 ` [Tarantool-patches] FW: " Timur Safin via Tarantool-patches 2021-02-13 15:33 ` Mergen Imeev via Tarantool-patches 2021-02-28 17:35 ` Vladislav Shpilevoy via Tarantool-patches 2021-02-01 8:15 ` [Tarantool-patches] [PATCH v1 10/10] sql: refactor vdbe.c Mergen Imeev via Tarantool-patches [not found] ` <047f01d6fec7$b5a90bb0$20fb2310$@tarantool.org> 2021-02-13 15:26 ` Mergen Imeev via Tarantool-patches 2021-02-09 9:36 ` [Tarantool-patches] [PATCH v1 00/10] Encapsulate MEM type changing and checking Timur Safin via Tarantool-patches 2021-02-13 15:13 ` Mergen Imeev via Tarantool-patches
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=6c2ff351a24f14dd47516bdaf20537ae699a5edf.1612166870.git.imeevma@gmail.com \ --to=tarantool-patches@dev.tarantool.org \ --cc=imeevma@tarantool.org \ --cc=s.ostanevich@corp.mail.ru \ --cc=tsafin@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v1 08/10] sql: refactor vdbeapi.c' \ /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