From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id 635026EC5D; Fri, 9 Apr 2021 20:58:17 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 635026EC5D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1617991097; bh=ezgoFZbU4gfCmRjqXCeCDvqLgWJ5ie49xtGgGELZYVU=; h=To:Cc:Date:In-Reply-To:References:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=my/5UDNYPiH3vPbyzxIuG1spCHUCkgtj2RAmlhrgwgdqpKJIcXWucImU1Nuqe/D1y aIW5+Agq2Swt78XoKmu64iUSgENXp9Ezom7u9ankXbgpZrZ58vxM7phAi18mtjO2zj zlT1rg7ficNjmTpj9HY0coAYvRGFDuaU0L/OrYS4= Received: from smtpng2.m.smailru.net (smtpng2.m.smailru.net [94.100.179.3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 3CA566EC5D for ; Fri, 9 Apr 2021 20:57:23 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 3CA566EC5D Received: by smtpng2.m.smailru.net with esmtpa (envelope-from ) id 1lUvNi-000785-Ik; Fri, 09 Apr 2021 20:57:22 +0300 To: v.shpilevoy@tarantool.org, tsafin@tarantool.org Cc: tarantool-patches@dev.tarantool.org Date: Fri, 9 Apr 2021 20:57:22 +0300 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD92FFCB8E6708E7480257C85EA0BB7A95D5E28B957962BB550182A05F538085040A5E90D2485DDE57CC54B9EF7BE44768E59398C6D01297FE11FBEE21421C980E3 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7C845A4BF0BB3D210EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F790063766C9C3EB94AE7C6E8638F802B75D45FF914D58D5BE9E6BC1A93B80C6DEB9DEE97C6FB206A91F05B2EC36A59A299C7FFFBEBF5864D006F489C247B71DA8F7637ED2E47CDBA5A96583C09775C1D3CA48CF7EF884183F8E4D67117882F4460429724CE54428C33FAD30A8DF7F3B2552694AC26CFBAC0749D213D2E47CDBA5A9658378DA827A17800CE7A46ADF0C403417779FA2833FD35BB23DF004C906525384302BEBFE083D3B9BA73A03B725D353964B0B7D0EA88DDEDAC722CA9DD8327EE4930A3850AC1BE2E735E4A630A5B664A4FFC4224003CC83647689D4C264860C145E X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975CD0035DD76F8A8A4FE1DBEC84F906D85A717158994302A3FB9C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EF0417BEADF48D1460699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34D1AE09A115117C96E9E375A11FD4E8A8BEDFB213EF512D77712C1DD403C03B0B0DC6A396EA4040EA1D7E09C32AA3244C8E6A4ED0E78CE031164D78FDD0CB304E259227199D06760AFACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojyO2lHpuZu4QjPLrzuzcHEg== X-Mailru-Sender: 689FA8AB762F73936BC43F508A0638228C663D6BB88B64BF4108DD9E4B01B44283D72C36FC87018B9F80AB2734326CD2FB559BB5D741EB96352A0ABBE4FDA4210A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: [Tarantool-patches] [PATCH v5 18/52] sql: introduce mem_concat() X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Mergen Imeev via Tarantool-patches Reply-To: imeevma@tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" This patch introduces mem_concat(). Function mem_concat() concatenates values from two MEMs in case these values are strings or binaries and writes the result to the third MEM. Part of #5818 --- src/box/sql/mem.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++ src/box/sql/mem.h | 8 ++++++ src/box/sql/vdbe.c | 50 ++---------------------------------- 3 files changed, 74 insertions(+), 48 deletions(-) diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c index b417c1007..2d76ef88d 100644 --- a/src/box/sql/mem.c +++ b/src/box/sql/mem.c @@ -326,6 +326,70 @@ mem_move(struct Mem *to, struct Mem *from) return 0; } +static bool +is_result_null(const struct Mem *a, const struct Mem *b, struct Mem *result, + enum field_type type) +{ + mem_clear(result); + result->field_type = type; + return (((a->flags | b->flags) & MEM_Null) != 0); +} + +int +mem_concat(struct Mem *a, struct Mem *b, struct Mem *result) +{ + assert(result != b); + if (a != result) { + if (is_result_null(a, b, result, FIELD_TYPE_STRING)) + return 0; + } else { + if (((a->flags | b->flags) & MEM_Null) != 0) { + mem_clear(a); + result->field_type = FIELD_TYPE_STRING; + return 0; + } + } + + /* Concatenation operation can be applied only to strings and blobs. */ + if ((b->flags & (MEM_Str | MEM_Blob)) == 0) { + diag_set(ClientError, ER_INCONSISTENT_TYPES, + "text or varbinary", mem_type_to_str(b)); + return -1; + } + if ((a->flags & (MEM_Str | MEM_Blob)) == 0) { + diag_set(ClientError, ER_INCONSISTENT_TYPES, + "text or varbinary", mem_type_to_str(a)); + return -1; + } + + /* Moreover, both operands must be of the same type. */ + if ((b->flags & MEM_Str) != (a->flags & MEM_Str)) { + diag_set(ClientError, ER_INCONSISTENT_TYPES, + mem_type_to_str(a), mem_type_to_str(b)); + return -1; + } + + if (ExpandBlob(a) != 0 || ExpandBlob(b) != 0) + return -1; + + uint32_t size = a->n + b->n; + if ((int)size > sql_get()->aLimit[SQL_LIMIT_LENGTH]) { + diag_set(ClientError, ER_SQL_EXECUTE, "string or blob too big"); + return -1; + } + if (sqlVdbeMemGrow(result, size, result == a) != 0) + return -1; + + result->flags = a->flags & (MEM_Str | MEM_Blob); + if ((result->flags & MEM_Blob) != 0) + result->field_type = FIELD_TYPE_VARBINARY; + if (result != a) + memcpy(result->z, a->z, a->n); + memcpy(&result->z[a->n], b->z, b->n); + result->n = size; + return 0; +} + static inline bool mem_has_msgpack_subtype(struct Mem *mem) { diff --git a/src/box/sql/mem.h b/src/box/sql/mem.h index 0faf223ef..df273026b 100644 --- a/src/box/sql/mem.h +++ b/src/box/sql/mem.h @@ -184,6 +184,14 @@ mem_copy_as_ephemeral(struct Mem *to, const struct Mem *from); int mem_move(struct Mem *to, struct Mem *from); +/** + * Concatenate strings or binaries from the first and the second MEMs and write + * to the result MEM. In case the first MEM or the second MEM is NULL, the + * result MEM is set to NULL even if the result MEM is actually the first MEM. + */ +int +mem_concat(struct Mem *left, struct Mem *right, struct Mem *result); + /* One or more of the following flags are set to indicate the validOK * representations of the value stored in the Mem struct. * diff --git a/src/box/sql/vdbe.c b/src/box/sql/vdbe.c index 378c7a043..6f3475147 100644 --- a/src/box/sql/vdbe.c +++ b/src/box/sql/vdbe.c @@ -1060,57 +1060,11 @@ case OP_ResultRow: { * types (i.e. TEXT and BLOB). */ case OP_Concat: { /* same as TK_CONCAT, in1, in2, out3 */ - i64 nByte; - pIn1 = &aMem[pOp->p1]; pIn2 = &aMem[pOp->p2]; - pOut = vdbe_prepare_null_out(p, pOp->p3); - assert(pIn1!=pOut); - if (mem_is_any_null(pIn1, pIn2)) { - /* Force NULL be of type STRING. */ - pOut->field_type = FIELD_TYPE_STRING; - break; - } - /* - * Concatenation operation can be applied only to - * strings and blobs. - */ - if (!mem_is_bytes(pIn1) || !mem_is_bytes(pIn2)) { - char *inconsistent_type = !mem_is_bytes(pIn1) ? - mem_type_to_str(pIn1) : - mem_type_to_str(pIn2); - diag_set(ClientError, ER_INCONSISTENT_TYPES, - "text or varbinary", inconsistent_type); - goto abort_due_to_error; - } - - /* Moreover, both operands must be of the same type. */ - if (!mem_is_same_type(pIn1, pIn2)) { - diag_set(ClientError, ER_INCONSISTENT_TYPES, - mem_type_to_str(pIn2), mem_type_to_str(pIn1)); - goto abort_due_to_error; - } - if (ExpandBlob(pIn1) != 0 || ExpandBlob(pIn2) != 0) + pOut = &aMem[pOp->p3]; + if (mem_concat(pIn2, pIn1, pOut) != 0) goto abort_due_to_error; - nByte = pIn1->n + pIn2->n; - if (nByte>db->aLimit[SQL_LIMIT_LENGTH]) { - goto too_big; - } - if (sqlVdbeMemGrow(pOut, (int)nByte+2, pOut==pIn2)) { - goto no_mem; - } - if (mem_is_str(pIn1)) - MemSetTypeFlag(pOut, MEM_Str); - else - MemSetTypeFlag(pOut, MEM_Blob); - if (pOut!=pIn2) { - memcpy(pOut->z, pIn2->z, pIn2->n); - } - memcpy(&pOut->z[pIn2->n], pIn1->z, pIn1->n); - pOut->z[nByte]=0; - pOut->z[nByte+1] = 0; - pOut->flags |= MEM_Term; - pOut->n = (int)nByte; UPDATE_MAX_BLOBSIZE(pOut); break; } -- 2.25.1