[tarantool-patches] Re: [PATCH 13/13] sql: support -2^63 .. 2^64-1 integer type
Stanislav Zudin
szudin at tarantool.org
Mon Apr 1 23:44:06 MSK 2019
On 25.03.2019 18:25, n.pettik wrote:
> Merge this patch with the main one in your patch-set.
> Also, please add sufficient number of tests verifying that
> INT in a range of [2^63, 2^64 - 1] is working without as designed
>
>> 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
>
>
> tarantool> SELECT sum(x) from t6;
> ---
> - - [9223372036854775809]
> ...
>
> tarantool> SELECT ((1<<62)*2.0+1) from t6;
> ---
> - - [9223372036854775808]
> - [9223372036854775808]
> - [9223372036854775808]
> …
>
> So, how it could be that SELECT sum(x) - ((1<<62)*2.0+1) is 0?
>
The "func-18.12" uses data inserted in "func-18.10".
The "(1<<62)" was inserted twice.
tarantool> box.sql.execute("SELECT * from t6;")
---
- - [1, 1]
- [2, 4611686018427387904]
- [3, 4611686018427387904]
...
tarantool> box.sql.execute("SELECT sum(x) from t6;")
---
- - [9223372036854775809]
...
tarantool> box.sql.execute("SELECT sum(x) - ((1<<62)*2.0+1) from t6;")
---
- - [0]
...
This test is definitely correct.
>
> What is more, I see this:
>
> tarantool> SELECT typeof(sum(x)) from t6;
> ---
> - - ['null']
> …
>
> Which is obviously wrong.
This was a bug. Fixed.
>
>
>> 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]
>
> Please, make these test check that overflow error is handled,
> not simply fixing result file.
>
>
Done.
>
More information about the Tarantool-patches
mailing list