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 F1E726E46A; Fri, 8 Oct 2021 20:37:46 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org F1E726E46A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1633714667; bh=j7ff5jzhpssjYI8aL8C1vUjXEl1rrML4xEjzsoHFh64=; 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=AGT1GUok70ZtxaW9nKhaodS30tkOd8yGZAaIYhF8gFO/qAk7pOEnPd/S+O+r6ZLqf 2bArTFLAum1piAzGbyKa7EBpDf21khaDHVpNZHzTURfzCRq4k8Xz478LpT+V7ibsOq qUkF9GtWU3oxHalq6P5hK8DIOoiTYhNEyjxr8j0M= 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 5D1076E46A for ; Fri, 8 Oct 2021 20:31:56 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 5D1076E46A Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1mYtit-00085V-Q1; Fri, 08 Oct 2021 20:31:56 +0300 To: v.shpilevoy@tarantool.org Cc: tarantool-patches@dev.tarantool.org Date: Fri, 8 Oct 2021 20:31:55 +0300 Message-Id: <6520c5c2bc6f2a4e9dfd224cf2162bf1fc130dd5.1633713432.git.imeevma@gmail.com> 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: 4F1203BC0FB41BD9A6D4E3B1981C4C7DD6313C0D12430C2EBE99D9AA6174C4CF182A05F53808504029EC44796AC2D1E19A88FF997004BAFA73494F11B7D3BD935A81D2F83E4CB14A X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7A1E06C56A402FD6FEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F790063786D6A7D810B9582D8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D83408DB77224A2994F9C6C46A6D73B977117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCF1175FABE1C0F9B6A471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD18C26CFBAC0749D213D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B62CFFCC7B69C47339089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975C650BD2383FF25EF5CBE3A2E1629D57515A40CC307B9F2B619C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EF520746E264B47742699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D3488E5CD2E691F5566B2B1C340C0399FBB661E9FA283DB94106DAFA8822482C0CB045A190D2F9FB0231D7E09C32AA3244C966D69B1857504CEDB1B364ABF4BE89B33C9DC155518937F729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojMZ06aokA6bpk/0DZgShuCg== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5DF895EA8ECD4F2069E24138E364302B4D83D72C36FC87018B9F80AB2734326CD2FB559BB5D741EB96352A0ABBE4FDA4210A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: [Tarantool-patches] [PATCH v1 12/21] sql: rework UUID() 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" This patch refactors UUID() function. Also, UUID(NULL) now returns NULL. Part of #4145 --- src/box/sql/func.c | 52 +++++++++++++++----------------------- test/sql-tap/uuid.test.lua | 11 +++++++- 2 files changed, 31 insertions(+), 32 deletions(-) diff --git a/src/box/sql/func.c b/src/box/sql/func.c index ca7c41d96..d462f66b5 100644 --- a/src/box/sql/func.c +++ b/src/box/sql/func.c @@ -979,6 +979,25 @@ func_row_count(struct sql_context *ctx, int argc, struct Mem *argv) return mem_set_uint(ctx->pOut, sql_get()->nChange); } +/** Implementation of the UUID() function. */ +static void +func_uuid(struct sql_context *ctx, int argc, struct Mem *argv) +{ + if (argc == 1) { + if (mem_is_null(&argv[0])) + return; + if (!mem_is_uint(&argv[0]) || argv[0].u.u != 4) { + diag_set(ClientError, ER_UNSUPPORTED, "Function UUID", + "versions other than 4"); + ctx->is_aborted = true; + return; + } + } + struct tt_uuid uuid; + tt_uuid_create(&uuid); + mem_set_uuid(ctx->pOut, &uuid); +} + static const unsigned char * mem_as_ustr(struct Mem *mem) { @@ -997,35 +1016,6 @@ mem_as_bin(struct Mem *mem) return s; } -static void -sql_func_uuid(struct sql_context *ctx, int argc, struct Mem *argv) -{ - if (argc > 1) { - diag_set(ClientError, ER_FUNC_WRONG_ARG_COUNT, "UUID", - "one or zero", argc); - ctx->is_aborted = true; - return; - } - if (argc == 1) { - uint64_t version; - if (mem_get_uint(&argv[0], &version) != 0) { - diag_set(ClientError, ER_SQL_TYPE_MISMATCH, - mem_str(&argv[0]), "integer"); - ctx->is_aborted = true; - return; - } - if (version != 4) { - diag_set(ClientError, ER_UNSUPPORTED, "Function UUID", - "versions other than 4"); - ctx->is_aborted = true; - return; - } - } - struct tt_uuid uuid; - tt_uuid_create(&uuid); - mem_set_uuid(ctx->pOut, &uuid); -} - /* * Allocate nByte bytes of space using sqlMalloc(). If the * allocation fails, return NULL. If nByte is larger than the @@ -1897,8 +1887,8 @@ static struct sql_func_definition definitions[] = { NULL}, {"UPPER", 1, {FIELD_TYPE_STRING}, FIELD_TYPE_STRING, func_lower_upper, NULL}, - {"UUID", 0, {}, FIELD_TYPE_UUID, sql_func_uuid, NULL}, - {"UUID", 1, {FIELD_TYPE_INTEGER}, FIELD_TYPE_UUID, sql_func_uuid, 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}, {"ZEROBLOB", 1, {FIELD_TYPE_INTEGER}, FIELD_TYPE_VARBINARY, func_zeroblob, NULL}, diff --git a/test/sql-tap/uuid.test.lua b/test/sql-tap/uuid.test.lua index fea9d9370..3eb8b4578 100755 --- a/test/sql-tap/uuid.test.lua +++ b/test/sql-tap/uuid.test.lua @@ -3,7 +3,7 @@ local build_path = os.getenv("BUILDDIR") package.cpath = build_path..'/test/sql-tap/?.so;'..build_path..'/test/sql-tap/?.dylib;'..package.cpath local test = require("sqltester") -test:plan(146) +test:plan(147) local uuid = require("uuid") local uuid1 = uuid.fromstr("11111111-1111-1111-1111-111111111111") @@ -1290,6 +1290,15 @@ test:do_execsql_test( true }) +-- Make sure the uuid(NULL) returns NULL. +test:do_execsql_test( + "uuid-16.7", + [[ + SELECT uuid(NULL) IS NULL; + ]], { + true + }) + -- Make sure STRING of wrong length cannot be cast to UUID. test:do_catchsql_test( "uuid-17.1", -- 2.25.1