make ReplicatedMergeTree work with comments. ignore empty comments when make...

make ReplicatedMergeTree work with comments. ignore empty comments when make column_comments hashmap

dbms/src/Interpreters/InterpreterCreateQuery.cpp

@@ -223,8 +223,8 @@ static ParsedColumns parseColumns(const ASTExpressionList & column_list_ast, con
 
         if (col_decl.comment)
         {
-            auto comment_literal = typeid_cast<ASTLiteral &>(*col_decl.comment);
-            comments.emplace(col_decl.name, comment_literal.value.get<String>());
+            if (auto comment_str = typeid_cast<ASTLiteral &>(*col_decl.comment).value.get<String>(); !comment_str.empty())
+                comments.emplace(col_decl.name, comment_str);
         }
     }
 

dbms/src/Storages/ColumnsDescription.h

@@ -9,6 +9,7 @@
 namespace DB
 {
 
+/// key-values column_name, column_comment. column_comment should be non empty.
 using ColumnComments = std::unordered_map<std::string, String>;
 
 struct ColumnsDescription

dbms/tests/queries/0_stateless/00062_replicated_merge_tree_alter_zookeeper.reference

-d	Date		
-k	UInt64		
-i32	Int32		
+d	Date			
+k	UInt64			
+i32	Int32			
 CREATE TABLE test.replicated_alter1 ( d Date,  k UInt64,  i32 Int32) ENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r1\', d, k, 8192)
-d	Date		
-k	UInt64		
-i32	Int32		
+d	Date			
+k	UInt64			
+i32	Int32			
 CREATE TABLE test.replicated_alter2 ( d Date,  k UInt64,  i32 Int32) ENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r2\', d, k, 8192)
 2015-01-01	10	42
-d	Date		
-k	UInt64		
-i32	Int32		
-dt	DateTime		
+d	Date			
+k	UInt64			
+i32	Int32			
+dt	DateTime			
 CREATE TABLE test.replicated_alter1 ( d Date,  k UInt64,  i32 Int32,  dt DateTime) ENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r1\', d, k, 8192)
-d	Date		
-k	UInt64		
-i32	Int32		
-dt	DateTime		
+d	Date			
+k	UInt64			
+i32	Int32			
+dt	DateTime			
 CREATE TABLE test.replicated_alter2 ( d Date,  k UInt64,  i32 Int32,  dt DateTime) ENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r2\', 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)		
+d	Date			
+k	UInt64			
+i32	Int32			
+dt	DateTime			
+n.ui8	Array(UInt8)			
+n.s	Array(String)			
 CREATE TABLE test.replicated_alter1 ( d Date,  k UInt64,  i32 Int32,  dt DateTime,  `n.ui8` Array(UInt8),  `n.s` Array(String)) ENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r1\', d, k, 8192)
-d	Date		
-k	UInt64		
-i32	Int32		
-dt	DateTime		
-n.ui8	Array(UInt8)		
-n.s	Array(String)		
+d	Date			
+k	UInt64			
+i32	Int32			
+dt	DateTime			
+n.ui8	Array(UInt8)			
+n.s	Array(String)			
 CREATE TABLE test.replicated_alter2 ( d Date,  k UInt64,  i32 Int32,  dt DateTime,  `n.ui8` Array(UInt8),  `n.s` Array(String)) ENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r2\', 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	[]	[]
-d	Date		
-k	UInt64		
-i32	Int32		
-dt	DateTime		
-n.ui8	Array(UInt8)		
-n.s	Array(String)		
-n.d	Array(Date)		
+d	Date			
+k	UInt64			
+i32	Int32			
+dt	DateTime			
+n.ui8	Array(UInt8)			
+n.s	Array(String)			
+n.d	Array(Date)			
 CREATE TABLE test.replicated_alter1 ( d Date,  k UInt64,  i32 Int32,  dt DateTime,  `n.ui8` Array(UInt8),  `n.s` Array(String),  `n.d` Array(Date)) ENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r1\', d, k, 8192)
-d	Date		
-k	UInt64		
-i32	Int32		
-dt	DateTime		
-n.ui8	Array(UInt8)		
-n.s	Array(String)		
-n.d	Array(Date)		
+d	Date			
+k	UInt64			
+i32	Int32			
+dt	DateTime			
+n.ui8	Array(UInt8)			
+n.s	Array(String)			
+n.d	Array(Date)			
 CREATE TABLE test.replicated_alter2 ( d Date,  k UInt64,  i32 Int32,  dt DateTime,  `n.ui8` Array(UInt8),  `n.s` Array(String),  `n.d` Array(Date)) ENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r2\', 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	[]	[]	[]
-d	Date		
-k	UInt64		
-i32	Int32		
-dt	DateTime		
-n.ui8	Array(UInt8)		
-n.s	Array(String)		
-n.d	Array(Date)		
-s	String	DEFAULT	\'0\'
+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.replicated_alter1 ( 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 = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r1\', d, k, 8192)
-d	Date		
-k	UInt64		
-i32	Int32		
-dt	DateTime		
-n.ui8	Array(UInt8)		
-n.s	Array(String)		
-n.d	Array(Date)		
-s	String	DEFAULT	\'0\'
+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.replicated_alter2 ( 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 = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r2\', 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
-d	Date		
-k	UInt64		
-i32	Int32		
-dt	DateTime		
-n.ui8	Array(UInt8)		
-n.s	Array(String)		
-s	Int64		
+d	Date			
+k	UInt64			
+i32	Int32			
+dt	DateTime			
+n.ui8	Array(UInt8)			
+n.s	Array(String)			
+s	Int64			
 CREATE TABLE test.replicated_alter1 ( d Date,  k UInt64,  i32 Int32,  dt DateTime,  `n.ui8` Array(UInt8),  `n.s` Array(String),  s Int64) ENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r1\', d, k, 8192)
-d	Date		
-k	UInt64		
-i32	Int32		
-dt	DateTime		
-n.ui8	Array(UInt8)		
-n.s	Array(String)		
-s	Int64		
+d	Date			
+k	UInt64			
+i32	Int32			
+dt	DateTime			
+n.ui8	Array(UInt8)			
+n.s	Array(String)			
+s	Int64			
 CREATE TABLE test.replicated_alter2 ( d Date,  k UInt64,  i32 Int32,  dt DateTime,  `n.ui8` Array(UInt8),  `n.s` Array(String),  s Int64) ENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r2\', 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
-d	Date		
-k	UInt64		
-i32	Int32		
-dt	DateTime		
-n.ui8	Array(UInt8)		
-n.s	Array(String)		
-s	UInt32		
-n.d	Array(Date)		
+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.replicated_alter1 ( d Date,  k UInt64,  i32 Int32,  dt DateTime,  `n.ui8` Array(UInt8),  `n.s` Array(String),  s UInt32,  `n.d` Array(Date)) ENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r1\', d, k, 8192)
-d	Date		
-k	UInt64		
-i32	Int32		
-dt	DateTime		
-n.ui8	Array(UInt8)		
-n.s	Array(String)		
-s	UInt32		
-n.d	Array(Date)		
+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.replicated_alter2 ( d Date,  k UInt64,  i32 Int32,  dt DateTime,  `n.ui8` Array(UInt8),  `n.s` Array(String),  s UInt32,  `n.d` Array(Date)) ENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r2\', 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	[]
-d	Date		
-k	UInt64		
-i32	Int32		
-dt	DateTime		
-n.s	Array(String)		
-s	UInt32		
+d	Date			
+k	UInt64			
+i32	Int32			
+dt	DateTime			
+n.s	Array(String)			
+s	UInt32			
 CREATE TABLE test.replicated_alter1 ( d Date,  k UInt64,  i32 Int32,  dt DateTime,  `n.s` Array(String),  s UInt32) ENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r1\', d, k, 8192)
-d	Date		
-k	UInt64		
-i32	Int32		
-dt	DateTime		
-n.s	Array(String)		
-s	UInt32		
+d	Date			
+k	UInt64			
+i32	Int32			
+dt	DateTime			
+n.s	Array(String)			
+s	UInt32			
 CREATE TABLE test.replicated_alter2 ( d Date,  k UInt64,  i32 Int32,  dt DateTime,  `n.s` Array(String),  s UInt32) ENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r2\', 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
-d	Date		
-k	UInt64		
-i32	Int32		
-dt	DateTime		
-s	UInt32		
+d	Date			
+k	UInt64			
+i32	Int32			
+dt	DateTime			
+s	UInt32			
 CREATE TABLE test.replicated_alter1 ( d Date,  k UInt64,  i32 Int32,  dt DateTime,  s UInt32) ENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r1\', d, k, 8192)
-d	Date		
-k	UInt64		
-i32	Int32		
-dt	DateTime		
-s	UInt32		
+d	Date			
+k	UInt64			
+i32	Int32			
+dt	DateTime			
+s	UInt32			
 CREATE TABLE test.replicated_alter2 ( d Date,  k UInt64,  i32 Int32,  dt DateTime,  s UInt32) ENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r2\', 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	DateTime		
-s	UInt32		
-n.s	Array(String)		
-n.d	Array(Date)		
+d	Date			
+k	UInt64			
+i32	Int32			
+dt	DateTime			
+s	UInt32			
+n.s	Array(String)			
+n.d	Array(Date)			
 CREATE TABLE test.replicated_alter1 ( d Date,  k UInt64,  i32 Int32,  dt DateTime,  s UInt32,  `n.s` Array(String),  `n.d` Array(Date)) ENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r1\', d, k, 8192)
-d	Date		
-k	UInt64		
-i32	Int32		
-dt	DateTime		
-s	UInt32		
-n.s	Array(String)		
-n.d	Array(Date)		
+d	Date			
+k	UInt64			
+i32	Int32			
+dt	DateTime			
+s	UInt32			
+n.s	Array(String)			
+n.d	Array(Date)			
 CREATE TABLE test.replicated_alter2 ( d Date,  k UInt64,  i32 Int32,  dt DateTime,  s UInt32,  `n.s` Array(String),  `n.d` Array(Date)) ENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r2\', 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	DateTime		
-s	UInt32		
+d	Date			
+k	UInt64			
+i32	Int32			
+dt	DateTime			
+s	UInt32			
 CREATE TABLE test.replicated_alter1 ( d Date,  k UInt64,  i32 Int32,  dt DateTime,  s UInt32) ENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r1\', d, k, 8192)
-d	Date		
-k	UInt64		
-i32	Int32		
-dt	DateTime		
-s	UInt32		
+d	Date			
+k	UInt64			
+i32	Int32			
+dt	DateTime			
+s	UInt32			
 CREATE TABLE test.replicated_alter2 ( d Date,  k UInt64,  i32 Int32,  dt DateTime,  s UInt32) ENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r2\', 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		
+d	Date			
+k	UInt64			
+i32	Int32			
+dt	Date			
+s	DateTime			
 CREATE TABLE test.replicated_alter1 ( d Date,  k UInt64,  i32 Int32,  dt Date,  s DateTime) ENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r1\', d, k, 8192)
-d	Date		
-k	UInt64		
-i32	Int32		
-dt	Date		
-s	DateTime		
+d	Date			
+k	UInt64			
+i32	Int32			
+dt	Date			
+s	DateTime			
 CREATE TABLE test.replicated_alter2 ( d Date,  k UInt64,  i32 Int32,  dt Date,  s DateTime) ENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test/alter\', \'r2\', 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

dbms/tests/queries/0_stateless/00643_cast_zookeeper.reference

 CREATE TABLE test.cast1 ( x UInt8,  e Enum8('hello' = 1, 'world' = 2) DEFAULT CAST(x, 'Enum8(\'hello\' = 1, \'world\' = 2)')) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_cast', 'r1') ORDER BY e SETTINGS index_granularity = 8192
-x	UInt8		
-e	Enum8(\'hello\' = 1, \'world\' = 2)	DEFAULT	CAST(x, \'Enum8(\\\'hello\\\' = 1, \\\'world\\\' = 2)\')
+x	UInt8			
+e	Enum8(\'hello\' = 1, \'world\' = 2)	DEFAULT	CAST(x, \'Enum8(\\\'hello\\\' = 1, \\\'world\\\' = 2)\')	
 1	hello
 1	hello

dbms/tests/queries/0_stateless/00753_comment_columns_zookeeper.reference

+CREATE TABLE test.check_comments ( column_name1 UInt8 DEFAULT 1 COMMENT \'comment\') ENGINE = ReplicatedMergeTree(\'clickhouse/tables/test_comments\', \'r1\') ORDER BY column_name1 SETTINGS index_granularity = 8192
+column_name1	UInt8	DEFAULT	1	comment
+CREATE TABLE test.check_comments ( column_name1 UInt8 DEFAULT 1 COMMENT \'another comment\') ENGINE = ReplicatedMergeTree(\'clickhouse/tables/test_comments\', \'r1\') ORDER BY column_name1 SETTINGS index_granularity = 8192
+column_name1	UInt8	DEFAULT	1	another comment

dbms/tests/queries/0_stateless/00753_comment_columns_zookeeper.sql

+DROP TABLE IF EXISTS test.check_comments;
+
+CREATE TABLE test.check_comments
+  (
+    column_name1 UInt8 DEFAULT 1 COMMENT 'comment'
+  ) ENGINE = ReplicatedMergeTree('clickhouse/tables/test_comments', 'r1')
+    ORDER BY column_name1;
+
+SHOW CREATE test.check_comments;
+DESC test.check_comments;
+
+ALTER TABLE test.check_comments COMMENT COLUMN column_name1 'another comment';
+
+SHOW CREATE test.check_comments;
+DESC test.check_comments;
+
+SELECT * FROM system.columns WHERE table = 'check.comments' and database = 'test';
+
+DROP TABLE test.check_comments;