diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java index 77631f0..9a17c3c 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java @@ -1927,15 +1927,15 @@ private int showCreateTable(Hive db, ShowCreateTableDesc showCreateTbl) throws H outStream = fs.create(resFile); if (tbl.isView()) { - String createTab_stmt = "CREATE VIEW " + tableName + " AS " + tbl.getViewExpandedText(); + String createTab_stmt = "CREATE VIEW `" + tableName + "` AS " + tbl.getViewExpandedText(); outStream.writeBytes(createTab_stmt.toString()); ((FSDataOutputStream) outStream).close(); outStream = null; return 0; } - ST createTab_stmt = new ST("CREATE <" + EXTERNAL + "> TABLE " + - tableName + "(\n" + + ST createTab_stmt = new ST("CREATE <" + EXTERNAL + "> TABLE `" + + tableName + "`(\n" + "<" + LIST_COLUMNS + ">)\n" + "<" + TBL_COMMENT + ">\n" + "<" + LIST_PARTITIONS + ">\n" + @@ -1958,7 +1958,7 @@ private int showCreateTable(Hive db, ShowCreateTableDesc showCreateTbl) throws H List cols = tbl.getCols(); List columns = new ArrayList(); for (FieldSchema col : cols) { - String columnDesc = " " + col.getName() + " " + col.getType(); + String columnDesc = " `" + col.getName() + "` " + col.getType(); if (col.getComment() != null) { columnDesc = columnDesc + " COMMENT '" + escapeHiveCommand(col.getComment()) + "'"; } @@ -1981,7 +1981,7 @@ private int showCreateTable(Hive db, ShowCreateTableDesc showCreateTbl) throws H tbl_partitions += "PARTITIONED BY ( \n"; List partCols = new ArrayList(); for (FieldSchema partKey : partKeys) { - String partColDesc = " " + partKey.getName() + " " + partKey.getType(); + String partColDesc = " `" + partKey.getName() + "` " + partKey.getType(); if (partKey.getComment() != null) { partColDesc = partColDesc + " COMMENT '" + escapeHiveCommand(partKey.getComment()) + "'"; diff --git ql/src/test/results/clientpositive/show_create_table_alter.q.out ql/src/test/results/clientpositive/show_create_table_alter.q.out index 8ed807d..7096820 100644 --- ql/src/test/results/clientpositive/show_create_table_alter.q.out +++ ql/src/test/results/clientpositive/show_create_table_alter.q.out @@ -15,9 +15,9 @@ PREHOOK: Input: default@tmp_showcrt1 POSTHOOK: query: SHOW CREATE TABLE tmp_showcrt1 POSTHOOK: type: SHOW_CREATETABLE POSTHOOK: Input: default@tmp_showcrt1 -CREATE EXTERNAL TABLE tmp_showcrt1( - key smallint, - value float) +CREATE EXTERNAL TABLE `tmp_showcrt1`( + `key` smallint, + `value` float) CLUSTERED BY ( key) SORTED BY ( @@ -49,9 +49,9 @@ PREHOOK: Input: default@tmp_showcrt1 POSTHOOK: query: SHOW CREATE TABLE tmp_showcrt1 POSTHOOK: type: SHOW_CREATETABLE POSTHOOK: Input: default@tmp_showcrt1 -CREATE TABLE tmp_showcrt1( - key smallint, - value float) +CREATE TABLE `tmp_showcrt1`( + `key` smallint, + `value` float) COMMENT 'temporary table' CLUSTERED BY ( key) @@ -85,9 +85,9 @@ PREHOOK: Input: default@tmp_showcrt1 POSTHOOK: query: SHOW CREATE TABLE tmp_showcrt1 POSTHOOK: type: SHOW_CREATETABLE POSTHOOK: Input: default@tmp_showcrt1 -CREATE EXTERNAL TABLE tmp_showcrt1( - key smallint, - value float) +CREATE EXTERNAL TABLE `tmp_showcrt1`( + `key` smallint, + `value` float) COMMENT 'changed comment' CLUSTERED BY ( key) @@ -120,9 +120,9 @@ PREHOOK: Input: default@tmp_showcrt1 POSTHOOK: query: SHOW CREATE TABLE tmp_showcrt1 POSTHOOK: type: SHOW_CREATETABLE POSTHOOK: Input: default@tmp_showcrt1 -CREATE EXTERNAL TABLE tmp_showcrt1( - key smallint, - value float) +CREATE EXTERNAL TABLE `tmp_showcrt1`( + `key` smallint, + `value` float) COMMENT 'changed comment' CLUSTERED BY ( key) @@ -155,9 +155,9 @@ PREHOOK: Input: default@tmp_showcrt1 POSTHOOK: query: SHOW CREATE TABLE tmp_showcrt1 POSTHOOK: type: SHOW_CREATETABLE POSTHOOK: Input: default@tmp_showcrt1 -CREATE EXTERNAL TABLE tmp_showcrt1( - key smallint, - value float) +CREATE EXTERNAL TABLE `tmp_showcrt1`( + `key` smallint, + `value` float) COMMENT 'changed comment' CLUSTERED BY ( key) diff --git ql/src/test/results/clientpositive/show_create_table_db_table.q.out ql/src/test/results/clientpositive/show_create_table_db_table.q.out index 77b91bd..92bdff9 100644 --- ql/src/test/results/clientpositive/show_create_table_db_table.q.out +++ ql/src/test/results/clientpositive/show_create_table_db_table.q.out @@ -27,9 +27,9 @@ PREHOOK: Input: tmp_feng@tmp_showcrt POSTHOOK: query: SHOW CREATE TABLE tmp_feng.tmp_showcrt POSTHOOK: type: SHOW_CREATETABLE POSTHOOK: Input: tmp_feng@tmp_showcrt -CREATE TABLE tmp_feng.tmp_showcrt( - key string, - value int) +CREATE TABLE `tmp_feng.tmp_showcrt`( + `key` string, + `value` int) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe' STORED AS INPUTFORMAT diff --git ql/src/test/results/clientpositive/show_create_table_delimited.q.out ql/src/test/results/clientpositive/show_create_table_delimited.q.out index 3329825..088b075 100644 --- ql/src/test/results/clientpositive/show_create_table_delimited.q.out +++ ql/src/test/results/clientpositive/show_create_table_delimited.q.out @@ -19,10 +19,10 @@ PREHOOK: Input: default@tmp_showcrt1 POSTHOOK: query: SHOW CREATE TABLE tmp_showcrt1 POSTHOOK: type: SHOW_CREATETABLE POSTHOOK: Input: default@tmp_showcrt1 -CREATE TABLE tmp_showcrt1( - key int, - value string, - newvalue bigint) +CREATE TABLE `tmp_showcrt1`( + `key` int, + `value` string, + `newvalue` bigint) ROW FORMAT DELIMITED FIELDS TERMINATED BY ',' COLLECTION ITEMS TERMINATED BY '|' diff --git ql/src/test/results/clientpositive/show_create_table_partitioned.q.out ql/src/test/results/clientpositive/show_create_table_partitioned.q.out index 99533c7..b66ea9e 100644 --- ql/src/test/results/clientpositive/show_create_table_partitioned.q.out +++ ql/src/test/results/clientpositive/show_create_table_partitioned.q.out @@ -17,12 +17,12 @@ PREHOOK: Input: default@tmp_showcrt1 POSTHOOK: query: SHOW CREATE TABLE tmp_showcrt1 POSTHOOK: type: SHOW_CREATETABLE POSTHOOK: Input: default@tmp_showcrt1 -CREATE EXTERNAL TABLE tmp_showcrt1( - key string, - newvalue boolean COMMENT 'a new value') +CREATE EXTERNAL TABLE `tmp_showcrt1`( + `key` string, + `newvalue` boolean COMMENT 'a new value') COMMENT 'temporary table' PARTITIONED BY ( - value bigint COMMENT 'some value') + `value` bigint COMMENT 'some value') ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe' STORED AS INPUTFORMAT diff --git ql/src/test/results/clientpositive/show_create_table_serde.q.out ql/src/test/results/clientpositive/show_create_table_serde.q.out index 4579714..811ae4a 100644 --- ql/src/test/results/clientpositive/show_create_table_serde.q.out +++ ql/src/test/results/clientpositive/show_create_table_serde.q.out @@ -23,10 +23,10 @@ PREHOOK: Input: default@tmp_showcrt1 POSTHOOK: query: SHOW CREATE TABLE tmp_showcrt1 POSTHOOK: type: SHOW_CREATETABLE POSTHOOK: Input: default@tmp_showcrt1 -CREATE TABLE tmp_showcrt1( - key int, - value string, - newvalue bigint) +CREATE TABLE `tmp_showcrt1`( + `key` int, + `value` string, + `newvalue` bigint) COMMENT 'temporary table' ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe' @@ -65,9 +65,9 @@ PREHOOK: Input: default@tmp_showcrt1 POSTHOOK: query: SHOW CREATE TABLE tmp_showcrt1 POSTHOOK: type: SHOW_CREATETABLE POSTHOOK: Input: default@tmp_showcrt1 -CREATE EXTERNAL TABLE tmp_showcrt1( - key string, - value boolean) +CREATE EXTERNAL TABLE `tmp_showcrt1`( + `key` string, + `value` boolean) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe' STORED BY diff --git ql/src/test/results/clientpositive/show_create_table_view.q.out ql/src/test/results/clientpositive/show_create_table_view.q.out index 035d454..9f5309e 100644 --- ql/src/test/results/clientpositive/show_create_table_view.q.out +++ ql/src/test/results/clientpositive/show_create_table_view.q.out @@ -13,7 +13,7 @@ PREHOOK: Input: default@tmp_copy_src POSTHOOK: query: SHOW CREATE TABLE tmp_copy_src POSTHOOK: type: SHOW_CREATETABLE POSTHOOK: Input: default@tmp_copy_src -CREATE VIEW tmp_copy_src AS SELECT `src`.`key`, `src`.`value` FROM `default`.`src` +CREATE VIEW `tmp_copy_src` AS SELECT `src`.`key`, `src`.`value` FROM `default`.`src` PREHOOK: query: DROP VIEW tmp_copy_src PREHOOK: type: DROPVIEW PREHOOK: Input: default@tmp_copy_src