From: Mergen Imeev via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: v.shpilevoy@tarantool.org, tsafin@tarantool.org Cc: tarantool-patches@dev.tarantool.org Subject: [Tarantool-patches] [PATCH v4 34/53] sql: introduce mem_set_*_map() and mem_set_*_array() Date: Tue, 23 Mar 2021 12:36:07 +0300 [thread overview] Message-ID: <f8170942cd47caff036d57b684fdcf2ad723068a.1616491731.git.imeevma@gmail.com> (raw) In-Reply-To: <cover.1616491730.git.imeevma@gmail.com> This patch introduces mem_set_*_map() and mem_set_*_array() functions. These function should be used to set MAP or ARRAY values to MEM. Part of #5818 --- src/box/sql/mem.c | 176 +++++++++++++++++++++------------------------ src/box/sql/mem.h | 26 ++++++- src/box/sql/vdbe.c | 8 ++- 3 files changed, 109 insertions(+), 101 deletions(-) diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c index 7885caaf5..583de00a2 100644 --- a/src/box/sql/mem.c +++ b/src/box/sql/mem.c @@ -508,6 +508,86 @@ mem_append_to_binary(struct Mem *mem, const char *value, uint32_t size) return 0; } +void +mem_set_ephemeral_map(struct Mem *mem, char *value, uint32_t size) +{ + assert(mp_typeof(*value) == MP_MAP); + mem_set_const_bin(mem, value, size, MEM_Ephem); + mem->flags |= MEM_Subtype; + mem->subtype = SQL_SUBTYPE_MSGPACK; + mem->field_type = FIELD_TYPE_MAP; +} + +void +mem_set_static_map(struct Mem *mem, char *value, uint32_t size) +{ + assert(mp_typeof(*value) == MP_MAP); + mem_set_const_bin(mem, value, size, MEM_Static); + mem->flags |= MEM_Subtype; + mem->subtype = SQL_SUBTYPE_MSGPACK; + mem->field_type = FIELD_TYPE_MAP; +} + +void +mem_set_dynamic_map(struct Mem *mem, char *value, uint32_t size) +{ + assert(mp_typeof(*value) == MP_MAP); + mem_set_dyn_bin(mem, value, size, MEM_Dyn); + mem->flags |= MEM_Subtype; + mem->subtype = SQL_SUBTYPE_MSGPACK; + mem->field_type = FIELD_TYPE_MAP; +} + +void +mem_set_allocated_map(struct Mem *mem, char *value, uint32_t size) +{ + assert(mp_typeof(*value) == MP_MAP); + mem_set_dyn_bin(mem, value, size, 0); + mem->flags |= MEM_Subtype; + mem->subtype = SQL_SUBTYPE_MSGPACK; + mem->field_type = FIELD_TYPE_MAP; +} + +void +mem_set_ephemeral_array(struct Mem *mem, char *value, uint32_t size) +{ + assert(mp_typeof(*value) == MP_ARRAY); + mem_set_const_bin(mem, value, size, MEM_Ephem); + mem->flags |= MEM_Subtype; + mem->subtype = SQL_SUBTYPE_MSGPACK; + mem->field_type = FIELD_TYPE_ARRAY; +} + +void +mem_set_static_array(struct Mem *mem, char *value, uint32_t size) +{ + assert(mp_typeof(*value) == MP_ARRAY); + mem_set_const_bin(mem, value, size, MEM_Static); + mem->flags |= MEM_Subtype; + mem->subtype = SQL_SUBTYPE_MSGPACK; + mem->field_type = FIELD_TYPE_ARRAY; +} + +void +mem_set_dynamic_array(struct Mem *mem, char *value, uint32_t size) +{ + assert(mp_typeof(*value) == MP_ARRAY); + mem_set_dyn_bin(mem, value, size, MEM_Dyn); + mem->flags |= MEM_Subtype; + mem->subtype = SQL_SUBTYPE_MSGPACK; + mem->field_type = FIELD_TYPE_ARRAY; +} + +void +mem_set_allocated_array(struct Mem *mem, char *value, uint32_t size) +{ + assert(mp_typeof(*value) == MP_ARRAY); + mem_set_dyn_bin(mem, value, size, 0); + mem->flags |= MEM_Subtype; + mem->subtype = SQL_SUBTYPE_MSGPACK; + mem->field_type = FIELD_TYPE_ARRAY; +} + int mem_copy(struct Mem *to, const struct Mem *from) { @@ -2134,102 +2214,6 @@ mem_set_ptr(struct Mem *mem, void *ptr) mem->u.p = ptr; } -/* - * Change the value of a Mem to be a string or a BLOB. - * - * The memory management strategy depends on the value of the xDel - * parameter. If the value passed is SQL_TRANSIENT, then the - * string is copied into a (possibly existing) buffer managed by the - * Mem structure. Otherwise, any existing buffer is freed and the - * pointer copied. - * - * If the string is too large (if it exceeds the SQL_LIMIT_LENGTH - * size limit) then no memory allocation occurs. If the string can be - * stored without allocating memory, then it is. If a memory allocation - * is required to store the string, then value of pMem is unchanged. In - * either case, error is returned. - */ -int -sqlVdbeMemSetStr(Mem * pMem, /* Memory cell to set to string value */ - const char *z, /* String pointer */ - int n, /* Bytes in string, or negative */ - u8 not_blob, /* Encoding of z. 0 for BLOBs */ - void (*xDel) (void *) /* Destructor function */ - ) -{ - int nByte = n; /* New value for pMem->n */ - int iLimit; /* Maximum allowed string or blob size */ - u16 flags = 0; /* New value for pMem->flags */ - - /* If z is a NULL pointer, set pMem to contain an SQL NULL. */ - if (!z) { - mem_clear(pMem); - return 0; - } - - if (pMem->db) { - iLimit = pMem->db->aLimit[SQL_LIMIT_LENGTH]; - } else { - iLimit = SQL_MAX_LENGTH; - } - flags = (not_blob == 0 ? MEM_Blob : MEM_Str); - if (nByte < 0) { - assert(not_blob != 0); - nByte = sqlStrlen30(z); - if (nByte > iLimit) - nByte = iLimit + 1; - flags |= MEM_Term; - } - - /* The following block sets the new values of Mem.z and Mem.xDel. It - * also sets a flag in local variable "flags" to indicate the memory - * management (one of MEM_Dyn or MEM_Static). - */ - if (xDel == SQL_TRANSIENT) { - int nAlloc = nByte; - if (flags & MEM_Term) { - nAlloc += 1; //SQL_UTF8 - } - if (nByte > iLimit) { - diag_set(ClientError, ER_SQL_EXECUTE, "string or binary"\ - "string is too big"); - return -1; - } - testcase(nAlloc == 0); - testcase(nAlloc == 31); - testcase(nAlloc == 32); - if (sqlVdbeMemClearAndResize(pMem, MAX(nAlloc, 32))) { - return -1; - } - memcpy(pMem->z, z, nAlloc); - } else if (xDel == SQL_DYNAMIC) { - mem_destroy(pMem); - pMem->zMalloc = pMem->z = (char *)z; - pMem->szMalloc = sqlDbMallocSize(pMem->db, pMem->zMalloc); - } else { - mem_destroy(pMem); - pMem->z = (char *)z; - pMem->xDel = xDel; - flags |= ((xDel == SQL_STATIC) ? MEM_Static : MEM_Dyn); - } - - pMem->n = nByte; - pMem->flags = flags; - assert((pMem->flags & (MEM_Str | MEM_Blob)) != 0); - if ((pMem->flags & MEM_Str) != 0) - pMem->field_type = FIELD_TYPE_STRING; - else - pMem->field_type = FIELD_TYPE_VARBINARY; - - if (nByte > iLimit) { - diag_set(ClientError, ER_SQL_EXECUTE, "string or binary string"\ - "is too big"); - return -1; - } - - return 0; -} - /* * Free an sql_value object */ diff --git a/src/box/sql/mem.h b/src/box/sql/mem.h index 3bd04bbbd..b94495f89 100644 --- a/src/box/sql/mem.h +++ b/src/box/sql/mem.h @@ -238,6 +238,30 @@ mem_copy_binary(struct Mem *mem, const char *value, uint32_t size); int mem_append_to_binary(struct Mem *mem, const char *value, uint32_t size); +void +mem_set_ephemeral_map(struct Mem *mem, char *value, uint32_t size); + +void +mem_set_static_map(struct Mem *mem, char *value, uint32_t size); + +void +mem_set_dynamic_map(struct Mem *mem, char *value, uint32_t size); + +void +mem_set_allocated_map(struct Mem *mem, char *value, uint32_t size); + +void +mem_set_ephemeral_array(struct Mem *mem, char *value, uint32_t size); + +void +mem_set_static_array(struct Mem *mem, char *value, uint32_t size); + +void +mem_set_dynamic_array(struct Mem *mem, char *value, uint32_t size); + +void +mem_set_allocated_array(struct Mem *mem, char *value, uint32_t size); + int mem_copy(struct Mem *to, const struct Mem *from); @@ -473,8 +497,6 @@ int sqlVdbeMemClearAndResize(struct Mem * pMem, int n); void mem_set_ptr(struct Mem *mem, void *ptr); -int -sqlVdbeMemSetStr(struct Mem *, const char *, int, u8, void (*)(void *)); void sqlValueFree(struct Mem *); struct Mem *sqlValueNew(struct sql *); diff --git a/src/box/sql/vdbe.c b/src/box/sql/vdbe.c index 9fc08e30c..c91aeede3 100644 --- a/src/box/sql/vdbe.c +++ b/src/box/sql/vdbe.c @@ -862,9 +862,11 @@ case OP_Blob: { /* out2 */ */ mem_set_static_binary(pOut, pOp->p4.z, pOp->p1); } else { - sqlVdbeMemSetStr(pOut, pOp->p4.z, pOp->p1, 0, 0); - pOut->flags |= MEM_Subtype; - pOut->subtype = pOp->p3; + assert(pOp->p3 == SQL_SUBTYPE_MSGPACK); + if (mp_typeof(*pOp->p4.z) == MP_MAP) + mem_set_static_map(pOut, pOp->p4.z, pOp->p1); + else + mem_set_static_array(pOut, pOp->p4.z, pOp->p1); } UPDATE_MAX_BLOBSIZE(pOut); break; -- 2.25.1
next prev parent reply other threads:[~2021-03-23 9:51 UTC|newest] Thread overview: 90+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-03-23 9:34 [Tarantool-patches] [PATCH v4 00/53] Move mem-related functions to mem.c/mem.h Mergen Imeev via Tarantool-patches 2021-03-23 9:34 ` [Tarantool-patches] [PATCH v4 01/53] sql: enchance vdbe_decode_msgpack_into_mem() Mergen Imeev via Tarantool-patches 2021-03-29 22:57 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:34 ` [Tarantool-patches] [PATCH v4 02/53] sql: disable unused code in sql/analyze.c Mergen Imeev via Tarantool-patches 2021-03-23 9:34 ` [Tarantool-patches] [PATCH v4 03/53] sql: disable unused code in sql/legacy.c Mergen Imeev via Tarantool-patches 2021-03-23 9:34 ` [Tarantool-patches] [PATCH v4 04/53] sql: remove NULL-termination in OP_ResultRow Mergen Imeev via Tarantool-patches 2021-03-23 9:34 ` [Tarantool-patches] [PATCH v4 05/53] sql: move MEM-related functions to mem.c/mem.h Mergen Imeev via Tarantool-patches 2021-03-29 22:58 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 06/53] sql: remove unused MEM-related functions Mergen Imeev via Tarantool-patches 2021-03-29 22:58 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 07/53] sql: disable unused code in sql/vdbemem.c Mergen Imeev via Tarantool-patches 2021-03-29 22:58 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 08/53] sql: introduce mem_str() Mergen Imeev via Tarantool-patches 2021-03-29 22:58 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 09/53] sql: introduce mem_create() Mergen Imeev via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 10/53] sql: introduce mem_destroy() Mergen Imeev via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 11/53] sql: introduce mem_is_*() functions() Mergen Imeev via Tarantool-patches 2021-03-29 23:01 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 12/53] sql: introduce mem_copy() Mergen Imeev via Tarantool-patches 2021-03-29 23:01 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 13/53] sql: introduce mem_copy_as_ephemeral() Mergen Imeev via Tarantool-patches 2021-03-29 23:01 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 14/53] sql: rework mem_move() Mergen Imeev via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 15/53] sql: rework vdbe_decode_msgpack_into_mem() Mergen Imeev via Tarantool-patches 2021-03-29 23:02 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 16/53] sql: remove sql_column_to_messagepack() Mergen Imeev via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 17/53] sql: introduce mem_concat() Mergen Imeev via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 18/53] sql: introduce mem_arithmetic() Mergen Imeev via Tarantool-patches 2021-03-29 23:02 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 19/53] sql: introduce mem_compare() Mergen Imeev via Tarantool-patches 2021-03-29 23:03 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 20/53] sql: introduce mem_bitwise() Mergen Imeev via Tarantool-patches 2021-03-29 23:03 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 21/53] sql: introduce mem_bit_not() Mergen Imeev via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 22/53] sql: Initialize MEM in sqlVdbeAllocUnpackedRecord() Mergen Imeev via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 23/53] sql: introduce mem_set_null() Mergen Imeev via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 24/53] sql: introduce mem_set_integer() Mergen Imeev via Tarantool-patches 2021-03-29 23:04 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 25/53] sql: introduce mem_set_unsigned() Mergen Imeev via Tarantool-patches 2021-03-29 23:04 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 26/53] sql: introduce mem_set_boolean() Mergen Imeev via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 27/53] sql: refactor mem_set_double() Mergen Imeev via Tarantool-patches 2021-03-29 23:04 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 28/53] sql: refactor mem_set_*_string() Mergen Imeev via Tarantool-patches 2021-03-29 23:05 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:35 ` [Tarantool-patches] [PATCH v4 29/53] sql: introduce mem_copy_string() Mergen Imeev via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 30/53] sql: introduce mem_set_*_binary() Mergen Imeev via Tarantool-patches 2021-03-29 23:05 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 31/53] sql: introduce mem_copy_binary() Mergen Imeev via Tarantool-patches 2021-03-29 23:05 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 32/53] sql: introduce mem_set_zerobinary() Mergen Imeev via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 33/53] sql: introduce mem_append_to_binary() Mergen Imeev via Tarantool-patches 2021-03-29 23:05 ` Vladislav Shpilevoy via Tarantool-patches 2021-04-09 19:52 ` Mergen Imeev via Tarantool-patches 2021-03-23 9:36 ` Mergen Imeev via Tarantool-patches [this message] 2021-03-29 23:05 ` [Tarantool-patches] [PATCH v4 34/53] sql: introduce mem_set_*_map() and mem_set_*_array() Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 35/53] sql: introduce mem_set_undefined() Mergen Imeev via Tarantool-patches 2021-03-29 23:06 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 36/53] sql: introduce mem_set_pointer() Mergen Imeev via Tarantool-patches 2021-03-29 23:06 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 37/53] sql: introduce mem_set_frame() Mergen Imeev via Tarantool-patches 2021-03-29 23:06 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 38/53] sql: introduce mem_*_aggregate() Mergen Imeev via Tarantool-patches 2021-03-29 23:06 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 39/53] sql: introduce mem_set_cleared() Mergen Imeev via Tarantool-patches 2021-03-29 23:07 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 40/53] sql: move MEM flags to mem.c Mergen Imeev via Tarantool-patches 2021-03-29 23:07 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 41/53] sql: introduce mem_convert_to_integer() Mergen Imeev via Tarantool-patches 2021-03-29 23:07 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 42/53] sql: introduce mem_convert_to_double() Mergen Imeev via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 43/53] sql: introduce mem_convert_to_number() Mergen Imeev via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 44/53] sql: introduce mem_convert_to_string() Mergen Imeev via Tarantool-patches 2021-03-29 23:07 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 45/53] sql: introduce mem_explicit_cast() Mergen Imeev via Tarantool-patches 2021-03-29 23:08 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 46/53] sql: introduce mem_implicit_cast() Mergen Imeev via Tarantool-patches 2021-03-29 23:08 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 47/53] sql: introduce mem_get_integer() Mergen Imeev via Tarantool-patches 2021-03-29 23:08 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 48/53] sql: introduce mem_get_unsigned() Mergen Imeev via Tarantool-patches 2021-03-29 23:08 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 49/53] sql: introduce mem_get_double() Mergen Imeev via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 50/53] sql: introduce mem_get_boolean() Mergen Imeev via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 51/53] sql: introduce mem_get_string0() Mergen Imeev via Tarantool-patches 2021-03-29 23:08 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 52/53] sql: introduce mem_get_binary() Mergen Imeev via Tarantool-patches 2021-03-29 23:09 ` Vladislav Shpilevoy via Tarantool-patches 2021-03-23 9:36 ` [Tarantool-patches] [PATCH v4 53/53] sql: introduce mem_get_length() Mergen Imeev via Tarantool-patches 2021-03-29 23:09 ` Vladislav Shpilevoy 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=f8170942cd47caff036d57b684fdcf2ad723068a.1616491731.git.imeevma@gmail.com \ --to=tarantool-patches@dev.tarantool.org \ --cc=imeevma@tarantool.org \ --cc=tsafin@tarantool.org \ --cc=v.shpilevoy@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v4 34/53] sql: introduce mem_set_*_map() and mem_set_*_array()' \ /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