diff --git a/dbms/tests/queries/0_stateless/00061_merge_tree_alter.reference b/dbms/tests/queries/0_stateless/00061_merge_tree_alter.reference index 84439c67c9a..48a896785fd 100644 --- a/dbms/tests/queries/0_stateless/00061_merge_tree_alter.reference +++ b/dbms/tests/queries/0_stateless/00061_merge_tree_alter.reference @@ -6,133 +6,96 @@ CREATE TABLE test.alter ( d Date, k UInt64, i32 Int32) ENGINE = MergeTree(d, k d Date k UInt64 i32 Int32 -dt DateTime -CREATE TABLE test.alter ( d Date, k UInt64, i32 Int32, dt DateTime) ENGINE = MergeTree(d, k, 8192) -2015-01-01 9 41 1992-01-01 08:00:00 -2015-01-01 10 42 0000-00-00 00:00:00 -d Date -k UInt64 -i32 Int32 -dt DateTime n.ui8 Array(UInt8) n.s Array(String) -CREATE TABLE test.alter ( d Date, k UInt64, i32 Int32, dt DateTime, `n.ui8` Array(UInt8), `n.s` Array(String)) ENGINE = MergeTree(d, k, 8192) -2015-01-01 8 40 2012-12-12 12:12:12 [1,2,3] ['12','13','14'] -2015-01-01 9 41 1992-01-01 08:00:00 [] [] -2015-01-01 10 42 0000-00-00 00:00:00 [] [] +CREATE TABLE test.alter ( d Date, k UInt64, i32 Int32, `n.ui8` Array(UInt8), `n.s` Array(String)) ENGINE = MergeTree(d, k, 8192) +2015-01-01 8 40 [1,2,3] ['12','13','14'] +2015-01-01 10 42 [] [] d Date k UInt64 i32 Int32 -dt DateTime n.ui8 Array(UInt8) n.s Array(String) n.d Array(Date) -CREATE TABLE test.alter ( d Date, k UInt64, i32 Int32, dt DateTime, `n.ui8` Array(UInt8), `n.s` Array(String), `n.d` Array(Date)) ENGINE = MergeTree(d, k, 8192) -2015-01-01 7 39 2014-07-14 13:26:50 [10,20,30] ['120','130','140'] ['2000-01-01','2000-01-01','2000-01-03'] -2015-01-01 8 40 2012-12-12 12:12:12 [1,2,3] ['12','13','14'] ['0000-00-00','0000-00-00','0000-00-00'] -2015-01-01 9 41 1992-01-01 08:00:00 [] [] [] -2015-01-01 10 42 0000-00-00 00:00:00 [] [] [] +CREATE TABLE test.alter ( d Date, k UInt64, i32 Int32, `n.ui8` Array(UInt8), `n.s` Array(String), `n.d` Array(Date)) ENGINE = MergeTree(d, k, 8192) +2015-01-01 7 39 [10,20,30] ['120','130','140'] ['2000-01-01','2000-01-01','2000-01-03'] +2015-01-01 8 40 [1,2,3] ['12','13','14'] ['0000-00-00','0000-00-00','0000-00-00'] +2015-01-01 10 42 [] [] [] d Date k UInt64 i32 Int32 -dt DateTime n.ui8 Array(UInt8) n.s Array(String) n.d Array(Date) s String DEFAULT \'0\' -CREATE TABLE test.alter ( d Date, k UInt64, i32 Int32, dt DateTime, `n.ui8` Array(UInt8), `n.s` Array(String), `n.d` Array(Date), s String DEFAULT \'0\') ENGINE = MergeTree(d, k, 8192) -2015-01-01 6 38 2014-07-15 13:26:50 [10,20,30] ['asd','qwe','qwe'] ['2000-01-01','2000-01-01','2000-01-03'] 100500 -2015-01-01 7 39 2014-07-14 13:26:50 [10,20,30] ['120','130','140'] ['2000-01-01','2000-01-01','2000-01-03'] 0 -2015-01-01 8 40 2012-12-12 12:12:12 [1,2,3] ['12','13','14'] ['0000-00-00','0000-00-00','0000-00-00'] 0 -2015-01-01 9 41 1992-01-01 08:00:00 [] [] [] 0 -2015-01-01 10 42 0000-00-00 00:00:00 [] [] [] 0 +CREATE TABLE test.alter ( d Date, k UInt64, i32 Int32, `n.ui8` Array(UInt8), `n.s` Array(String), `n.d` Array(Date), s String DEFAULT \'0\') ENGINE = MergeTree(d, k, 8192) +2015-01-01 6 38 [10,20,30] ['asd','qwe','qwe'] ['2000-01-01','2000-01-01','2000-01-03'] 100500 +2015-01-01 7 39 [10,20,30] ['120','130','140'] ['2000-01-01','2000-01-01','2000-01-03'] 0 +2015-01-01 8 40 [1,2,3] ['12','13','14'] ['0000-00-00','0000-00-00','0000-00-00'] 0 +2015-01-01 10 42 [] [] [] 0 d Date k UInt64 i32 Int32 -dt DateTime n.ui8 Array(UInt8) n.s Array(String) s Int64 -CREATE TABLE test.alter ( d Date, k UInt64, i32 Int32, dt DateTime, `n.ui8` Array(UInt8), `n.s` Array(String), s Int64) ENGINE = MergeTree(d, k, 8192) -2015-01-01 6 38 2014-07-15 13:26:50 [10,20,30] ['asd','qwe','qwe'] 100500 -2015-01-01 7 39 2014-07-14 13:26:50 [10,20,30] ['120','130','140'] 0 -2015-01-01 8 40 2012-12-12 12:12:12 [1,2,3] ['12','13','14'] 0 -2015-01-01 9 41 1992-01-01 08:00:00 [] [] 0 -2015-01-01 10 42 0000-00-00 00:00:00 [] [] 0 +CREATE TABLE test.alter ( d Date, k UInt64, i32 Int32, `n.ui8` Array(UInt8), `n.s` Array(String), s Int64) ENGINE = MergeTree(d, k, 8192) +2015-01-01 6 38 [10,20,30] ['asd','qwe','qwe'] 100500 +2015-01-01 7 39 [10,20,30] ['120','130','140'] 0 +2015-01-01 8 40 [1,2,3] ['12','13','14'] 0 +2015-01-01 10 42 [] [] 0 d Date k UInt64 i32 Int32 -dt DateTime n.ui8 Array(UInt8) n.s Array(String) s UInt32 n.d Array(Date) -CREATE TABLE test.alter ( d Date, k UInt64, i32 Int32, dt DateTime, `n.ui8` Array(UInt8), `n.s` Array(String), s UInt32, `n.d` Array(Date)) ENGINE = MergeTree(d, k, 8192) -2015-01-01 6 38 2014-07-15 13:26:50 [10,20,30] ['asd','qwe','qwe'] 100500 ['0000-00-00','0000-00-00','0000-00-00'] -2015-01-01 7 39 2014-07-14 13:26:50 [10,20,30] ['120','130','140'] 0 ['0000-00-00','0000-00-00','0000-00-00'] -2015-01-01 8 40 2012-12-12 12:12:12 [1,2,3] ['12','13','14'] 0 ['0000-00-00','0000-00-00','0000-00-00'] -2015-01-01 9 41 1992-01-01 08:00:00 [] [] 0 [] -2015-01-01 10 42 0000-00-00 00:00:00 [] [] 0 [] -2015-01-01 6 38 2014-07-15 13:26:50 [10,20,30] ['asd','qwe','qwe'] 100500 ['0000-00-00','0000-00-00','0000-00-00'] -2015-01-01 7 39 2014-07-14 13:26:50 [10,20,30] ['120','130','140'] 0 ['0000-00-00','0000-00-00','0000-00-00'] -2015-01-01 8 40 2012-12-12 12:12:12 [1,2,3] ['12','13','14'] 0 ['0000-00-00','0000-00-00','0000-00-00'] -2015-01-01 9 41 1992-01-01 08:00:00 [] [] 0 [] -2015-01-01 10 42 0000-00-00 00:00:00 [] [] 0 [] +CREATE TABLE test.alter ( d Date, k UInt64, i32 Int32, `n.ui8` Array(UInt8), `n.s` Array(String), s UInt32, `n.d` Array(Date)) ENGINE = MergeTree(d, k, 8192) +2015-01-01 6 38 [10,20,30] ['asd','qwe','qwe'] 100500 ['0000-00-00','0000-00-00','0000-00-00'] +2015-01-01 7 39 [10,20,30] ['120','130','140'] 0 ['0000-00-00','0000-00-00','0000-00-00'] +2015-01-01 8 40 [1,2,3] ['12','13','14'] 0 ['0000-00-00','0000-00-00','0000-00-00'] +2015-01-01 10 42 [] [] 0 [] +2015-01-01 6 38 [10,20,30] ['asd','qwe','qwe'] 100500 ['0000-00-00','0000-00-00','0000-00-00'] +2015-01-01 7 39 [10,20,30] ['120','130','140'] 0 ['0000-00-00','0000-00-00','0000-00-00'] +2015-01-01 8 40 [1,2,3] ['12','13','14'] 0 ['0000-00-00','0000-00-00','0000-00-00'] +2015-01-01 10 42 [] [] 0 [] d Date k UInt64 i32 Int32 -dt DateTime n.s Array(String) s UInt32 -CREATE TABLE test.alter ( d Date, k UInt64, i32 Int32, dt DateTime, `n.s` Array(String), s UInt32) ENGINE = MergeTree(d, k, 8192) -2015-01-01 6 38 2014-07-15 13:26:50 ['asd','qwe','qwe'] 100500 -2015-01-01 7 39 2014-07-14 13:26:50 ['120','130','140'] 0 -2015-01-01 8 40 2012-12-12 12:12:12 ['12','13','14'] 0 -2015-01-01 9 41 1992-01-01 08:00:00 [] 0 -2015-01-01 10 42 0000-00-00 00:00:00 [] 0 +CREATE TABLE test.alter ( d Date, k UInt64, i32 Int32, `n.s` Array(String), s UInt32) ENGINE = MergeTree(d, k, 8192) +2015-01-01 6 38 ['asd','qwe','qwe'] 100500 +2015-01-01 7 39 ['120','130','140'] 0 +2015-01-01 8 40 ['12','13','14'] 0 +2015-01-01 10 42 [] 0 d Date k UInt64 i32 Int32 -dt DateTime s UInt32 -CREATE TABLE test.alter ( d Date, k UInt64, i32 Int32, dt DateTime, s UInt32) ENGINE = MergeTree(d, k, 8192) -2015-01-01 6 38 2014-07-15 13:26:50 100500 -2015-01-01 7 39 2014-07-14 13:26:50 0 -2015-01-01 8 40 2012-12-12 12:12:12 0 -2015-01-01 9 41 1992-01-01 08:00:00 0 -2015-01-01 10 42 0000-00-00 00:00:00 0 +CREATE TABLE test.alter ( d Date, k UInt64, i32 Int32, s UInt32) ENGINE = MergeTree(d, k, 8192) +2015-01-01 6 38 100500 +2015-01-01 7 39 0 +2015-01-01 8 40 0 +2015-01-01 10 42 0 d Date k UInt64 i32 Int32 -dt DateTime s UInt32 n.s Array(String) n.d Array(Date) -CREATE TABLE test.alter ( d Date, k UInt64, i32 Int32, dt DateTime, s UInt32, `n.s` Array(String), `n.d` Array(Date)) ENGINE = MergeTree(d, k, 8192) -2015-01-01 6 38 2014-07-15 13:26:50 100500 [] [] -2015-01-01 7 39 2014-07-14 13:26:50 0 [] [] -2015-01-01 8 40 2012-12-12 12:12:12 0 [] [] -2015-01-01 9 41 1992-01-01 08:00:00 0 [] [] -2015-01-01 10 42 0000-00-00 00:00:00 0 [] [] +CREATE TABLE test.alter ( d Date, k UInt64, i32 Int32, s UInt32, `n.s` Array(String), `n.d` Array(Date)) ENGINE = MergeTree(d, k, 8192) +2015-01-01 6 38 100500 [] [] +2015-01-01 7 39 0 [] [] +2015-01-01 8 40 0 [] [] +2015-01-01 10 42 0 [] [] d Date k UInt64 i32 Int32 -dt DateTime s UInt32 -CREATE TABLE test.alter ( d Date, k UInt64, i32 Int32, dt DateTime, s UInt32) ENGINE = MergeTree(d, k, 8192) -2015-01-01 6 38 2014-07-15 13:26:50 100500 -2015-01-01 7 39 2014-07-14 13:26:50 0 -2015-01-01 8 40 2012-12-12 12:12:12 0 -2015-01-01 9 41 1992-01-01 08:00:00 0 -2015-01-01 10 42 0000-00-00 00:00:00 0 -d Date -k UInt64 -i32 Int32 -dt Date -s DateTime -CREATE TABLE test.alter ( d Date, k UInt64, i32 Int32, dt Date, s DateTime) ENGINE = MergeTree(d, k, 8192) -2015-01-01 6 38 2014-07-15 1970-01-02 06:55:00 -2015-01-01 7 39 2014-07-14 0000-00-00 00:00:00 -2015-01-01 8 40 2012-12-12 0000-00-00 00:00:00 -2015-01-01 9 41 1992-01-01 0000-00-00 00:00:00 -2015-01-01 10 42 0000-00-00 0000-00-00 00:00:00 +CREATE TABLE test.alter ( d Date, k UInt64, i32 Int32, s UInt32) ENGINE = MergeTree(d, k, 8192) +2015-01-01 6 38 100500 +2015-01-01 7 39 0 +2015-01-01 8 40 0 +2015-01-01 10 42 0 diff --git a/dbms/tests/queries/0_stateless/00061_merge_tree_alter.sql b/dbms/tests/queries/0_stateless/00061_merge_tree_alter.sql index 37bbf100038..07ac6f1bb88 100644 --- a/dbms/tests/queries/0_stateless/00061_merge_tree_alter.sql +++ b/dbms/tests/queries/0_stateless/00061_merge_tree_alter.sql @@ -7,29 +7,22 @@ DESC TABLE test.alter; SHOW CREATE TABLE test.alter; SELECT * FROM test.alter ORDER BY k; -ALTER TABLE test.alter ADD COLUMN dt DateTime; -INSERT INTO test.alter VALUES ('2015-01-01', 9, 41, '1992-01-01 08:00:00'); - -DESC TABLE test.alter; -SHOW CREATE TABLE test.alter; -SELECT * FROM test.alter ORDER BY k; - ALTER TABLE test.alter ADD COLUMN n Nested(ui8 UInt8, s String); -INSERT INTO test.alter VALUES ('2015-01-01', 8, 40, '2012-12-12 12:12:12', [1,2,3], ['12','13','14']); +INSERT INTO test.alter VALUES ('2015-01-01', 8, 40, [1,2,3], ['12','13','14']); DESC TABLE test.alter; SHOW CREATE TABLE test.alter; SELECT * FROM test.alter ORDER BY k; ALTER TABLE test.alter ADD COLUMN `n.d` Array(Date); -INSERT INTO test.alter VALUES ('2015-01-01', 7, 39, '2014-07-14 13:26:50', [10,20,30], ['120','130','140'],['2000-01-01','2000-01-01','2000-01-03']); +INSERT INTO test.alter VALUES ('2015-01-01', 7, 39, [10,20,30], ['120','130','140'],['2000-01-01','2000-01-01','2000-01-03']); DESC TABLE test.alter; SHOW CREATE TABLE test.alter; SELECT * FROM test.alter ORDER BY k; ALTER TABLE test.alter ADD COLUMN s String DEFAULT '0'; -INSERT INTO test.alter VALUES ('2015-01-01', 6,38,'2014-07-15 13:26:50',[10,20,30],['asd','qwe','qwe'],['2000-01-01','2000-01-01','2000-01-03'],'100500'); +INSERT INTO test.alter VALUES ('2015-01-01', 6,38,[10,20,30],['asd','qwe','qwe'],['2000-01-01','2000-01-01','2000-01-03'],'100500'); DESC TABLE test.alter; SHOW CREATE TABLE test.alter; @@ -75,10 +68,4 @@ DESC TABLE test.alter; SHOW CREATE TABLE test.alter; SELECT * FROM test.alter ORDER BY k; -ALTER TABLE test.alter MODIFY COLUMN dt Date, MODIFY COLUMN s DateTime; - -DESC TABLE test.alter; -SHOW CREATE TABLE test.alter; -SELECT * FROM test.alter ORDER BY k; - DROP TABLE test.alter;