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 v5 17/52] sql: remove sql_column_to_messagepack() Date: Fri, 9 Apr 2021 20:57:20 +0300 [thread overview] Message-ID: <8e694c5dbed5b36828d97729d4d6c4dac0d6a440.1617984948.git.imeevma@gmail.com> (raw) In-Reply-To: <cover.1617984948.git.imeevma@gmail.com> Function sql_column_to_messagepack() has almost the same functionality as sql_vdbe_mem_encode_tuple(). Due to this it is not necessary to have sql_column_to_messagepack(), so it is removed in this commit. Part of #5818 --- src/box/execute.c | 130 ++---------------------------------------- src/box/sql/mem.c | 6 -- src/box/sql/mem.h | 3 - src/box/sql/sqlInt.h | 15 +---- src/box/sql/vdbeapi.c | 15 ++--- 5 files changed, 13 insertions(+), 156 deletions(-) diff --git a/src/box/execute.c b/src/box/execute.c index e14da20be..f9c161ce4 100644 --- a/src/box/execute.c +++ b/src/box/execute.c @@ -131,113 +131,10 @@ port_sql_create(struct port *port, struct sql_stmt *stmt, port_sql->do_finalize = do_finalize; } -/** - * Serialize a single column of a result set row. - * @param stmt Prepared and started statement. At least one - * sql_step must be called. - * @param i Column number. - * @param region Allocator for column value. - * - * @retval 0 Success. - * @retval -1 Out of memory when resizing the output buffer. - */ -static inline int -sql_column_to_messagepack(struct sql_stmt *stmt, int i, - struct region *region) -{ - size_t size; - enum mp_type type = sql_column_type(stmt, i); - switch (type) { - case MP_INT: { - int64_t n = sql_column_int64(stmt, i); - size = mp_sizeof_int(n); - char *pos = (char *) region_alloc(region, size); - if (pos == NULL) - goto oom; - mp_encode_int(pos, n); - break; - } - case MP_UINT: { - uint64_t n = sql_column_uint64(stmt, i); - size = mp_sizeof_uint(n); - char *pos = (char *) region_alloc(region, size); - if (pos == NULL) - goto oom; - mp_encode_uint(pos, n); - break; - } - case MP_DOUBLE: { - double d = sql_column_double(stmt, i); - size = mp_sizeof_double(d); - char *pos = (char *) region_alloc(region, size); - if (pos == NULL) - goto oom; - mp_encode_double(pos, d); - break; - } - case MP_STR: { - uint32_t len = sql_column_bytes(stmt, i); - size = mp_sizeof_str(len); - char *pos = (char *) region_alloc(region, size); - if (pos == NULL) - goto oom; - const char *s; - s = (const char *)sql_column_text(stmt, i); - mp_encode_str(pos, s, len); - break; - } - case MP_BIN: - case MP_MAP: - case MP_ARRAY: { - uint32_t len = sql_column_bytes(stmt, i); - const char *s = - (const char *)sql_column_blob(stmt, i); - if (sql_column_subtype(stmt, i) == SQL_SUBTYPE_MSGPACK) { - size = len; - char *pos = (char *)region_alloc(region, size); - if (pos == NULL) - goto oom; - memcpy(pos, s, len); - } else { - size = mp_sizeof_bin(len); - char *pos = (char *)region_alloc(region, size); - if (pos == NULL) - goto oom; - mp_encode_bin(pos, s, len); - } - break; - } - case MP_BOOL: { - bool b = sql_column_boolean(stmt, i); - size = mp_sizeof_bool(b); - char *pos = (char *) region_alloc(region, size); - if (pos == NULL) - goto oom; - mp_encode_bool(pos, b); - break; - } - case MP_NIL: { - size = mp_sizeof_nil(); - char *pos = (char *) region_alloc(region, size); - if (pos == NULL) - goto oom; - mp_encode_nil(pos); - break; - } - default: - unreachable(); - } - return 0; -oom: - diag_set(OutOfMemory, size, "region_alloc", "SQL value"); - return -1; -} - /** * Convert sql row into a tuple and append to a port. * @param stmt Started prepared statement. At least one * sql_step must be done. - * @param column_count Statement's column count. * @param region Runtime allocator for temporary objects. * @param port Port to store tuples. * @@ -245,29 +142,11 @@ oom: * @retval -1 Memory error. */ static inline int -sql_row_to_port(struct sql_stmt *stmt, int column_count, - struct region *region, struct port *port) +sql_row_to_port(struct sql_stmt *stmt, struct region *region, struct port *port) { - assert(column_count > 0); - size_t size = mp_sizeof_array(column_count); + uint32_t size; size_t svp = region_used(region); - char *pos = (char *) region_alloc(region, size); - if (pos == NULL) { - diag_set(OutOfMemory, size, "region_alloc", "SQL row"); - return -1; - } - mp_encode_array(pos, column_count); - - for (int i = 0; i < column_count; ++i) { - if (sql_column_to_messagepack(stmt, i, region) != 0) - goto error; - } - size = region_used(region) - svp; - pos = (char *) region_join(region, size); - if (pos == NULL) { - diag_set(OutOfMemory, size, "region_join", "pos"); - goto error; - } + char *pos = sql_result_to_msgpack(stmt, &size, region); struct tuple *tuple = tuple_new(box_tuple_format_default(), pos, pos + size); if (tuple == NULL) @@ -677,8 +556,7 @@ sql_execute(struct sql_stmt *stmt, struct port *port, struct region *region) if (column_count > 0) { /* Either ROW or DONE or ERROR. */ while ((rc = sql_step(stmt)) == SQL_ROW) { - if (sql_row_to_port(stmt, column_count, region, - port) != 0) + if (sql_row_to_port(stmt, region, port) != 0) return -1; } assert(rc == SQL_DONE || rc != 0); diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c index 7d06e256c..b417c1007 100644 --- a/src/box/sql/mem.c +++ b/src/box/sql/mem.c @@ -1752,12 +1752,6 @@ sqlValueText(sql_value * pVal) return valueToText(pVal); } -enum sql_subtype -sql_value_subtype(sql_value * pVal) -{ - return (pVal->flags & MEM_Subtype) != 0 ? pVal->subtype : SQL_SUBTYPE_NO; -} - /* * Return a pointer to static memory containing an SQL NULL value. */ diff --git a/src/box/sql/mem.h b/src/box/sql/mem.h index 55f8f0c9f..0faf223ef 100644 --- a/src/box/sql/mem.h +++ b/src/box/sql/mem.h @@ -449,9 +449,6 @@ const void *sqlValueText(struct Mem *); #define VdbeFrameMem(p) ((Mem *)&((u8 *)p)[ROUND8(sizeof(VdbeFrame))]) -enum sql_subtype -sql_value_subtype(sql_value * pVal); - const Mem * columnNullValue(void); diff --git a/src/box/sql/sqlInt.h b/src/box/sql/sqlInt.h index e075224c6..259ba3833 100644 --- a/src/box/sql/sqlInt.h +++ b/src/box/sql/sqlInt.h @@ -351,16 +351,6 @@ sql_stricmp(const char *, const char *); int sql_strnicmp(const char *, const char *, int); - -/** - * Get row column subtype. - * @param stmt row data to process. - * @param i column index. - * @retval SQL subtype if any, 0 else. - */ -enum sql_subtype -sql_column_subtype(struct sql_stmt *stmt, int i); - sql * sql_context_db_handle(sql_context *); @@ -471,8 +461,9 @@ const unsigned char * sql_column_text(sql_stmt *, int iCol); -enum mp_type -sql_column_type(sql_stmt *stmt, int field_no); +char * +sql_result_to_msgpack(struct sql_stmt *stmt, uint32_t *tuple_size, + struct region *region); /* * Terminate the current execution of an SQL statement and reset diff --git a/src/box/sql/vdbeapi.c b/src/box/sql/vdbeapi.c index 8e69e3c38..3e9f1ff6f 100644 --- a/src/box/sql/vdbeapi.c +++ b/src/box/sql/vdbeapi.c @@ -515,16 +515,13 @@ sql_column_text(sql_stmt * pStmt, int i) return sql_value_text(columnMem(pStmt, i)); } -enum mp_type -sql_column_type(sql_stmt * pStmt, int i) -{ - return sql_value_type(columnMem(pStmt, i)); -} - -enum sql_subtype -sql_column_subtype(struct sql_stmt *stmt, int i) +char * +sql_result_to_msgpack(struct sql_stmt *stmt, uint32_t *tuple_size, + struct region *region) { - return sql_value_subtype(columnMem(stmt, i)); + struct Vdbe *vdbe = (struct Vdbe *)stmt; + return sql_vdbe_mem_encode_tuple(vdbe->pResultSet, vdbe->nResColumn, + tuple_size, region); } /* -- 2.25.1
next prev parent reply other threads:[~2021-04-09 17:57 UTC|newest] Thread overview: 107+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-04-09 16:51 [Tarantool-patches] [PATCH v5 00/52] Move mem-related functions to mem.c/mem.h Mergen Imeev via Tarantool-patches 2021-04-09 16:51 ` [Tarantool-patches] [PATCH v5 01/52] sql: enhance vdbe_decode_msgpack_into_mem() Mergen Imeev via Tarantool-patches 2021-04-11 17:42 ` Vladislav Shpilevoy via Tarantool-patches 2021-04-13 12:01 ` Mergen Imeev via Tarantool-patches 2021-04-13 12:12 ` Mergen Imeev via Tarantool-patches 2021-04-13 23:22 ` Vladislav Shpilevoy via Tarantool-patches 2021-04-13 23:34 ` Mergen Imeev via Tarantool-patches 2021-04-09 16:51 ` [Tarantool-patches] [PATCH v5 02/52] sql: disable unused code in sql/analyze.c Mergen Imeev via Tarantool-patches 2021-04-09 16:51 ` [Tarantool-patches] [PATCH v5 03/52] sql: disable unused code in sql/legacy.c Mergen Imeev via Tarantool-patches 2021-04-09 16:51 ` [Tarantool-patches] [PATCH v5 04/52] sql: remove NULL-termination in OP_ResultRow Mergen Imeev via Tarantool-patches 2021-04-14 22:23 ` Vladislav Shpilevoy via Tarantool-patches 2021-04-14 22:37 ` Mergen Imeev via Tarantool-patches 2021-04-09 16:51 ` [Tarantool-patches] [PATCH v5 05/52] sql: move MEM-related functions to mem.c/mem.h Mergen Imeev via Tarantool-patches 2021-04-09 16:59 ` [Tarantool-patches] [PATCH v5 06/52] sql: refactor port_vdbemem_*() functions Mergen Imeev via Tarantool-patches 2021-04-09 16:59 ` [Tarantool-patches] [PATCH v5 07/52] sql: remove unused MEM-related functions Mergen Imeev via Tarantool-patches 2021-04-09 16:59 ` [Tarantool-patches] [PATCH v5 08/52] sql: disable unused code in sql/vdbemem.c Mergen Imeev via Tarantool-patches 2021-04-09 16:59 ` [Tarantool-patches] [PATCH v5 09/52] sql: introduce mem_str() Mergen Imeev via Tarantool-patches 2021-04-11 17:44 ` Vladislav Shpilevoy via Tarantool-patches 2021-04-13 12:36 ` Mergen Imeev via Tarantool-patches 2021-04-14 22:23 ` Vladislav Shpilevoy via Tarantool-patches 2021-04-14 22:42 ` Mergen Imeev via Tarantool-patches 2021-04-09 16:59 ` [Tarantool-patches] [PATCH v5 10/52] sql: introduce mem_create() Mergen Imeev via Tarantool-patches 2021-04-09 17:36 ` [Tarantool-patches] [PATCH v5 11/52] sql: introduce mem_destroy() Mergen Imeev via Tarantool-patches 2021-04-11 17:46 ` Vladislav Shpilevoy via Tarantool-patches 2021-04-13 12:42 ` Mergen Imeev via Tarantool-patches 2021-04-09 17:36 ` [Tarantool-patches] [PATCH v5 12/52] sql: introduce mem_is_*() functions() Mergen Imeev via Tarantool-patches 2021-04-11 17:59 ` Vladislav Shpilevoy via Tarantool-patches 2021-04-13 16:09 ` Mergen Imeev via Tarantool-patches 2021-04-14 22:48 ` Vladislav Shpilevoy via Tarantool-patches 2021-04-14 23:07 ` Mergen Imeev via Tarantool-patches 2021-04-09 17:36 ` [Tarantool-patches] [PATCH v5 13/52] sql: introduce mem_copy() Mergen Imeev via Tarantool-patches 2021-04-11 18:06 ` Vladislav Shpilevoy via Tarantool-patches 2021-04-13 16:18 ` Mergen Imeev via Tarantool-patches 2021-04-09 17:36 ` [Tarantool-patches] [PATCH v5 14/52] sql: introduce mem_copy_as_ephemeral() Mergen Imeev via Tarantool-patches 2021-04-11 18:10 ` Vladislav Shpilevoy via Tarantool-patches 2021-04-13 16:31 ` Mergen Imeev via Tarantool-patches 2021-04-09 17:37 ` [Tarantool-patches] [PATCH v5 15/52] sql: rework mem_move() Mergen Imeev via Tarantool-patches 2021-04-11 18:10 ` Vladislav Shpilevoy via Tarantool-patches 2021-04-13 16:38 ` Mergen Imeev via Tarantool-patches 2021-04-09 17:57 ` [Tarantool-patches] [PATCH v5 16/52] sql: rework vdbe_decode_msgpack_into_mem() Mergen Imeev via Tarantool-patches 2021-04-09 17:57 ` Mergen Imeev via Tarantool-patches [this message] 2021-04-14 22:58 ` [Tarantool-patches] [PATCH v5 17/52] sql: remove sql_column_to_messagepack() Vladislav Shpilevoy via Tarantool-patches 2021-04-14 23:14 ` Mergen Imeev via Tarantool-patches 2021-04-09 17:57 ` [Tarantool-patches] [PATCH v5 18/52] sql: introduce mem_concat() Mergen Imeev via Tarantool-patches 2021-04-11 18:11 ` Vladislav Shpilevoy via Tarantool-patches 2021-04-13 16:57 ` Mergen Imeev via Tarantool-patches 2021-04-14 23:04 ` Vladislav Shpilevoy via Tarantool-patches 2021-04-14 23:22 ` Mergen Imeev via Tarantool-patches 2021-04-09 17:57 ` [Tarantool-patches] [PATCH v5 19/52] sql: introduce arithmetic operations for MEM Mergen Imeev via Tarantool-patches 2021-04-11 18:13 ` Vladislav Shpilevoy via Tarantool-patches 2021-04-13 17:06 ` Mergen Imeev via Tarantool-patches 2021-04-14 23:10 ` Vladislav Shpilevoy via Tarantool-patches 2021-04-14 23:33 ` Mergen Imeev via Tarantool-patches 2021-04-09 17:57 ` [Tarantool-patches] [PATCH v5 20/52] sql: introduce mem_compare() Mergen Imeev via Tarantool-patches 2021-04-11 18:16 ` Vladislav Shpilevoy via Tarantool-patches 2021-04-13 18:33 ` Mergen Imeev via Tarantool-patches 2021-04-14 23:20 ` Vladislav Shpilevoy via Tarantool-patches 2021-04-14 23:40 ` Mergen Imeev via Tarantool-patches 2021-04-09 18:11 ` [Tarantool-patches] [PATCH v5 21/52] sql: introduce bitwise operations for MEM Mergen Imeev via Tarantool-patches 2021-04-12 23:31 ` Vladislav Shpilevoy via Tarantool-patches 2021-04-13 20:49 ` Mergen Imeev via Tarantool-patches 2021-04-09 18:11 ` [Tarantool-patches] [PATCH v5 22/52] sql: Initialize MEM in sqlVdbeAllocUnpackedRecord() Mergen Imeev via Tarantool-patches 2021-04-09 18:11 ` [Tarantool-patches] [PATCH v5 23/52] sql: introduce mem_set_null() Mergen Imeev via Tarantool-patches 2021-04-09 18:11 ` [Tarantool-patches] [PATCH v5 24/52] sql: introduce mem_set_int() Mergen Imeev via Tarantool-patches 2021-04-12 23:32 ` Vladislav Shpilevoy via Tarantool-patches 2021-04-13 20:56 ` Mergen Imeev via Tarantool-patches 2021-04-09 18:11 ` [Tarantool-patches] [PATCH v5 25/52] sql: introduce mem_set_uint() Mergen Imeev via Tarantool-patches 2021-04-09 19:45 ` [Tarantool-patches] [PATCH v5 26/52] sql: move mem_set_bool() and mem_set_double() Mergen Imeev via Tarantool-patches 2021-04-09 19:45 ` [Tarantool-patches] [PATCH v5 27/52] sql: introduce mem_set_str_*() functions Mergen Imeev via Tarantool-patches 2021-04-12 23:34 ` Vladislav Shpilevoy via Tarantool-patches 2021-04-13 21:36 ` Mergen Imeev via Tarantool-patches 2021-04-14 23:49 ` Vladislav Shpilevoy via Tarantool-patches 2021-04-15 1:25 ` Mergen Imeev via Tarantool-patches 2021-04-09 19:45 ` [Tarantool-patches] [PATCH v5 28/52] sql: introduce mem_copy_str() and mem_copy_str0() Mergen Imeev via Tarantool-patches 2021-04-12 23:35 ` Vladislav Shpilevoy via Tarantool-patches 2021-04-13 22:00 ` Mergen Imeev via Tarantool-patches 2021-04-14 23:54 ` Vladislav Shpilevoy via Tarantool-patches 2021-04-15 0:30 ` Mergen Imeev via Tarantool-patches 2021-04-09 19:45 ` [Tarantool-patches] [PATCH v5 29/52] sql: introduce mem_set_bin_*() functions Mergen Imeev via Tarantool-patches 2021-04-09 19:45 ` [Tarantool-patches] [PATCH v5 30/52] sql: introduce mem_copy_bin() Mergen Imeev via Tarantool-patches 2021-04-12 23:36 ` Vladislav Shpilevoy via Tarantool-patches 2021-04-13 22:06 ` Mergen Imeev via Tarantool-patches 2021-04-09 20:05 ` [Tarantool-patches] [PATCH v5 31/52] sql: introduce mem_set_zerobin() Mergen Imeev via Tarantool-patches 2021-04-09 20:05 ` [Tarantool-patches] [PATCH v5 32/52] sql: introduce mem_set_*() for map and array Mergen Imeev via Tarantool-patches 2021-04-12 23:36 ` Vladislav Shpilevoy via Tarantool-patches 2021-04-13 22:08 ` Mergen Imeev via Tarantool-patches 2021-04-09 20:05 ` [Tarantool-patches] [PATCH v5 33/52] sql: introduce mem_set_invalid() Mergen Imeev via Tarantool-patches 2021-04-09 20:05 ` [Tarantool-patches] [PATCH v5 34/52] sql: refactor mem_set_ptr() Mergen Imeev via Tarantool-patches 2021-04-09 20:05 ` [Tarantool-patches] [PATCH v5 35/52] sql: introduce mem_set_frame() Mergen Imeev via Tarantool-patches 2021-04-12 23:37 ` Vladislav Shpilevoy via Tarantool-patches 2021-04-13 22:19 ` Mergen Imeev via Tarantool-patches 2021-04-09 20:25 ` [Tarantool-patches] [PATCH v5 36/52] sql: introduce mem_set_agg() Mergen Imeev via Tarantool-patches 2021-04-12 23:37 ` Vladislav Shpilevoy via Tarantool-patches 2021-04-13 22:46 ` Mergen Imeev via Tarantool-patches 2021-04-09 20:25 ` [Tarantool-patches] [PATCH v5 37/52] sql: introduce mem_set_null_clear() Mergen Imeev via Tarantool-patches 2021-04-12 23:38 ` Vladislav Shpilevoy via Tarantool-patches 2021-04-13 22:50 ` Mergen Imeev via Tarantool-patches 2021-04-09 20:25 ` [Tarantool-patches] [PATCH v5 38/52] sql: move MEM flags to mem.c Mergen Imeev via Tarantool-patches 2021-04-13 20:42 ` Mergen Imeev via Tarantool-patches 2021-04-09 20:25 ` [Tarantool-patches] [PATCH v5 39/52] sql: introduce mem_to_int*() functions Mergen Imeev via Tarantool-patches 2021-04-12 23:39 ` Vladislav Shpilevoy via Tarantool-patches 2021-04-13 22:58 ` Mergen Imeev via Tarantool-patches 2021-04-13 23:10 ` Mergen Imeev via Tarantool-patches 2021-04-09 20:26 ` [Tarantool-patches] [PATCH v5 40/52] sql: introduce mem_to_double() Mergen Imeev via Tarantool-patches 2021-04-13 23:21 ` Mergen Imeev via Tarantool-patches 2021-04-15 0:39 ` [Tarantool-patches] [PATCH v5 00/52] Move mem-related functions to mem.c/mem.h Vladislav Shpilevoy via Tarantool-patches 2021-04-15 6:49 ` Kirill Yukhin 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=8e694c5dbed5b36828d97729d4d6c4dac0d6a440.1617984948.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 v5 17/52] sql: remove sql_column_to_messagepack()' \ /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