From: Stanislav Zudin <szudin@tarantool.org> To: tarantool-patches@freelists.org, vdavydov.dev@gmail.com Cc: Stanislav Zudin <szudin@tarantool.org> Subject: [PATCH 13/13] sql: support -2^63 .. 2^64-1 integer type Date: Fri, 15 Mar 2019 18:45:42 +0300 [thread overview] Message-ID: <ea869b660bb2310e61d020c4e6d3c8688528b7bd.1552663061.git.szudin@tarantool.org> (raw) In-Reply-To: <cover.1552663061.git.szudin@tarantool.org> In-Reply-To: <cover.1552663061.git.szudin@tarantool.org> Fixes tests Closes #3810 --- test/sql-tap/func.test.lua | 6 +++--- test/sql-tap/hexlit.test.lua | 6 ++++-- test/sql/gh-2347-max-int-literals.result | 2 +- test/sql/integer-overflow.result | 10 +++++----- test/sql/iproto.result | 11 +++++++---- test/sql/iproto.test.lua | 5 ++--- 6 files changed, 22 insertions(+), 18 deletions(-) diff --git a/test/sql-tap/func.test.lua b/test/sql-tap/func.test.lua index 889fc5867..8e75f9c89 100755 --- a/test/sql-tap/func.test.lua +++ b/test/sql-tap/func.test.lua @@ -1591,14 +1591,14 @@ test:do_execsql_test( -- </func-18.11> }) -test:do_catchsql_test( +test:do_execsql_test( "func-18.12", [[ INSERT INTO t6 VALUES(3, 1<<62); SELECT sum(x) - ((1<<62)*2.0+1) from t6; ]], { -- <func-18.12> - 1, "integer overflow" + 0 -- </func-18.12> }) @@ -1653,7 +1653,7 @@ test:do_catchsql_test( SELECT 10 AS x); ]], { -- <func-18.15> - 1, "integer overflow" + 0, {9223372036854775817ULL} -- </func-18.15> }) diff --git a/test/sql-tap/hexlit.test.lua b/test/sql-tap/hexlit.test.lua index 158eda73b..1597d4b8a 100755 --- a/test/sql-tap/hexlit.test.lua +++ b/test/sql-tap/hexlit.test.lua @@ -1,6 +1,6 @@ #!/usr/bin/env tarantool test = require("sqltester") -test:plan(128) +test:plan(130) --!./tcltestrunner.lua -- 2014-07-23 @@ -91,7 +91,9 @@ hexlit1(160, "0X1000000000000000", 1152921504606846976LL) hexlit1(161, "0x2000000000000000", 2305843009213693952LL) hexlit1(162, "0X4000000000000000", 4611686018427387904LL) hexlit1(163, "0x8000000000000000", -9223372036854775808LL) -hexlit1(164, "0XFFFFFFFFFFFFFFFF", -1) +hexlit1(164, "0x8000000000000000", 9223372036854775808ULL) +hexlit1(165, "0x8000000000000001", 9223372036854775809ULL) +hexlit1(166, "0XFFFFFFFFFFFFFFFF", 18446744073709551615ULL) for n = 1, 0x10 -1, 1 do hexlit1("200."..n..".1", "0X"..string.format("%03X",n), n) hexlit1("200."..n..".2", "0x"..string.format("%03X",n), n) diff --git a/test/sql/gh-2347-max-int-literals.result b/test/sql/gh-2347-max-int-literals.result index c289a80fe..e6f78d244 100644 --- a/test/sql/gh-2347-max-int-literals.result +++ b/test/sql/gh-2347-max-int-literals.result @@ -20,7 +20,7 @@ box.sql.execute("select (-9223372036854775808)") ... box.sql.execute("select (9223372036854775808)") --- -- error: 'oversized integer: 9223372036854775808' +- - [9223372036854775808] ... box.sql.execute("select (-9223372036854775809)") --- diff --git a/test/sql/integer-overflow.result b/test/sql/integer-overflow.result index 4754c046c..aa9fabf1b 100644 --- a/test/sql/integer-overflow.result +++ b/test/sql/integer-overflow.result @@ -16,7 +16,7 @@ box.sql.execute('SELECT (2147483647 * 2147483647 * 2147483647);') ... box.sql.execute('SELECT (-9223372036854775808 / -1);') --- -- error: 'Failed to execute SQL statement: integer is overflowed' +- - [9223372036854775808] ... box.sql.execute('SELECT (-9223372036854775808 - 1);') --- @@ -24,13 +24,13 @@ box.sql.execute('SELECT (-9223372036854775808 - 1);') ... box.sql.execute('SELECT (9223372036854775807 + 1);') --- -- error: 'Failed to execute SQL statement: integer is overflowed' +- - [9223372036854775808] ... -- Literals are checked right after parsing. -- box.sql.execute('SELECT 9223372036854775808;') --- -- error: 'oversized integer: 9223372036854775808' +- - [9223372036854775808] ... box.sql.execute('SELECT -9223372036854775809;') --- @@ -38,7 +38,7 @@ box.sql.execute('SELECT -9223372036854775809;') ... box.sql.execute('SELECT 9223372036854775808 - 1;') --- -- error: 'oversized integer: 9223372036854775808' +- - [9223372036854775807] ... -- Test that CAST may also leads to overflow. -- @@ -69,7 +69,7 @@ box.space.T:insert({9223372036854775809}) ... box.sql.execute('SELECT * FROM t;') --- -- error: 'Failed to execute SQL statement: integer is overflowed' +- - [9223372036854775808] ... box.space.T:drop() --- diff --git a/test/sql/iproto.result b/test/sql/iproto.result index da7b40f22..deb0c5309 100644 --- a/test/sql/iproto.result +++ b/test/sql/iproto.result @@ -382,11 +382,14 @@ cn:execute(sql, parameters) -- -- Errors during parameters binding. -- --- Try value > INT64_MAX. sql can't bind it, since it has no --- suitable method in its bind API. -cn:execute('select ? as big_uint', {0xefffffffffffffff}) +-- Try value > INT64_MAX. +cn:execute('select ? as big_uint', {0xefffffffffffffffULL}) --- -- error: Bind value for parameter 1 is out of range for type INTEGER +- metadata: + - name: BIG_UINT + type: INTEGER + rows: + - [17293822569102704639] ... -- Bind incorrect parameters. cn:execute('select ?', { {1, 2, 3} }) diff --git a/test/sql/iproto.test.lua b/test/sql/iproto.test.lua index fbdc5a2ae..c2c3b12e5 100644 --- a/test/sql/iproto.test.lua +++ b/test/sql/iproto.test.lua @@ -112,9 +112,8 @@ cn:execute(sql, parameters) -- -- Errors during parameters binding. -- --- Try value > INT64_MAX. sql can't bind it, since it has no --- suitable method in its bind API. -cn:execute('select ? as big_uint', {0xefffffffffffffff}) +-- Try value > INT64_MAX. +cn:execute('select ? as big_uint', {0xefffffffffffffffULL}) -- Bind incorrect parameters. cn:execute('select ?', { {1, 2, 3} }) parameters = {} -- 2.17.1
next prev parent reply other threads:[~2019-03-15 15:45 UTC|newest] Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-03-15 15:45 [PATCH 00/13] " Stanislav Zudin 2019-03-15 15:45 ` [PATCH 01/13] sql: Convert big integers from string Stanislav Zudin 2019-03-25 15:10 ` [tarantool-patches] " n.pettik 2019-04-01 20:39 ` Stanislav Zudin 2019-04-02 7:27 ` Konstantin Osipov 2019-03-15 15:45 ` [PATCH 02/13] sql: make VDBE recognize big integers Stanislav Zudin 2019-03-25 15:11 ` [tarantool-patches] " n.pettik 2019-04-01 20:42 ` Stanislav Zudin 2019-04-02 7:38 ` [tarantool-patches] " Konstantin Osipov 2019-03-15 15:45 ` [PATCH 03/13] sql: removes unused function Stanislav Zudin 2019-03-25 15:11 ` [tarantool-patches] " n.pettik 2019-04-01 20:39 ` Stanislav Zudin 2019-03-15 15:45 ` [PATCH 04/13] sql: support big integers within sql binding Stanislav Zudin 2019-03-25 15:12 ` [tarantool-patches] " n.pettik 2019-04-01 20:42 ` Stanislav Zudin 2019-04-02 7:46 ` Konstantin Osipov 2019-04-02 7:44 ` [tarantool-patches] " Konstantin Osipov 2019-03-15 15:45 ` [PATCH 05/13] sql: removes redundant function Stanislav Zudin 2019-03-25 15:12 ` [tarantool-patches] " n.pettik 2019-03-15 15:45 ` [PATCH 06/13] sql: aux functions to support big integers Stanislav Zudin 2019-03-25 15:13 ` [tarantool-patches] " n.pettik 2019-03-15 15:45 ` [PATCH 07/13] sql: arithmetic functions " Stanislav Zudin 2019-03-25 15:13 ` [tarantool-patches] " n.pettik 2019-04-01 20:43 ` Stanislav Zudin 2019-04-02 7:54 ` Konstantin Osipov 2019-04-02 7:52 ` Konstantin Osipov 2019-03-15 15:45 ` [PATCH 08/13] sql: aggregate sql functions support big int Stanislav Zudin 2019-03-25 15:13 ` [tarantool-patches] " n.pettik 2019-04-01 20:43 ` Stanislav Zudin 2019-04-02 7:57 ` [tarantool-patches] " Konstantin Osipov 2019-03-15 15:45 ` [PATCH 09/13] sql: fixes errors Stanislav Zudin 2019-03-25 15:14 ` [tarantool-patches] " n.pettik 2019-03-15 15:45 ` [PATCH 10/13] sql: fixes an error in sqlSubInt64 Stanislav Zudin 2019-03-25 15:14 ` [tarantool-patches] " n.pettik 2019-03-15 15:45 ` [PATCH 11/13] sql: fixes an error in string to int64 conversion Stanislav Zudin 2019-03-25 15:14 ` [tarantool-patches] " n.pettik 2019-03-15 15:45 ` [PATCH 12/13] sql: fixes an error in uint64 to double casting Stanislav Zudin 2019-03-25 15:15 ` [tarantool-patches] " n.pettik 2019-03-15 15:45 ` Stanislav Zudin [this message] 2019-03-25 15:25 ` [tarantool-patches] Re: [PATCH 13/13] sql: support -2^63 .. 2^64-1 integer type n.pettik 2019-04-01 20:44 ` Stanislav Zudin 2019-03-25 15:10 ` [tarantool-patches] Re: [PATCH 00/13] " n.pettik 2019-04-01 20:38 ` Stanislav Zudin
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=ea869b660bb2310e61d020c4e6d3c8688528b7bd.1552663061.git.szudin@tarantool.org \ --to=szudin@tarantool.org \ --cc=tarantool-patches@freelists.org \ --cc=vdavydov.dev@gmail.com \ --subject='Re: [PATCH 13/13] sql: support -2^63 .. 2^64-1 integer type' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox