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 EF6506FC8B; Fri, 1 Oct 2021 19:31:25 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org EF6506FC8B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1633105886; bh=OuJAYXa1QUeOEi3sry4BiCLt66XaUfBRKKZK1IDpazc=; 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=oTrM2SNFetW7F/XiMyR+tZutV5C5+OFU0N7j93wbMGXLuqbrY7zzwJLsBVSBt8AiE OAKgH8A12lwjf72kVVdDNbw0z2R+7DwIrKpFnKEnaRJ1CBr+47m/3d9WHuPUc1XKLW c1GqX1uaf4c4SggkN+U5346Ho1BRFB0M08YyA5+A= 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 AE04574145 for ; Fri, 1 Oct 2021 19:29:31 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org AE04574145 Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1mWLPf-0004Ja-44; Fri, 01 Oct 2021 19:29:31 +0300 To: v.shpilevoy@tarantool.org Cc: tarantool-patches@dev.tarantool.org Date: Fri, 1 Oct 2021 19:29:30 +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: 4F1203BC0FB41BD96A58C36AA2E996498302BFE8288A953FFF2204EAAF1B1FDF182A05F5380850400DCF81B5D71ABEC0C232969195096D50F09F409981F969FC2EDFC4F6DA709ACC X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE73C714006C69EB7BAEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F790063739E242D0556ED1DD8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D822C7739D17007F8F76DB0F8025DDC93C117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCF1175FABE1C0F9B6A471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD1828451B159A507268D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B66F6A3E018CF4DC80089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975CBBB17C150BCA67938EDC8AB224F0B64AEBCD90B0ECDCFF019C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EF783E2B6F79C23BED699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34D2AC226BFD455724DC555FD075A2830FF522AB64F9C468B8204F2384806AC97B7B84F5333BAFDFD41D7E09C32AA3244CD682D6FE2C3D1EBCECC93FC5D9B228F67101BF96129E4011729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2bioj/2kGGGWRGj7Zx9LmKk3gpg== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5D0EF56105E713B07176CE74C97C0DBD8E83D72C36FC87018B9F80AB2734326CD2FB559BB5D741EB96352A0ABBE4FDA4210A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: [Tarantool-patches] [PATCH v1 4/8] sql: refactor NULLIF() 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 | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/src/box/sql/func.c b/src/box/sql/func.c index 565ebcabe..17d5fab8f 100644 --- a/src/box/sql/func.c +++ b/src/box/sql/func.c @@ -348,6 +348,18 @@ func_lower_upper(struct sql_context *ctx, int argc, struct Mem *argv) mem_set_str_allocated(ctx->pOut, res, new_len); } +/** Implementation of the NULLIF() function. */ +static void +func_nullif(struct sql_context *ctx, int argc, struct Mem *argv) +{ + assert(argc == 2); + (void)argc; + if (mem_cmp_scalar(&argv[0], &argv[1], ctx->coll) == 0) + return; + if (mem_copy(ctx->pOut, &argv[0]) != 0) + ctx->is_aborted = true; +} + static const unsigned char * mem_as_ustr(struct Mem *mem) { @@ -1210,20 +1222,6 @@ likeFunc(sql_context *context, int argc, struct Mem *argv) sql_result_bool(context, res == MATCH); } -/* - * Implementation of the NULLIF(x,y) function. The result is the first - * argument if the arguments are different. The result is NULL if the - * arguments are equal to each other. - */ -static void -nullifFunc(struct sql_context *context, int argc, struct Mem *argv) -{ - (void)argc; - struct coll *pColl = context->coll; - if (mem_cmp_scalar(&argv[0], &argv[1], pColl) != 0) - sql_result_value(context, &argv[0]); -} - /** * Implementation of the version() function. The result is the * version of the Tarantool that is running. @@ -2021,7 +2019,7 @@ static struct sql_func_definition definitions[] = { {"MIN", 1, {FIELD_TYPE_SCALAR}, FIELD_TYPE_SCALAR, step_minmax, NULL}, {"NULLIF", 2, {FIELD_TYPE_ANY, FIELD_TYPE_ANY}, FIELD_TYPE_SCALAR, - nullifFunc, NULL}, + func_nullif, NULL}, {"POSITION", 2, {FIELD_TYPE_STRING, FIELD_TYPE_STRING}, FIELD_TYPE_INTEGER, position_func, NULL}, {"PRINTF", -1, {FIELD_TYPE_ANY}, FIELD_TYPE_STRING, printfFunc, -- 2.25.1