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 357BA6EC5F; Tue, 25 May 2021 12:02:07 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 357BA6EC5F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1621933327; bh=zzGGeuDY5GSr1EioedBITCWQzQCgCZK513rB4PQWwME=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=nnpNPH3Vl7iBif/Ye/vciHG/H3tsnrkrpaK6vyEp5dpIAO12tNoHJUeDZJS7jDWpV 1NSo8TWW8zc23UC1JlYXVJPhmUDMnP3QgY5dyUKhqdD/Bqg7990GrqSZJOlRSabX91 b45FFIKQzHpI8tmCbVlFdYdXqbBRjyAP8BzkEw2c= Received: from smtp46.i.mail.ru (smtp46.i.mail.ru [94.100.177.106]) (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 F01A96EC5F for ; Tue, 25 May 2021 12:01:34 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org F01A96EC5F Received: by smtp46.i.mail.ru with esmtpa (envelope-from ) id 1llSwQ-0005YC-7T; Tue, 25 May 2021 12:01:34 +0300 To: tarantool-patches@dev.tarantool.org, imeevma@tarantool.org Date: Tue, 25 May 2021 12:01:00 +0300 Message-Id: X-Mailer: git-send-email 2.29.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD91B019B01C53E51AF388A0BB768BC527FF0271862FFB192DD00894C459B0CD1B9FAF8DCDFF1CD59D0B045173DAC0E9CBB86E560675804A5CA3FE2B8E3424E27AE X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7F157A19638F32F60EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637E7FC1205106FBD248638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8D129FABAAEE190F20EC3ACDCCE8203DC117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC3A703B70628EAD7BA471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD18E5D25F19253116ADD2E47CDBA5A96583BA9C0B312567BB2376E601842F6C81A19E625A9149C048EEC1DE5D12A4F17E62B78CF848AE20165DD8FC6C240DEA7642DBF02ECDB25306B2B78CF848AE20165D0A6AB1C7CE11FEE3DBD6BAFA574C8444302FCEF25BFAB345C4224003CC836476EA7A3FFF5B025636E2021AF6380DFAD1A18204E546F3947CB11811A4A51E3B096D1867E19FE1407959CC434672EE6371089D37D7C0E48F6C8AA50765F790063764BD0C886786234BEFF80C71ABB335746BA297DBC24807EABDAD6C7F3747799A X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975CDFB9373DB28FDDFBDD170CEB2BCFFCE2F1523E5DA2BD87629C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EF92B0BE0DA6BB795D699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D349320586B19AD2C728B125D3C86309F913A4A49270077583DF09209E3C6E6AC686AA636212E67E2E81D7E09C32AA3244C7EBFA74E426ED4B0D374A647724D849BF165894D92D62706FACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojbL9S8ysBdXiFlDFT/xDPqkIrHYEq54CI X-Mailru-Sender: B5B6A6EBBD94DAD8C2E767F6285855A0E63C70BC1120C78F465538F9CE1ED613734E0507E5A754C95C2808D6142752370A8ED71B308007E3DC85537438B7E1A423D748DE48713E689437F6177E88F7363CDA0F3B3F5B9367 X-Mras: Ok Subject: [Tarantool-patches] [PATCH 1/3] sql: fixes for boolean expressions in explicit converstion tables 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: Timur Safin via Tarantool-patches Reply-To: Timur Safin Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" We need to modify explicit casts table according to the RFC developed previously in /doc/rfc/5910-consistent-sql-lua-types.md. This patch introduces changes where BOOLEAN type involved, thus, for simplicity sake, we mark unchanged cells in the table below as '.' Since now on BOOLEAN will be only compatible with itself and STRINGs (and recursively with SCALAR, which includes both those types). We remove all other possible combinations which are defined now, these cells marked with '-'. | 0 | 1 | 2 | 4 | 5 | 6 | 7 | 3 | 9 |10 |11 |12 | 8 | +---+---+---+---+---+---+---+---+---+---+---+---+---+ 0. any | | | | | | | | | | | | | | 1. unsigned | | . | . | . | . | - | | . | | | | | . | 2. string | | . | . | . | . | S | . | . | | | | | . | 4. double | | . | . | . | . | - | | . | | | | | . | 5. integer | | . | . | . | . | - | | . | | | | | . | 6. boolean | | - | Y | - | - | Y | | | | | | | . | 7. varbinary | | | . | | | - | . | | | | | | . | 3. number | | . | . | . | . | - | | . | | | | | . | 9. decimal | | | | | | | | | | | | | | 10. uuid | | | | | | | | | | | | | | 11. array | | | | | | | | | | | | | | 12. map | | | | | | | | | | | | | | 8. scalar | | . | . | . | . | S | . | . | | | | | . | +---+---+---+---+---+---+---+---+---+---+---+---+---+ Current patch fixes BOOLEAN to other types entries, simultaneously updating corresponding tests. Full check for current conversion table will be committed later as separate comit. Relates to #5910, #6009 Part of #4407 --- src/box/sql/mem.c | 37 -------------------------------- test/sql-tap/cse.test.lua | 12 +++++------ test/sql-tap/e_select1.test.lua | 2 +- test/sql-tap/in1.test.lua | 16 +++++++------- test/sql-tap/misc3.test.lua | 2 +- test/sql/boolean.result | 38 +++++++-------------------------- test/sql/types.result | 14 ++++-------- 7 files changed, 28 insertions(+), 93 deletions(-) diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c index b6ff6397f..d40366754 100644 --- a/src/box/sql/mem.c +++ b/src/box/sql/mem.c @@ -526,15 +526,6 @@ int_to_str0(struct Mem *mem) return mem_copy_str0(mem, str); } -static inline int -int_to_bool(struct Mem *mem) -{ - mem->u.b = mem->u.i != 0; - mem->flags = MEM_Bool; - mem->field_type = FIELD_TYPE_BOOLEAN; - return 0; -} - static inline int str_to_str0(struct Mem *mem) { @@ -717,24 +708,6 @@ double_to_str0(struct Mem *mem) return 0; } -static inline int -double_to_bool(struct Mem *mem) -{ - mem->u.b = mem->u.r != 0.; - mem->flags = MEM_Bool; - mem->field_type = FIELD_TYPE_BOOLEAN; - return 0; -} - -static inline int -bool_to_int(struct Mem *mem) -{ - mem->u.u = (uint64_t)mem->u.b; - mem->flags = MEM_UInt; - mem->field_type = FIELD_TYPE_UNSIGNED; - return 0; -} - static inline int bool_to_str0(struct Mem *mem) { @@ -766,8 +739,6 @@ mem_to_int(struct Mem *mem) return bytes_to_int(mem); if ((mem->flags & MEM_Real) != 0) return double_to_int(mem); - if ((mem->flags & MEM_Bool) != 0) - return bool_to_int(mem); return -1; } @@ -803,8 +774,6 @@ mem_to_number(struct Mem *mem) assert((mem->flags & MEM_PURE_TYPE_MASK) != 0); if ((mem->flags & (MEM_Int | MEM_UInt | MEM_Real)) != 0) return 0; - if ((mem->flags & MEM_Bool) != 0) - return bool_to_int(mem); if ((mem->flags & (MEM_Str | MEM_Blob)) != 0) { if (bytes_to_int(mem) == 0) return 0; @@ -879,8 +848,6 @@ mem_cast_explicit(struct Mem *mem, enum field_type type) return bytes_to_uint(mem); if ((mem->flags & MEM_Real) != 0) return double_to_int(mem); - if ((mem->flags & MEM_Bool) != 0) - return bool_to_int(mem); return -1; case FIELD_TYPE_STRING: return mem_to_str(mem); @@ -891,12 +858,8 @@ mem_cast_explicit(struct Mem *mem, enum field_type type) case FIELD_TYPE_BOOLEAN: if ((mem->flags & MEM_Bool) != 0) return 0; - if ((mem->flags & (MEM_UInt | MEM_Int)) != 0) - return int_to_bool(mem); if ((mem->flags & MEM_Str) != 0) return str_to_bool(mem); - if ((mem->flags & MEM_Real) != 0) - return double_to_bool(mem); return -1; case FIELD_TYPE_VARBINARY: if ((mem->flags & MEM_Blob) != 0) diff --git a/test/sql-tap/cse.test.lua b/test/sql-tap/cse.test.lua index e09f955a0..84ff936e6 100755 --- a/test/sql-tap/cse.test.lua +++ b/test/sql-tap/cse.test.lua @@ -31,7 +31,7 @@ test:do_test( INSERT INTO t1 VALUES(2,21,22,23,24,25); ]] return test:execsql [[ - SELECT b, -b, ~b, NOT CAST(b AS BOOLEAN), NOT NOT CAST(b AS BOOLEAN), b-b, b+b, b*b, b/b, b FROM t1 + SELECT b, -b, ~b, NOT (b <> 0), NOT NOT (b <> 0), b-b, b+b, b*b, b/b, b FROM t1 ]] end, { -- @@ -102,7 +102,7 @@ test:do_execsql_test( test:do_execsql_test( "cse-1.6.3", [[ - SELECT CASE WHEN CAST(b AS BOOLEAN) THEN d WHEN CAST(e AS BOOLEAN) THEN f ELSE 999 END, b, c, d FROM t1 + SELECT CASE WHEN b<>0 THEN d WHEN e<>0 THEN f ELSE 999 END, b, c, d FROM t1 ]], { -- 13, 11, 12, 13, 23, 21, 22, 23 @@ -112,7 +112,7 @@ test:do_execsql_test( test:do_execsql_test( "cse-1.6.4", [[ - SELECT b, c, d, CASE WHEN CAST(b AS BOOLEAN) THEN d WHEN CAST(e AS BOOLEAN) THEN f ELSE 999 END FROM t1 + SELECT b, c, d, CASE WHEN b<>0 THEN d WHEN e<>0 THEN f ELSE 999 END FROM t1 ]], { -- 11, 12, 13, 13, 21, 22, 23, 23 @@ -122,7 +122,7 @@ test:do_execsql_test( test:do_execsql_test( "cse-1.6.5", [[ - SELECT b, c, d, CASE WHEN false THEN d WHEN CAST(e AS BOOLEAN) THEN f ELSE 999 END FROM t1 + SELECT b, c, d, CASE WHEN false THEN d WHEN e<>0 THEN f ELSE 999 END FROM t1 ]], { -- 11, 12, 13, 15, 21, 22, 23, 25 @@ -132,7 +132,7 @@ test:do_execsql_test( test:do_execsql_test( "cse-1.7", [[ - SELECT a, -a, ~a, NOT CAST(a AS BOOLEAN), NOT NOT CAST(a AS BOOLEAN), a-a, a+a, a*a, a/a, a FROM t1 + SELECT a, -a, ~a, NOT (a <> 0), NOT NOT (a <> 0), a-a, a+a, a*a, a/a, a FROM t1 ]], { -- 1, -1 ,-2, false, true, 0, 2, 1, 1, 1, 2, -2, -3, false, true, 0, 4, 4, 1, 2 @@ -152,7 +152,7 @@ test:do_execsql_test( test:do_execsql_test( "cse-1.9", [[ - SELECT NOT CAST(b AS BOOLEAN), ~b, NOT NOT CAST(b AS BOOLEAN), b FROM t1 + SELECT NOT (b <> 0), ~b, NOT NOT (b <>0), b FROM t1 ]], { -- false, -12, true, 11, false, -22, true, 21 diff --git a/test/sql-tap/e_select1.test.lua b/test/sql-tap/e_select1.test.lua index ab0faa376..28ea1d82f 100755 --- a/test/sql-tap/e_select1.test.lua +++ b/test/sql-tap/e_select1.test.lua @@ -910,7 +910,7 @@ test:do_select_tests( {"3", "SELECT sum(b+1) FROM z1 NATURAL LEFT JOIN z3", {-43.06}}, {"4", "SELECT sum(b+2) FROM z1 NATURAL LEFT JOIN z3", {-38.06}}, - {"5", "SELECT sum(CAST(b IS NOT NULL AS INTEGER)) FROM z1 NATURAL LEFT JOIN z3", {5}}, + {"5", "SELECT sum(CASE WHEN b IS NOT NULL THEN 1 ELSE 0 END) FROM z1 NATURAL LEFT JOIN z3", {5}}, }) -- EVIDENCE-OF: R-26684-40576 Each non-aggregate expression in the diff --git a/test/sql-tap/in1.test.lua b/test/sql-tap/in1.test.lua index 4b51da6e8..0fb059760 100755 --- a/test/sql-tap/in1.test.lua +++ b/test/sql-tap/in1.test.lua @@ -97,13 +97,13 @@ test:do_execsql_test( -- }) -test:do_execsql_test( +test:do_catchsql_test( "in-1.7", [[ SELECT a+ 100*CAST((a BETWEEN 1 and 3) AS INTEGER) FROM t1 ORDER BY b ]], { -- - 101, 102, 103, 4, 5, 6, 7, 8, 9, 10 + 1, "Type mismatch: can not convert TRUE to integer" -- }) @@ -154,13 +154,13 @@ test:do_execsql_test( -- }) -test:do_execsql_test( +test:do_catchsql_test( "in-2.5", [[ SELECT a+100*(CAST(b IN (8,16,24) AS INTEGER)) FROM t1 ORDER BY b ]], { -- - 1, 2, 103, 104, 5, 6, 7, 8, 9, 10 + 1, "Type mismatch: can not convert FALSE to integer" -- }) @@ -204,13 +204,13 @@ test:do_execsql_test( -- }) -test:do_execsql_test( +test:do_catchsql_test( "in-2.10", [[ SELECT a FROM t1 WHERE LEAST(0, CAST(b IN (a,30) AS INT)) <> 0 ]], { -- - + 1, "Type mismatch: can not convert FALSE to integer" -- }) @@ -250,13 +250,13 @@ test:do_execsql_test( -- }) -test:do_execsql_test( +test:do_catchsql_test( "in-3.3", [[ SELECT a + 100*(CAST(b IN (SELECT b FROM t1 WHERE a<5) AS INTEGER)) FROM t1 ORDER BY b ]], { -- - 101, 102, 103, 104, 5, 6, 7, 8, 9, 10 + 1, "Type mismatch: can not convert TRUE to integer" -- }) diff --git a/test/sql-tap/misc3.test.lua b/test/sql-tap/misc3.test.lua index 313484b5d..c2dc67355 100755 --- a/test/sql-tap/misc3.test.lua +++ b/test/sql-tap/misc3.test.lua @@ -510,7 +510,7 @@ test:do_execsql_test( test:do_execsql_test( "misc-8.2", [[ - SELECT count(*) FROM t3 WHERE 1+CAST((b IN ('abc','xyz')) AS INTEGER)==2 + SELECT count(*) FROM t3 WHERE b IN ('abc','xyz') ]], { -- 2 diff --git a/test/sql/boolean.result b/test/sql/boolean.result index 177a39fb9..b268eb2fe 100644 --- a/test/sql/boolean.result +++ b/test/sql/boolean.result @@ -502,23 +502,13 @@ INSERT INTO t3 VALUES (4, false) -- Check CAST from BOOLEAN to the other types. SELECT cast(true AS INTEGER), cast(false AS INTEGER); | --- - | - metadata: - | - name: COLUMN_1 - | type: integer - | - name: COLUMN_2 - | type: integer - | rows: - | - [1, 0] + | - null + | - 'Type mismatch: can not convert TRUE to integer' | ... SELECT cast(true AS NUMBER), cast(false AS NUMBER); | --- - | - metadata: - | - name: COLUMN_1 - | type: number - | - name: COLUMN_2 - | type: number - | rows: - | - [1, 0] + | - null + | - 'Type mismatch: can not convert TRUE to number' | ... -- gh-4462: ensure that text representation is uppercase. SELECT cast(true AS TEXT), cast(false AS TEXT); @@ -545,25 +535,13 @@ SELECT cast(true AS BOOLEAN), cast(false AS BOOLEAN); -- Check CAST to BOOLEAN from the other types. SELECT cast(100 AS BOOLEAN), cast(1 AS BOOLEAN), cast(0 AS BOOLEAN); | --- - | - metadata: - | - name: COLUMN_1 - | type: boolean - | - name: COLUMN_2 - | type: boolean - | - name: COLUMN_3 - | type: boolean - | rows: - | - [true, true, false] + | - null + | - 'Type mismatch: can not convert 100 to boolean' | ... SELECT cast(0.123 AS BOOLEAN), cast(0.0 AS BOOLEAN); | --- - | - metadata: - | - name: COLUMN_1 - | type: boolean - | - name: COLUMN_2 - | type: boolean - | rows: - | - [true, false] + | - null + | - 'Type mismatch: can not convert 0.123 to boolean' | ... SELECT cast('true' AS BOOLEAN), cast('false' AS BOOLEAN); | --- diff --git a/test/sql/types.result b/test/sql/types.result index 687ca3b15..d59cbef7d 100644 --- a/test/sql/types.result +++ b/test/sql/types.result @@ -1035,11 +1035,8 @@ box.execute("SELECT CAST(18446744073709551615 AS SCALAR);") ... box.execute("SELECT CAST(18446744073709551615 AS BOOLEAN);") --- -- metadata: - - name: COLUMN_1 - type: boolean - rows: - - [true] +- null +- 'Type mismatch: can not convert 18446744073709551615 to boolean' ... box.execute("SELECT CAST('18446744073709551615' AS INTEGER);") --- @@ -1105,11 +1102,8 @@ box.execute("SELECT CAST(-1.5 AS UNSIGNED);") ... box.execute("SELECT CAST(true AS UNSIGNED);") --- -- metadata: - - name: COLUMN_1 - type: unsigned - rows: - - [1] +- null +- 'Type mismatch: can not convert TRUE to unsigned' ... box.execute("SELECT CAST('123' AS UNSIGNED);") --- -- 2.29.2