You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by yi...@apache.org on 2024/02/08 06:39:23 UTC

(doris) 12/32: [enhancement](schema change) some types changes (#30919)

This is an automated email from the ASF dual-hosted git repository.

yiguolei pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git

commit 763039e47d3fd704f373705b4419911e292ed3bf
Author: Guangdong Liu <li...@gmail.com>
AuthorDate: Wed Feb 7 21:26:26 2024 +0800

    [enhancement](schema change) some types changes (#30919)
---
 .../test_schema_change_agg_check_all_types.out     | 55 +++++++++++++++++++
 .../test_schema_change_agg_check_all_types.groovy  | 64 ++++++++++++++++++++++
 2 files changed, 119 insertions(+)

diff --git a/regression-test/data/schema_change_p0/test_schema_change_agg_check_all_types.out b/regression-test/data/schema_change_p0/test_schema_change_agg_check_all_types.out
index 6c309341860..aad7aa9bdb6 100644
--- a/regression-test/data/schema_change_p0/test_schema_change_agg_check_all_types.out
+++ b/regression-test/data/schema_change_p0/test_schema_change_agg_check_all_types.out
@@ -59,3 +59,58 @@
 10006	2	3	4	5	6.6	1.7	9	a	b	c	2021-10-30	2021-10-30T00:00	0.0	1.11
 10007	2	3	8	10	13.2	3.4	9	a	b	c	2021-10-30	2021-10-30T00:00	1.11	1.21
 
+-- !add_tinyint --
+10001	2	3	4	5	6.6	1.7	9	a	b	c	2021-10-30	2021-10-30T00:00	0	0.0	0.0
+10002	2	3	4	5	6.6	1.7	9	a	b	c	2021-10-30	2021-10-30T00:00	0	0.0	0.0
+10003	2	3	4	5	6.6	1.7	9	a	b	c	2021-10-30	2021-10-30T00:00	0	0.0	0.0
+10004	2	3	4	5	6.6	1.7	9	a	b	c	2021-10-30	2021-10-30T00:00	0	0.0	0.0
+10005	2	3	4	5	6.6	1.7	9	a	b	c	2021-10-30	2021-10-30T00:00	0	0.0	1.1100000143051147
+10006	2	3	4	5	6.6	1.7	9	a	b	c	2021-10-30	2021-10-30T00:00	0	0.0	1.11
+10007	2	3	12	15	19.8	5.1	9	a	b	c	2021-10-30	2021-10-30T00:00	1	1.21	1.0
+
+-- !tinyint_to_int --
+10001	2	3	4	5	6.6	1.7	9	a	b	c	2021-10-30	2021-10-30T00:00	0	0.0	0.0
+10002	2	3	4	5	6.6	1.7	9	a	b	c	2021-10-30	2021-10-30T00:00	0	0.0	0.0
+10003	2	3	4	5	6.6	1.7	9	a	b	c	2021-10-30	2021-10-30T00:00	0	0.0	0.0
+10004	2	3	4	5	6.6	1.7	9	a	b	c	2021-10-30	2021-10-30T00:00	0	0.0	0.0
+10005	2	3	4	5	6.6	1.7	9	a	b	c	2021-10-30	2021-10-30T00:00	0	0.0	1.1100000143051147
+10006	2	3	4	5	6.6	1.7	9	a	b	c	2021-10-30	2021-10-30T00:00	0	0.0	1.11
+10007	2	3	12	15	19.8	5.1	9	a	b	c	2021-10-30	2021-10-30T00:00	1	1.21	1.0
+10008	2	3	4	5	6.6	1.7	9	a	b	c	2021-10-30	2021-10-30T00:00	1	1.21	1.0
+
+-- !int_to_bigint --
+10001	2	3	4	5	6.6	1.7	9	a	b	c	2021-10-30	2021-10-30T00:00	0	0.0	0.0
+10002	2	3	4	5	6.6	1.7	9	a	b	c	2021-10-30	2021-10-30T00:00	0	0.0	0.0
+10003	2	3	4	5	6.6	1.7	9	a	b	c	2021-10-30	2021-10-30T00:00	0	0.0	0.0
+10004	2	3	4	5	6.6	1.7	9	a	b	c	2021-10-30	2021-10-30T00:00	0	0.0	0.0
+10005	2	3	4	5	6.6	1.7	9	a	b	c	2021-10-30	2021-10-30T00:00	0	0.0	1.1100000143051147
+10006	2	3	4	5	6.6	1.7	9	a	b	c	2021-10-30	2021-10-30T00:00	0	0.0	1.11
+10007	2	3	12	15	19.8	5.1	9	a	b	c	2021-10-30	2021-10-30T00:00	1	1.21	1.0
+10008	2	3	4	5	6.6	1.7	9	a	b	c	2021-10-30	2021-10-30T00:00	1	1.21	1.0
+10009	2	3	4	5	6.6	1.7	9	a	b	c	2021-10-30	2021-10-30T00:00	1	1.21	1.0
+
+-- !bigint_to_largeint --
+10001	2	3	4	5	6.6	1.7	9	a	b	c	2021-10-30	2021-10-30T00:00	0	0.0	0.0
+10002	2	3	4	5	6.6	1.7	9	a	b	c	2021-10-30	2021-10-30T00:00	0	0.0	0.0
+10003	2	3	4	5	6.6	1.7	9	a	b	c	2021-10-30	2021-10-30T00:00	0	0.0	0.0
+10004	2	3	4	5	6.6	1.7	9	a	b	c	2021-10-30	2021-10-30T00:00	0	0.0	0.0
+10005	2	3	4	5	6.6	1.7	9	a	b	c	2021-10-30	2021-10-30T00:00	0	0.0	1.1100000143051147
+10006	2	3	4	5	6.6	1.7	9	a	b	c	2021-10-30	2021-10-30T00:00	0	0.0	1.11
+10007	2	3	12	15	19.8	5.1	9	a	b	c	2021-10-30	2021-10-30T00:00	1	1.21	1.0
+10008	2	3	4	5	6.6	1.7	9	a	b	c	2021-10-30	2021-10-30T00:00	1	1.21	1.0
+10009	2	3	4	5	6.6	1.7	9	a	b	c	2021-10-30	2021-10-30T00:00	1	1.21	1.0
+10010	2	3	4	5	6.6	1.7	9	a	b	c	2021-10-30	2021-10-30T00:00	1	1.21	1.0
+
+-- !largeint_to_double --
+10001	2	3	4	5	6.6	1.7	9	a	b	c	2021-10-30	2021-10-30T00:00	0.0	0.0	0.0
+10002	2	3	4	5	6.6	1.7	9	a	b	c	2021-10-30	2021-10-30T00:00	0.0	0.0	0.0
+10003	2	3	4	5	6.6	1.7	9	a	b	c	2021-10-30	2021-10-30T00:00	0.0	0.0	0.0
+10004	2	3	4	5	6.6	1.7	9	a	b	c	2021-10-30	2021-10-30T00:00	0.0	0.0	0.0
+10005	2	3	4	5	6.6	1.7	9	a	b	c	2021-10-30	2021-10-30T00:00	0.0	0.0	1.1100000143051147
+10006	2	3	4	5	6.6	1.7	9	a	b	c	2021-10-30	2021-10-30T00:00	0.0	0.0	1.11
+10007	2	3	12	15	19.8	5.1	9	a	b	c	2021-10-30	2021-10-30T00:00	1.0	1.21	1.0
+10008	2	3	4	5	6.6	1.7	9	a	b	c	2021-10-30	2021-10-30T00:00	1.0	1.21	1.0
+10009	2	3	4	5	6.6	1.7	9	a	b	c	2021-10-30	2021-10-30T00:00	1.0	1.21	1.0
+10010	2	3	4	5	6.6	1.7	9	a	b	c	2021-10-30	2021-10-30T00:00	1.0	1.21	1.0
+10011	2	3	4	5	6.6	1.7	9	a	b	c	2021-10-30	2021-10-30T00:00	1.11	1.21	1.0
+
diff --git a/regression-test/suites/schema_change_p0/test_schema_change_agg_check_all_types.groovy b/regression-test/suites/schema_change_p0/test_schema_change_agg_check_all_types.groovy
index 8eb70bb4ddf..1986bfcc78e 100644
--- a/regression-test/suites/schema_change_p0/test_schema_change_agg_check_all_types.groovy
+++ b/regression-test/suites/schema_change_p0/test_schema_change_agg_check_all_types.groovy
@@ -163,5 +163,69 @@ suite("test_schema_change_agg_check_all_types", "p0") {
         exception "Can not change FLOAT to DECIMAL32"
     }
 
+
+     // add tinyint
+    sql """ alter table ${tableName3} add column tinyint1 tinyint replace not null default "0" after k13"""
+    waitForSchemaChangeDone {
+        sql """ SHOW ALTER TABLE COLUMN WHERE IndexName='${tableName3}' ORDER BY createtime DESC LIMIT 1 """
+        time 60
+    }
+    sql """ insert into ${tableName3} values (10007, 2, 3, 4, 5, 6.6, 1.7, 8.8,
+    'a', 'b', 'c', '2021-10-30', '2021-10-30 00:00:00',1.11,1.21,1) """
+
+    qt_add_tinyint""" select * from ${tableName3} """
+
+    //tinyint to int
+    sql """ alter table ${tableName3} modify column tinyint1 int replace not null default "0" after k13"""
+
+    waitForSchemaChangeDone {
+        sql """ SHOW ALTER TABLE COLUMN WHERE IndexName='${tableName3}' ORDER BY createtime DESC LIMIT 1 """
+        time 60
+    }
+
+    sql """ insert into ${tableName3} values (10008, 2, 3, 4, 5, 6.6, 1.7, 8.8,
+    'a', 'b', 'c', '2021-10-30', '2021-10-30 00:00:00',1.11,1.21,1) """
+
+
+    qt_tinyint_to_int""" select * from ${tableName3} """
+
+    //int to bigint
+    sql """ alter table ${tableName3} modify column tinyint1 bigint replace not null default "0" after k13"""
+
+    waitForSchemaChangeDone {
+        sql """ SHOW ALTER TABLE COLUMN WHERE IndexName='${tableName3}' ORDER BY createtime DESC LIMIT 1 """
+        time 60
+    }
+
+    sql """ insert into ${tableName3} values (10009, 2, 3, 4, 5, 6.6, 1.7, 8.8, 'a', 'b', 'c', '2021-10-30', '2021-10-30 00:00:00',1.11,1.21,1) """
+
+    qt_int_to_bigint""" select * from ${tableName3} """
+
+    //bigint to largeint
+    sql """ alter table ${tableName3} modify column tinyint1 largeint replace not null default "0" after k13"""
+
+    waitForSchemaChangeDone {
+        sql """ SHOW ALTER TABLE COLUMN WHERE IndexName='${tableName3}' ORDER BY createtime DESC LIMIT 1 """
+        time 60
+    }
+
+    sql """ insert into ${tableName3} values (10010, 2, 3, 4, 5, 6.6, 1.7, 8.8, 'a', 'b', 'c', '2021-10-30', '2021-10-30 00:00:00',1.11,1.21,1) """
+
+    qt_bigint_to_largeint""" select * from ${tableName3} """
+
+    //largeint to double
+    sql """ alter table ${tableName3} modify column tinyint1 double replace not null default "0" after k13"""
+
+    waitForSchemaChangeDone {
+        sql """ SHOW ALTER TABLE COLUMN WHERE IndexName='${tableName3}' ORDER BY createtime DESC LIMIT 1 """
+        time 60
+    }
+
+    sql """ insert into ${tableName3} values (10011, 2, 3, 4, 5, 6.6, 1.7, 8.8, 'a', 'b', 'c', '2021-10-30', '2021-10-30 00:00:00',1.11,1.21,1) """
+
+    qt_largeint_to_double""" select * from ${tableName3} """
+
+
+
 }
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org