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 F13926EC57; Fri, 15 Oct 2021 01:45:33 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org F13926EC57 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1634251534; bh=wDdgLI4VrDrNpoKMylItdrJkFC4dVi7tyykdp4bnR4M=; h=Date:To:Cc:References:In-Reply-To:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=Mkp7IW0FC9sST1nASBb2oBDTIlkuJe6ZH3PP5Jl+TkL1x8d/79rO2tAGisH5Gy2aB UDGrZaYHDjz6su+FH3z4opD1p95WbyFcrG8Wji/IedIsYVTNeX8KrudWIUw01YLMsD Xl6+uXSnyLMaNauls06FJHnRRiNBm9z7sGsBQ6Do= Received: from smtpng3.i.mail.ru (smtpng3.i.mail.ru [94.100.177.149]) (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 73B2F6EC57 for ; Fri, 15 Oct 2021 01:45:31 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 73B2F6EC57 Received: by smtpng3.m.smailru.net with esmtpa (envelope-from ) id 1mb9Te-0005JP-Oo; Fri, 15 Oct 2021 01:45:31 +0300 Message-ID: Date: Fri, 15 Oct 2021 00:45:29 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:91.0) Gecko/20100101 Thunderbird/91.2.0 To: imeevma@tarantool.org Cc: tarantool-patches@dev.tarantool.org References: <1a76cd1ebe317799fc224382efffb9365b075968.1633713432.git.imeevma@gmail.com> Content-Language: en-US In-Reply-To: <1a76cd1ebe317799fc224382efffb9365b075968.1633713432.git.imeevma@gmail.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-4EC0790: 10 X-7564579A: EEAE043A70213CC8 X-77F55803: 4F1203BC0FB41BD9AE9EF867AE584ADA92C94CD99258F9563C5ED932E6EBE2E8182A05F538085040D909ED4EC3CC42653D21DB513E811291F2D8E379BF6BBEF2EDE7ED0F263C00D6 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE752E71F0C64B7C834EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006378010A306A5B6F90A8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8BFBB8162DD07365835B126AED157B2EE117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCAA867293B0326636D2E47CDBA5A96583BD4B6F7A4D31EC0BC014FD901B82EE079FA2833FD35BB23D27C277FBC8AE2E8BAA867293B0326636D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B66F6A3E018CF4DC80089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A213B5FB47DCBC3458834459D11680B50580647984BABFFB522C708C24E6EC504B X-C1DE0DAB: 0D63561A33F958A52C39A41C46B7654E3A451D5FE9A063BA6E7A73AA7DE767B4D59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA7557E988E9157162368E8E86DC7131B365E7726E8460B7C23C X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D346F44602F3B49463467AA8F1F55B5DA18935380856B4AD35A1088C08B8578777A4140A27A5DE6E08E1D7E09C32AA3244CE4A08F3D410CC8A28518B5B4704A095AC3B3ADDA61883BB5729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojZCle+NCKLXFc+GVClRK+1A== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5D39C8568628704827A2CDD18AF82BC09A3841015FED1DE5223CC9A89AB576DD93FB559BB5D741EB963CF37A108A312F5C27E8A8C3839CE0E267EA787935ED9F1B X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH v1 16/21] sql: refactor REPLACE() 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: Vladislav Shpilevoy via Tarantool-patches Reply-To: Vladislav Shpilevoy Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Thanks for the patch! On 08.10.2021 19:32, Mergen Imeev via Tarantool-patches wrote: > Part of #4145 > --- > src/box/sql/func.c | 58 ++++++++++++++++------------------------------ > 1 file changed, 20 insertions(+), 38 deletions(-) > > diff --git a/src/box/sql/func.c b/src/box/sql/func.c > index a3ca53545..f26d101e9 100644 > --- a/src/box/sql/func.c > +++ b/src/box/sql/func.c > @@ -1460,34 +1460,26 @@ replaceFunc(struct sql_context *context, int argc, struct Mem *argv) > int i, j; /* Loop counters */ > > assert(argc == 3); > - UNUSED_PARAMETER(argc); > - zStr = mem_as_ustr(&argv[0]); > - if (zStr == 0) > - return; > - nStr = mem_len_unsafe(&argv[0]); > - assert(zStr == mem_as_ustr(&argv[0])); /* No encoding change */ > - zPattern = mem_as_ustr(&argv[1]); > - if (zPattern == 0) { > - assert(mem_is_null(&argv[1]) > - || sql_context_db_handle(context)->mallocFailed); > + (void)argc; > + if (mem_is_any_null(&argv[0], &argv[1]) || mem_is_null(&argv[2])) > return; > - } > - nPattern = mem_len_unsafe(&argv[1]); > + assert(mem_is_bytes); 1. You forgot to call the function. > + zStr = (const unsigned char *)argv[0].z; > + nStr = argv[0].n; > + zPattern = (const unsigned char *)argv[1].z; > + nPattern = argv[1].n; > if (nPattern == 0) { > - assert(!mem_is_null(&argv[1])); > - sql_result_value(context, &argv[0]); > + if (mem_copy(context->pOut, &argv[0]) != 0) > + context->is_aborted = true; > return; > @@ -1497,22 +1489,12 @@ replaceFunc(struct sql_context *context, int argc, struct Mem *argv) > zOut[j++] = zStr[i]; > } else { > u8 *zOld; > - sql *db = sql_context_db_handle(context); > nOut += nRep - nPattern; > - testcase(nOut - 1 == db->aLimit[SQL_LIMIT_LENGTH]); > - testcase(nOut - 2 == db->aLimit[SQL_LIMIT_LENGTH]); > - if (nOut - 1 > db->aLimit[SQL_LIMIT_LENGTH]) { 2. Why did you drop length limit assertions and checks? > - diag_set(ClientError, ER_SQL_EXECUTE, "string "\ > - "or binary string is too big"); > - context->is_aborted = true; > - sql_free(zOut); > - return; > - }