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 A03AB6E465; Fri, 8 Oct 2021 20:35:45 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org A03AB6E465 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1633714545; bh=G24Uk0xHpXjvhBU2HiwpFCH07K3AhTtZDqPHUVcGnzc=; 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=yyFX/SzsZjl5mDbSsUbbPwgoPsSX5iFQiePhlq1ACx7xsFB8aXYPpvB7f/phbqyrL Hg9hZOzpsM4wdljka2RwxCh0dZgr42b6pMPcbsuZFHM/2e9a3Pj5CV1o78c0csQWvf LL93r4u3sFFqrkansvc3FvBhdlAfEAPaZyj74d8s= Received: from smtpng1.i.mail.ru (smtpng1.i.mail.ru [94.100.181.251]) (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 550606E466 for ; Fri, 8 Oct 2021 20:31:47 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 550606E466 Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1mYtik-00082o-Ov; Fri, 08 Oct 2021 20:31:47 +0300 To: v.shpilevoy@tarantool.org Cc: tarantool-patches@dev.tarantool.org Date: Fri, 8 Oct 2021 20:31:46 +0300 Message-Id: <26c9ec972d4ce5662fa99194d78789bb0e445281.1633713432.git.imeevma@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-4EC0790: 10 X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD9A6D4E3B1981C4C7D436932E0370A3249AEA3E77A50CFBF89182A05F538085040D14C031A83C681CA313A670096D67DE15651DF18E2F79ECFC44E940105457696 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE75DF2B1F23425CAE5EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637B323FE155BC226618638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D84BB0B2E485A7F4DE18BDF6EF7A41D9E3117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC2EE5AD8F952D28FBA471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD1828451B159A507268D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B62CFFCC7B69C47339089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975C650BD2383FF25EF5CE89600BA0B0842530B386758C1CC27E9C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EF520746E264B47742699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D3453741B480A6503C32DB1AEABFFF286EE1F19D83D87DEB204C4006FB80043AE2A5B5C36B97DFAA1141D7E09C32AA3244C8428549A6CF6759BD46B62C4A60FE2F960759606DA2E136A729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojMZ06aokA6borvEyaoQLIJw== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5D4685FC22D48E3079F2971CB43A34D8F083D72C36FC87018B9F80AB2734326CD2FB559BB5D741EB96352A0ABBE4FDA4210A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: [Tarantool-patches] [PATCH v1 08/21] sql: refactor ZEROBLOB() function 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" Part of #4145 --- src/box/sql/func.c | 49 +++++++++++++++++++++------------------------- 1 file changed, 22 insertions(+), 27 deletions(-) diff --git a/src/box/sql/func.c b/src/box/sql/func.c index 51a43f271..485ff33c0 100644 --- a/src/box/sql/func.c +++ b/src/box/sql/func.c @@ -913,6 +913,27 @@ func_randomblob(struct sql_context *ctx, int argc, struct Mem *argv) mem_set_bin_allocated(ctx->pOut, res, len); } +/** Implementation of the ZEROBLOB() function. */ +static void +func_zeroblob(struct sql_context *ctx, int argc, struct Mem *argv) +{ + assert(argc == 1); + (void)argc; + struct Mem *arg = &argv[0]; + assert(mem_is_null(arg) || mem_is_int(arg)); + if (mem_is_null(arg) || !mem_is_uint(arg)) + return; + if (arg->u.u == 0) + return mem_set_bin_static(ctx->pOut, "", 0); + uint64_t len = arg->u.u; + char *res = sqlDbMallocZero(sql_get(), len); + if (res == NULL) { + ctx->is_aborted = true; + return; + } + mem_set_bin_allocated(ctx->pOut, res, len); +} + static const unsigned char * mem_as_ustr(struct Mem *mem) { @@ -1482,32 +1503,6 @@ unicodeFunc(struct sql_context *context, int argc, struct Mem *argv) sql_result_uint(context, sqlUtf8Read(&z)); } -/* - * The zeroblob(N) function returns a zero-filled blob of size N bytes. - */ -static void -zeroblobFunc(struct sql_context *context, int argc, struct Mem *argv) -{ - int64_t n; - assert(argc == 1); - UNUSED_PARAMETER(argc); - n = mem_get_int_unsafe(&argv[0]); - if (n < 0) - n = 0; - if (n > sql_get()->aLimit[SQL_LIMIT_LENGTH]) { - diag_set(ClientError, ER_SQL_EXECUTE, "string or binary string"\ - "is too big"); - context->is_aborted = true; - return; - } - char *str = sqlDbMallocZero(sql_get(), n); - if (str == NULL) { - context->is_aborted = true; - return; - } - mem_set_bin_allocated(context->pOut, str, n); -} - /* * The replace() function. Three arguments are all strings: call * them A, B, and C. The result is also a string which is derived @@ -1953,7 +1948,7 @@ static struct sql_func_definition definitions[] = { {"UUID", 1, {FIELD_TYPE_INTEGER}, FIELD_TYPE_UUID, sql_func_uuid, NULL}, {"VERSION", 0, {}, FIELD_TYPE_STRING, sql_func_version, NULL}, {"ZEROBLOB", 1, {FIELD_TYPE_INTEGER}, FIELD_TYPE_VARBINARY, - zeroblobFunc, NULL}, + func_zeroblob, NULL}, }; static struct sql_func_dictionary * -- 2.25.1