[Tarantool-patches] [PATCH v4 16/53] sql: remove sql_column_to_messagepack()

[Mergen Imeev via Tarantool-patches <tarantool-patches@dev.tarantool.org>]

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 a2316cc90..775474f69 100644
--- a/src/box/sql/mem.c
+++ b/src/box/sql/mem.c
@@ -1791,12 +1791,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 5edb0d80a..aead71df2 100644
--- a/src/box/sql/mem.h
+++ b/src/box/sql/mem.h
@@ -467,9 +467,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 b4293d961..01c0cc5a1 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 2625a9115..04016ea54 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