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 DB2D06DB24; Thu, 11 Nov 2021 13:53:04 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org DB2D06DB24 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1636627985; bh=VJE+jlEr39X99L8uF+uYTnTqzqYfRG2UqqfFUHRo1bs=; 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=m9jwEuFhOP0bN25wjhINdaR0yPq7f3QgBLooYSw4YB07vuhDz2wM43vf0IIhJmynv RjbAT8CwciikXZZxLAePjqRp8GnwmVQYSWa7rTJHvzDufFvihrpWI31yPhYhTehKrK GRYj+QnOFwU3FTz7lLa2pg/zHITn5WFQJErXMXcc= 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 8C79271065 for ; Thu, 11 Nov 2021 13:49:00 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 8C79271065 Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1ml7db-0004v7-Q0; Thu, 11 Nov 2021 13:49:00 +0300 To: kyukhin@tarantool.org Cc: tarantool-patches@dev.tarantool.org Date: Thu, 11 Nov 2021 13:48:59 +0300 Message-Id: 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: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD9731B3922EC0639794B1FA730FFF2612B18842EFC24E0D5F400894C459B0CD1B944FEBFB5168500B477667BDD89742A04BD7B9CED87D255673A3291F18787EBD1 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE764C944B6AA401A18EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006378D64EDD178B2A1008638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8C60994C97B17B3AE6A85EE7002E1741D117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCAE9A1BBD95851C5BA471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD182CC0D3CB04F14752D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B66F6A3E018CF4DC80089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975C7E9FEBB9C11794A1F2BEC1BD26830764EB5EE8E4EFF539A99C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EFCDE59DDCCE53AF2B699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D342C0B628602DFD0BC35CA0220F9851222AE77ED3FC34CB30B3A8FB7118548FF64BAB2982AF3A87F8F1D7E09C32AA3244C8E5757FFB024FCCA5B88CA781B0EA3ABB038C9161EF167A1729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2bioj4t8MBgWr8bICncBxMB5Txg== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5D0E58F21B9419AB3742F02FC94035FBDC83D72C36FC87018B9F80AB2734326CD2FB559BB5D741EB96352A0ABBE4FDA4210A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: [Tarantool-patches] [PATCH v1 06/21] sql: refactor RANDOM() 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 | 40 ++++++++++++++++------------------------ 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/src/box/sql/func.c b/src/box/sql/func.c index 603deb44e..2d83d52f8 100644 --- a/src/box/sql/func.c +++ b/src/box/sql/func.c @@ -885,6 +885,21 @@ func_printf(struct sql_context *ctx, int argc, struct Mem *argv) mem_set_str_allocated(ctx->pOut, sqlStrAccumFinish(&acc), acc.nChar); } +/** + * Implementation of the RANDOM() function. + * + * This function returns a random INT64 value. + */ +static void +func_random(struct sql_context *ctx, int argc, struct Mem *argv) +{ + (void)argc; + (void)argv; + int64_t r; + sql_randomness(sizeof(r), &r); + mem_set_int(ctx->pOut, r, r < 0); +} + static const unsigned char * mem_as_ustr(struct Mem *mem) { @@ -1050,29 +1065,6 @@ contextMalloc(struct sql_context *context, i64 nByte) return z; } -/* - * Some functions like COALESCE() and IFNULL() and UNLIKELY() are implemented - * as VDBE code so that unused argument values do not have to be computed. - * However, we still need some kind of function implementation for this - * routines in the function table. The noopFunc macro provides this. - * noopFunc will never be called so it doesn't matter what the implementation - * is. We might as well use the "version()" function as a substitute. - */ -#define noopFunc sql_func_version /* Substitute function - never called */ - -/* - * Implementation of random(). Return a random integer. - */ -static void -randomFunc(struct sql_context *context, int argc, struct Mem *argv) -{ - (void)argc; - (void)argv; - int64_t r; - sql_randomness(sizeof(r), &r); - sql_result_int(context, r); -} - /* * Implementation of randomblob(N). Return a random blob * that is N bytes long. @@ -1923,7 +1915,7 @@ static struct sql_func_definition definitions[] = { FIELD_TYPE_INTEGER, func_position_octets, NULL}, {"PRINTF", -1, {FIELD_TYPE_ANY}, FIELD_TYPE_STRING, func_printf, NULL}, {"QUOTE", 1, {FIELD_TYPE_ANY}, FIELD_TYPE_STRING, quoteFunc, NULL}, - {"RANDOM", 0, {}, FIELD_TYPE_INTEGER, randomFunc, NULL}, + {"RANDOM", 0, {}, FIELD_TYPE_INTEGER, func_random, NULL}, {"RANDOMBLOB", 1, {FIELD_TYPE_INTEGER}, FIELD_TYPE_VARBINARY, randomBlob, NULL}, {"REPLACE", 3, -- 2.25.1