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 B7E486DB24; Thu, 11 Nov 2021 13:54:34 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org B7E486DB24 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1636628074; bh=raRLTx9pVx0OB4h7N/j5zWaLK09wLqlXL4g32t9VE9E=; 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=hQ8IOCY3AQTNolRD1tLmdg+uHb57HdGiFd1/sEkEJIw158XQ97PHhCIQou1+BGkxT YZBi7vRNrgEErC/JxACVTPZyjpjcGSPFxCo+9F9MPGS9MOygGX5j6RIMmzyMiDQ1vi BXQGIgBec2qUwmA69AnQFRbtalH/hIukLjP3C3Rc= 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 78D8671068 for ; Thu, 11 Nov 2021 13:49:06 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 78D8671068 Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1ml7dh-00050v-BH; Thu, 11 Nov 2021 13:49:05 +0300 To: kyukhin@tarantool.org Cc: tarantool-patches@dev.tarantool.org Date: Thu, 11 Nov 2021 13:49:05 +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: 4F1203BC0FB41BD9731B3922EC063979A442978D427656AE6B5C9CB64E0BF97D00894C459B0CD1B902ACBC2DD5D0741D9A7632B6ED458F74BD7B9CED87D25567BE26E60622977F24 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE70A10A23A3B64B805EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F790063748744D4CD6EC491D8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D89CC510E91A2EE5EFFC3132E9907F3BB4117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCAA867293B0326636D2E47CDBA5A96583BD4B6F7A4D31EC0BC014FD901B82EE079FA2833FD35BB23D27C277FBC8AE2E8BAA867293B0326636D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B66F6A3E018CF4DC80089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975C7E9FEBB9C11794A18FCB496CCBAD1C0818C3CF28D928D7839C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EFCDE59DDCCE53AF2B699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D3429538671E6527D326B170049038F67D0089A70710BDBEE2E0833E0704D999752FD57A3ACA8C5584D1D7E09C32AA3244C4FDEF0B0A2FF7A34FE1067CC205937E13A92A9747B6CC886729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2bioj4t8MBgWr8bJZsTrk+pHNxA== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5DBAE6ED3EEB2949F957330DAC065208DE83D72C36FC87018B9F80AB2734326CD2FB559BB5D741EB96352A0ABBE4FDA4210A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: [Tarantool-patches] [PATCH v1 09/21] sql: refactor TYPEOF() 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 | 58 ++++++++-------------------------------------- 1 file changed, 10 insertions(+), 48 deletions(-) diff --git a/src/box/sql/func.c b/src/box/sql/func.c index 842e4e766..3a788b450 100644 --- a/src/box/sql/func.c +++ b/src/box/sql/func.c @@ -953,6 +953,15 @@ func_zeroblob(struct sql_context *ctx, int argc, struct Mem *argv) mem_set_bin_allocated(ctx->pOut, res, len); } +/** Implementation of the TYPEOF() function. */ +static void +func_typeof(struct sql_context *ctx, int argc, struct Mem *argv) +{ + assert(argc == 1); + (void)argc; + return mem_set_str0_static(ctx->pOut, mem_type_to_str(&argv[0])); +} + static const unsigned char * mem_as_ustr(struct Mem *mem) { @@ -1000,53 +1009,6 @@ sql_func_uuid(struct sql_context *ctx, int argc, struct Mem *argv) mem_set_uuid(ctx->pOut, &uuid); } -/* - * Return the type of the argument. - */ -static void -typeofFunc(struct sql_context *context, int argc, struct Mem *argv) -{ - (void)argc; - const char *z = 0; - if ((argv[0].flags & MEM_Number) != 0) - return mem_set_str0_static(context->pOut, "number"); - if ((argv[0].flags & MEM_Scalar) != 0) - return mem_set_str0_static(context->pOut, "scalar"); - switch (argv[0].type) { - case MEM_TYPE_INT: - case MEM_TYPE_UINT: - z = "integer"; - break; - case MEM_TYPE_DEC: - z = "decimal"; - break; - case MEM_TYPE_STR: - z = "string"; - break; - case MEM_TYPE_DOUBLE: - z = "double"; - break; - case MEM_TYPE_BIN: - case MEM_TYPE_ARRAY: - case MEM_TYPE_MAP: - z = "varbinary"; - break; - case MEM_TYPE_BOOL: - z = "boolean"; - break; - case MEM_TYPE_NULL: - z = "NULL"; - break; - case MEM_TYPE_UUID: - z = "uuid"; - break; - default: - unreachable(); - break; - } - sql_result_text(context, z, -1, SQL_STATIC); -} - /* * Implementation of the round() function */ @@ -1956,7 +1918,7 @@ static struct sql_func_definition definitions[] = { {FIELD_TYPE_VARBINARY, FIELD_TYPE_INTEGER, FIELD_TYPE_VARBINARY}, FIELD_TYPE_VARBINARY, func_trim_bin, NULL}, - {"TYPEOF", 1, {FIELD_TYPE_ANY}, FIELD_TYPE_STRING, typeofFunc, NULL}, + {"TYPEOF", 1, {FIELD_TYPE_ANY}, FIELD_TYPE_STRING, func_typeof, NULL}, {"UNICODE", 1, {FIELD_TYPE_STRING}, FIELD_TYPE_INTEGER, unicodeFunc, NULL}, {"UNLIKELY", 1, {FIELD_TYPE_ANY}, FIELD_TYPE_BOOLEAN, sql_builtin_stub, -- 2.25.1