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 56E866E46B; Fri, 8 Oct 2021 20:38:19 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 56E866E46B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1633714699; bh=lVIK+lCQGJVXvXJ/NTnGZtzhQnwCNnTa6o+oWXytVFY=; 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=Qy4VqrvYZNjZsuvyRyNl5k1XRYEh6HG42XBerg/je/T8MIa0zWQFjcFJEtpjb7yJx G1eZ951FFCsTa+1X4z5lX9mTn+UgcR6rsqshumo4k7GX52RQPtUOrUebunvp0Or4X/ S0c6+N2AxsRhW2teVxgzxFBnRLYhyStrB1LTNKpY= 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 1A5536E46B for ; Fri, 8 Oct 2021 20:31:58 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 1A5536E46B Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1mYtiv-00085w-Fk; Fri, 08 Oct 2021 20:31:57 +0300 To: v.shpilevoy@tarantool.org Cc: tarantool-patches@dev.tarantool.org Date: Fri, 8 Oct 2021 20:31:57 +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: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD9A6D4E3B1981C4C7D7C82FE95BF26E3268CAB2FE89673C6C0182A05F538085040AC85A36B1FB33AB3D0E4D7362F4DB988C2A88A0A2D8C24F5BAF11FBF63A02F62 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE751DD1FEBB966604DEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637CF19945FAF91394A8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8D6E364AAFD89128F74970E8EAC36A949117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCF1175FABE1C0F9B6A471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD18F04B652EEC242312D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B62CFFCC7B69C47339089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975C650BD2383FF25EF564D9487D335BD8B9A525B7A4EC8CBD069C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EF520746E264B47742699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D341B5517184E88C1BD2AE81A8EE920982E5575D76E22E56E9B8B791420344F6E488764BD429BD6A44C1D7E09C32AA3244C136748C3995042D57FF0881522E13F7F259227199D06760A729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojMZ06aokA6bqix2Kirbf0SQ== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5D401F5412E5AF8AF58245F30D9E8BD50083D72C36FC87018B9F80AB2734326CD2FB559BB5D741EB96352A0ABBE4FDA4210A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: [Tarantool-patches] [PATCH v1 13/21] sql: refactor VERSION() 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 | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/src/box/sql/func.c b/src/box/sql/func.c index d462f66b5..fb7fd772e 100644 --- a/src/box/sql/func.c +++ b/src/box/sql/func.c @@ -998,6 +998,15 @@ func_uuid(struct sql_context *ctx, int argc, struct Mem *argv) mem_set_uuid(ctx->pOut, &uuid); } +/** Implementation of the VERSION() function. */ +static void +func_version(struct sql_context *ctx, int argc, struct Mem *argv) +{ + (void)argc; + (void)argv; + return mem_set_str0_static(ctx->pOut, (char *)tarantool_version()); +} + static const unsigned char * mem_as_ustr(struct Mem *mem) { @@ -1321,22 +1330,6 @@ likeFunc(sql_context *context, int argc, struct Mem *argv) mem_set_bool(context->pOut, res == MATCH); } -/** - * Implementation of the version() function. The result is the - * version of the Tarantool that is running. - * - * @param context Context being used. - * @param unused1 Unused. - * @param unused2 Unused. - */ -static void -sql_func_version(struct sql_context *context, int argc, struct Mem *argv) -{ - (void)argc; - (void)argv; - sql_result_text(context, tarantool_version(), -1, SQL_STATIC); -} - /* * Implementation of the QUOTE() function. This function takes a single * argument. If the argument is numeric, the return value is the same as @@ -1889,7 +1882,7 @@ static struct sql_func_definition definitions[] = { NULL}, {"UUID", 0, {}, FIELD_TYPE_UUID, func_uuid, NULL}, {"UUID", 1, {FIELD_TYPE_INTEGER}, FIELD_TYPE_UUID, func_uuid, NULL}, - {"VERSION", 0, {}, FIELD_TYPE_STRING, sql_func_version, NULL}, + {"VERSION", 0, {}, FIELD_TYPE_STRING, func_version, NULL}, {"ZEROBLOB", 1, {FIELD_TYPE_INTEGER}, FIELD_TYPE_VARBINARY, func_zeroblob, NULL}, }; -- 2.25.1