Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

push down Abs to tiflash #2043

Merged
merged 13 commits into from
Jun 3, 2021
Merged

push down Abs to tiflash #2043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
091cf32
add test
fzhedu May 23, 2021
3a25408
update test
fzhedu May 23, 2021
e85d8df
thow exception if abs(int64_min)
fzhedu Jun 1, 2021
31db212
revert format
fzhedu Jun 1, 2021
bf07ef7
Merge branch 'master' into abs
leiysky Jun 2, 2021
a16454f
Merge branch 'master' into abs
fzhedu Jun 3, 2021
3afac93
Merge branch 'master' into abs
fzhedu Jun 3, 2021
4d55921
Merge branch 'master' into abs
fzhedu Jun 3, 2021
e59d01d
Merge branch 'master' into abs
fzhedu Jun 3, 2021
55a8649
Merge branch 'master' into abs
JaySon-Huang Jun 3, 2021
74c6dc8
Update expr_push_down.test
fzhedu Jun 3, 2021
9d7c46a
Merge branch 'master' into abs
ti-srebot Jun 3, 2021
86f6be1
Update expr_push_down.test
fzhedu Jun 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions dbms/src/Functions/FunctionsArithmetic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1097,7 +1097,14 @@ struct AbsImpl
static inline ResultType apply(A a)
{
if constexpr (std::is_integral_v<A> && std::is_signed_v<A>)
{
// keep the same behavior as mysql and tidb, even though error no is not the same.
if unlikely(a == INT64_MIN)
{
throw Exception("BIGINT value is out of range in 'abs(-9223372036854775808)'");
}
return a < 0 ? static_cast<ResultType>(~a) + 1 : a;
}
else if constexpr (std::is_integral_v<A> && std::is_unsigned_v<A>)
return static_cast<ResultType>(a);
else if constexpr (std::is_floating_point_v<A>)
Expand Down
128 changes: 82 additions & 46 deletions tests/tidb-ci/fullstack-test-dt/expr_push_down.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,39 @@
## abs()
mysql> drop table if exists test.t;
mysql> create table test.t (int_8 tinyint,uint_8 tinyint unsigned, int_16 smallint, uint_16 smallint unsigned,int_32 int, uint_32 int unsigned, int_64 bigint, uint_64 bigint unsigned, float_32 float, double_64 double, dec_3_2 decimal(3,2),dec_1_0 decimal(1,0), dec_65_30 decimal(65,30));
mysql> insert into test.t values (-128, 255, -32768, 65535, -2147483648, 4294967295, -9223372036854775807, 18446744073709551615,-12345,-123456789, -9.99,-9,-12345678910111213141512547896547856.987654321012345678900123456789);
mysql> insert into test.t values (127,0,32767,0,2147483647,0,9223372036854775807,0,-0.0,-0.0,9.99,9,-99999999999999999999999999999999999.999999999999999999999999999999);
mysql> insert into test.t values (-128, null, -32768, null, -2147483648, null, -9223372036854775807, null, null, null,null,null,null);
mysql> insert into test.t values (null, 255, null, 65535, null, 4294967295, null, 18446744073709551615,null, -123456789, 9.99,9,99999999999999999999999999999999999.999999999999999999999999999999);

mysql> alter table test.t set tiflash replica 1;

mysql> analyze table test.t;
func> wait_table test t

mysql> use test; set @@tidb_isolation_read_engines='tiflash,tidb'; set @@tidb_allow_mpp=1; select t.* from (select * from test.t)tt join test.t on abs(t.int_8)=abs(tt.int_8) and abs(t.uint_8)=abs(tt.uint_8) and abs(t.int_16)=abs(tt.int_16) and abs(t.uint_16)=abs(tt.uint_16) and abs(t.int_32)=abs(tt.int_32) and abs(t.uint_32)=abs(tt.uint_32) and abs(t.int_64)=abs(tt.int_64) and abs(t.uint_64)=abs(tt.uint_64);
+-------+--------+--------+---------+-------------+------------+----------------------+----------------------+----------+------------+---------+---------+---------------------------------------------------------------------+
| int_8 | uint_8 | int_16 | uint_16 | int_32 | uint_32 | int_64 | uint_64 | float_32 | double_64 | dec_3_2 | dec_1_0 | dec_65_30 |
+-------+--------+--------+---------+-------------+------------+----------------------+----------------------+----------+------------+---------+---------+---------------------------------------------------------------------+
| -128 | 255 | -32768 | 65535 | -2147483648 | 4294967295 | -9223372036854775807 | 18446744073709551615 | -12345 | -123456789 | -9.99 | -9 | -12345678910111213141512547896547856.987654321012345678900123456789 |
| 127 | 0 | 32767 | 0 | 2147483647 | 0 | 9223372036854775807 | 0 | 0 | 0 | 9.99 | 9 | -99999999999999999999999999999999999.999999999999999999999999999999 |
+-------+--------+--------+---------+-------------+------------+----------------------+----------------------+----------+------------+---------+---------+---------------------------------------------------------------------+

mysql> use test; set @@tidb_isolation_read_engines='tiflash,tidb'; set @@tidb_allow_mpp=1; select abs(int_8) a,abs(uint_8) b, abs(int_16) c, abs(uint_16) d, abs(int_32) e, abs(uint_32)f, abs(int_64)g, abs(uint_64)h, abs(float_32)i,abs(double_64)j,abs(dec_3_2)k,abs(dec_1_0)l,abs(dec_65_30)m,abs(null)n, count(*) from test.t group by a,b,c,d,e,f,g,h,i,j,k,l,m,n;
+-----+-----+-------+-------+------------+------------+---+----------------------+-------+-----------+------+---+--------------------------------------------------------------------+---+----------+
| a | b | c | d | e | f | g | h | i | j | k | l | m | n | count(*) |
+-----+-----+-------+-------+------------+------------+---+----------------------+-------+-----------+------+---+--------------------------------------------------------------------+---+----------+
| 128 | NULL | 32768 | NULL | 2147483648 | NULL | 9223372036854775807 | NULL | NULL | NULL | NULL | NULL | NULL | NULL | 1 |
| NULL | 255 | NULL | 65535 | NULL | 4294967295 | NULL | 18446744073709551615 | NULL | 123456789 | 9.99 | 9 | 99999999999999999999999999999999999.999999999999999999999999999999 | NULL | 1 |
| 127 | 0 | 32767 | 0 | 2147483647 | 0 | 9223372036854775807 | 0 | 0 | 0 | 9.99 | 9 | 99999999999999999999999999999999999.999999999999999999999999999999 | NULL | 1 |
| 128 | 255 | 32768 | 65535 | 2147483648 | 4294967295 | 9223372036854775807 | 18446744073709551615 | 12345 | 123456789 | 9.99 | 9 | 12345678910111213141512547896547856.987654321012345678900123456789 | NULL | 1 |
+-----+-----+-------+-------+------------+------------+---+----------------------+-------+-----------+------+---+--------------------------------------------------------------------+---+----------+

mysql> use test; set @@tidb_isolation_read_engines='tiflash,tidb'; set @@tidb_allow_mpp=1; select (int_64-1) a from test.t where abs(int_64-1) >1;
ERROR 1690 (22003) at line 1: BIGINT value is out of range in 'abs(-9223372036854775808)'

mysql> drop table if exists test.t;

mysql> drop table if exists test.f;
mysql> CREATE TABLE test.f (a char(20),b varchar(20), id int);
mysql> insert into test.f values('abc','fzh',1);
Expand All @@ -11,55 +47,55 @@ mysql> analyze table test.f;

func> wait_table test f

mysql> use test; select t.c1,t.c2,a,b,id, count(*) from (select left(a,id) c1,right(b,id) c2, a, b, 1 as id from test.f) t group by t.c1, t.c2,a,b,id;
+------+------+---------+------+------+----------+
| c1 | c2 | a | b | id | count(*) |
+------+------+---------+------+------+----------+
| 平 | NULL | 平凯xingchen公司 | NULL | 1 | 1 |
| p | b | pingcap | tidb | 1 | 1 |
| a | h | abc | fzh | 1 | 1 |
| NULL | NULL | NULL | NULL | 1 | 1 |
| NULL | NULL | NULL | std | 1 | 1 |
+------+------+---------+------+------+----------+
mysql> use test; select t.c1,t.c2,a,b,id, count(*) from (select left(a,1) c1,right(b,1) c2, a, b, 1 as id from test.f) t group by t.c1, t.c2,a,b,id;
+------+------+----------------------+------+----+----------+
| c1 | c2 | a | b | id | count(*) |
+------+------+----------------------+------+----+----------+
| NULL | d | NULL | std | 1 | 1 |
| 平 | NULL | 平凯xingchen公司 | NULL | 1 | 1 |
| p | b | pingcap | tidb | 1 | 1 |
| NULL | NULL | NULL | NULL | 1 | 1 |
| a | h | abc | fzh | 1 | 1 |
+------+------+----------------------+------+----+----------+

mysql> use test; select t.c1,t.c2,a,b,id, count(*) from (select left(a,id+10) c1,right(b,id+10) c2, a, b, 11 as id from test.f) t group by t.c1, t.c2,a,b,id;
+---------+------+---------+------+----+----------+
| c1 | c2 | a | b | id | count(*) |
+---------+------+---------+------+----+----------+
| abc | fzh | abc | fzh | 11 | 1 |
| NULL | NULL | NULL | NULL | 11 | 1 |
| pingcap | tidb | pingcap | tidb | 11 | 1 |
| NULL | NULL | NULL | std | 11 | 1 |
| 平凯xingchen公 | NULL | 平凯xingchen公司 | NULL | 11 | 1 |
+---------+------+---------+------+----+----------+
mysql> use test; select t.c1,t.c2,a,b,id, count(*) from (select left(a,21) c1,right(b,21) c2, a, b, 11 as id from test.f) t group by t.c1, t.c2,a,b,id;
+----------------------+------+----------------------+------+----+----------+
| c1 | c2 | a | b | id | count(*) |
+----------------------+------+----------------------+------+----+----------+
| pingcap | tidb | pingcap | tidb | 11 | 1 |
| NULL | std | NULL | std | 11 | 1 |
| abc | fzh | abc | fzh | 11 | 1 |
| NULL | NULL | NULL | NULL | 11 | 1 |
| 平凯xingchen公司 | NULL | 平凯xingchen公司 | NULL | 11 | 1 |
+----------------------+------+----------------------+------+----+----------+

mysql> use test; select t.c1,t.c2,a,b,id, count(*) from (select left(a,id-1) c1,right(b,id-1) c2, a, b, 0 as id from test.f) t group by t.c1, t.c2,a,b,id;
+------+------+---------+------+----+----------+
| c1 | c2 | a | b | id | count(*) |
+------+------+---------+------+----+----------+
| | NULL | 平凯xingchen公司 | NULL | 0 | 1 |
| | | pingcap | tidb | 0 | 1 |
| | | abc | fzh | 0 | 1 |
| NULL | NULL | NULL | NULL | 0 | 1 |
| NULL | NULL | NULL | std | 0 | 1 |
+------+------+---------+------+----+—————+
mysql> use test; select t.c1,t.c2,a,b,id, count(*) from (select left(a,-1) c1,right(b,-1) c2, a, b, 0 as id from test.f) t group by t.c1, t.c2,a,b,id;
+------+------+----------------------+------+----+----------+
| c1 | c2 | a | b | id | count(*) |
+------+------+----------------------+------+----+----------+
| NULL | | NULL | std | 0 | 1 |
| | | pingcap | tidb | 0 | 1 |
| | NULL | 平凯xingchen公司 | NULL | 0 | 1 |
| | | abc | fzh | 0 | 1 |
| NULL | NULL | NULL | NULL | 0 | 1 |
+------+------+----------------------+------+----+----------+

mysql> use test; set @@tidb_isolation_read_engines='tiflash,tidb'; set @@tidb_allow_mpp=1; select a,t.c0,t.c1,t.c2,t.c3,t.c4,t.c5, count(*) from (select right(a,0) c0 ,right(a,1) c1,right(a,-1) c2, right(a,100) c3, right(a,null) c4, right(null,0) c5,a from test.f) t group by c0, c1,c2,c3,c4,c5,a;
+---------+------+------+------+---------+------+------+----------+
| a | c0 | c1 | c2 | c3 | c4 | c5 | count(*) |
+---------+------+------+------+---------+------+------+----------+
| abc | | c | | abc | NULL | NULL | 1 |
| 平凯xingchen公司 | | 司 | | 平凯xingchen公司 | NULL | NULL | 1 |
| pingcap | | p | | pingcap | NULL | NULL | 1 |
| NULL | NULL | NULL | NULL | NULL | NULL | NULL | 2 |
+---------+------+------+------+---------+------+------+----------+
+----------------------+------+------+------+----------------------+------+------------+----------+
| a | c0 | c1 | c2 | c3 | c4 | c5 | count(*) |
+----------------------+------+------+------+----------------------+------+------------+----------+
| NULL | NULL | NULL | NULL | NULL | NULL | NULL | 2 |
| pingcap | | p | | pingcap | NULL | NULL | 1 |
| 平凯xingchen公司 | | 司 | | 平凯xingchen公司 | NULL | NULL | 1 |
| abc | | c | | abc | NULL | NULL | 1 |
+----------------------+------+------+------+----------------------+------+------------+----------+

mysql> use test; set @@tidb_isolation_read_engines='tiflash,tidb'; set @@tidb_allow_mpp=1; select a, t.c0,t.c1,t.c2,t.c3,t.c4,t.c5, count(*) from (select left(a,0) c0 ,left(a,1) c1,left(a,-1) c2, left(a,100) c3,left(a,null)c4,left(null,0)c5, a from test.f) t group by c0, c1,c2,c3,c4,c5,a;
+---------+------+------+------+---------+------+------+----------+
| a | c0 | c1 | c2 | c3 | c4 | c5 | count(*) |
+---------+------+------+------+---------+------+------+----------+
| pingcap | | p | | pingcap | NULL | NULL | 1 |
| abc | | a | | abc | NULL | NULL | 1 |
| NULL | NULL | NULL | NULL | NULL | NULL | NULL | 2 |
| 平凯xingchen公司 | | 平 | | 平凯xingchen公司 | NULL | NULL | 1 |
+---------+------+------+------+---------+------+------+----------+
+----------------------+------+------+------+----------------------+------+------------+----------+
| a | c0 | c1 | c2 | c3 | c4 | c5 | count(*) |
+----------------------+------+------+------+----------------------+------+------------+----------+
| abc | | a | | abc | NULL | NULL | 1 |
| pingcap | | p | | pingcap | NULL | NULL | 1 |
| NULL | NULL | NULL | NULL | NULL | NULL | NULL | 2 |
| 平凯xingchen公司 | | 平 | | 平凯xingchen公司 | NULL | NULL | 1 |
+----------------------+------+------+------+----------------------+------+------------+----------+