diff --git hbase-handler/src/test/results/positive/hbase_queries.q.out hbase-handler/src/test/results/positive/hbase_queries.q.out index 6a4f68b..34e0a01 100644 --- hbase-handler/src/test/results/positive/hbase_queries.q.out +++ hbase-handler/src/test/results/positive/hbase_queries.q.out @@ -17,8 +17,10 @@ PREHOOK: query: DESCRIBE EXTENDED hbase_table_1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED hbase_table_1 POSTHOOK: type: DESCTABLE -key int from deserializer -value string from deserializer +# col_name data_type comment + +key int from deserializer +value string from deserializer #### A masked pattern was here #### PREHOOK: query: select * from hbase_table_1 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 46387ba..90c1a8e 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java @@ -2264,7 +2264,7 @@ public class DDLTask extends Task implements Serializable { List cols = table.getCols(); cols.addAll(table.getPartCols()); - outStream.writeBytes(MetaDataFormatUtils.displayColsUnformatted(cols)); + outStream.writeBytes(MetaDataFormatUtils.getAllColumnsInformation(cols)); ((FSDataOutputStream) outStream).close(); outStream = null; } catch (IOException e) { diff --git ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/MetaDataFormatUtils.java ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/MetaDataFormatUtils.java index 9ecb271..997dfa0 100644 --- ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/MetaDataFormatUtils.java +++ ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/MetaDataFormatUtils.java @@ -125,22 +125,6 @@ public final class MetaDataFormatUtils { return indexInfo.toString(); } - /* - Displaying columns unformatted for backward compatibility. - */ - public static String displayColsUnformatted(List cols) { - StringBuilder colBuffer = new StringBuilder(DEFAULT_STRINGBUILDER_SIZE); - for (FieldSchema col : cols) { - colBuffer.append(col.getName()); - colBuffer.append(FIELD_DELIM); - colBuffer.append(col.getType()); - colBuffer.append(FIELD_DELIM); - colBuffer.append(col.getComment() == null ? "" : col.getComment()); - colBuffer.append(LINE_DELIM); - } - return colBuffer.toString(); - } - public static String getPartitionInformation(Partition part) { StringBuilder tableInfo = new StringBuilder(DEFAULT_STRINGBUILDER_SIZE); @@ -295,11 +279,23 @@ public final class MetaDataFormatUtils { tableInfo.append(String.format("%-" + ALIGNMENT + "s", value)).append(LINE_DELIM); } - private static void formatOutput(String col1, String col2, String col3, + private static void formatOutput(String colName, String colType, String colComment, StringBuilder tableInfo) { - tableInfo.append(String.format("%-" + ALIGNMENT + "s", col1)).append(FIELD_DELIM); - tableInfo.append(String.format("%-" + ALIGNMENT + "s", col2)).append(FIELD_DELIM); - tableInfo.append(String.format("%-" + ALIGNMENT + "s", col3)).append(LINE_DELIM); + tableInfo.append(String.format("%-" + ALIGNMENT + "s", colName)).append(FIELD_DELIM); + tableInfo.append(String.format("%-" + ALIGNMENT + "s", colType)).append(FIELD_DELIM); + + // comment indent processing for multi-line comments + // comments should be indented the same amount on each line + // if the first line comment starts indented by k, + // the following line comments should also be indented by k + String[] commentSegments = colComment.split("\n|\r|\r\n"); + tableInfo.append(String.format("%-" + ALIGNMENT + "s", commentSegments[0])).append(LINE_DELIM); + int colNameLength = ALIGNMENT > colName.length() ? ALIGNMENT : colName.length(); + int colTypeLength = ALIGNMENT > colType.length() ? ALIGNMENT : colType.length(); + for (int i = 1; i < commentSegments.length; i++) { + tableInfo.append(String.format("%" + colNameLength + "s" + FIELD_DELIM + "%" + + colTypeLength + "s" + FIELD_DELIM + "%s", "", "", commentSegments[i])).append(LINE_DELIM); + } } public static String[] getColumnsHeader() { diff --git ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/TextMetaDataFormatter.java ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/TextMetaDataFormatter.java index 1411667..67eb3d1 100644 --- ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/TextMetaDataFormatter.java +++ ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/TextMetaDataFormatter.java @@ -125,60 +125,50 @@ public class TextMetaDataFormatter implements MetaDataFormatter { String colPath, String tableName, Table tbl, Partition part, List cols, boolean isFormatted, boolean isExt) - throws HiveException - { - try { - if (colPath.equals(tableName)) { - if (!isFormatted) { - outStream.writeBytes(MetaDataFormatUtils.displayColsUnformatted(cols)); - } else { - outStream.writeBytes( - MetaDataFormatUtils.getAllColumnsInformation(cols, - tbl.isPartitioned() ? tbl.getPartCols() : null)); - } - } else { - if (isFormatted) { - outStream.writeBytes(MetaDataFormatUtils.getAllColumnsInformation(cols)); - } else { - outStream.writeBytes(MetaDataFormatUtils.displayColsUnformatted(cols)); - } - } - - if (tableName.equals(colPath)) { + throws HiveException { + try { + if (colPath.equals(tableName)) { + outStream.writeBytes( + MetaDataFormatUtils.getAllColumnsInformation( + cols, tbl.isPartitioned() ? tbl.getPartCols() : null)); + } else { + outStream.writeBytes(MetaDataFormatUtils.getAllColumnsInformation(cols)); + } - if (isFormatted) { - if (part != null) { - outStream.writeBytes(MetaDataFormatUtils.getPartitionInformation(part)); - } else { - outStream.writeBytes(MetaDataFormatUtils.getTableInformation(tbl)); - } - } + if (tableName.equals(colPath)) { + if (isFormatted) { + if (part != null) { + outStream.writeBytes(MetaDataFormatUtils.getPartitionInformation(part)); + } else { + outStream.writeBytes(MetaDataFormatUtils.getTableInformation(tbl)); + } + } - // if extended desc table then show the complete details of the table - if (isExt) { - // add empty line - outStream.write(terminator); - if (part != null) { - // show partition information - outStream.writeBytes("Detailed Partition Information"); - outStream.write(separator); - outStream.writeBytes(part.getTPartition().toString()); - outStream.write(separator); - // comment column is empty - outStream.write(terminator); - } else { - // show table information - outStream.writeBytes("Detailed Table Information"); - outStream.write(separator); - outStream.writeBytes(tbl.getTTable().toString()); - outStream.write(separator); - outStream.write(terminator); - } - } - } - } catch (IOException e) { - throw new HiveException(e); - } + // if extended desc table then show the complete details of the table + if (isExt) { + // add empty line + outStream.write(terminator); + if (part != null) { + // show partition information + outStream.writeBytes("Detailed Partition Information"); + outStream.write(separator); + outStream.writeBytes(part.getTPartition().toString()); + outStream.write(separator); + // comment column is empty + outStream.write(terminator); + } else { + // show table information + outStream.writeBytes("Detailed Table Information"); + outStream.write(separator); + outStream.writeBytes(tbl.getTTable().toString()); + outStream.write(separator); + outStream.write(terminator); + } + } + } + } catch (IOException e) { + throw new HiveException(e); + } } public void showTableStatus(DataOutputStream outStream, diff --git ql/src/test/queries/clientpositive/describe_comment_indent.q ql/src/test/queries/clientpositive/describe_comment_indent.q new file mode 100644 index 0000000..310b694 --- /dev/null +++ ql/src/test/queries/clientpositive/describe_comment_indent.q @@ -0,0 +1,14 @@ +-- test comment indent processing for multi-line comments + +CREATE TABLE test_table( + col1 INT COMMENT 'col1 one line comment', + col2 STRING COMMENT 'col2 +two lines comment', + col3 STRING COMMENT 'col3 +three lines +comment') +COMMENT 'table comment +two lines'; + +DESCRIBE test_table; +DESCRIBE FORMATTED test_table; diff --git ql/src/test/results/clientpositive/alter1.q.out ql/src/test/results/clientpositive/alter1.q.out index 8c8f77a..4e5bbdc 100644 --- ql/src/test/results/clientpositive/alter1.q.out +++ ql/src/test/results/clientpositive/alter1.q.out @@ -7,8 +7,10 @@ PREHOOK: query: describe extended alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended alter1 POSTHOOK: type: DESCTABLE -a int -b int +# col_name data_type comment + +a int None +b int None #### A masked pattern was here #### PREHOOK: query: alter table alter1 set tblproperties ('a'='1', 'c'='3') @@ -23,8 +25,10 @@ PREHOOK: query: describe extended alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended alter1 POSTHOOK: type: DESCTABLE -a int -b int +# col_name data_type comment + +a int None +b int None #### A masked pattern was here #### PREHOOK: query: alter table alter1 set tblproperties ('a'='1', 'c'='4', 'd'='3') @@ -39,8 +43,10 @@ PREHOOK: query: describe extended alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended alter1 POSTHOOK: type: DESCTABLE -a int -b int +# col_name data_type comment + +a int None +b int None #### A masked pattern was here #### PREHOOK: query: alter table alter1 set tblproperties ('EXTERNAL'='TRUE') @@ -55,8 +61,10 @@ PREHOOK: query: describe extended alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended alter1 POSTHOOK: type: DESCTABLE -a int -b int +# col_name data_type comment + +a int None +b int None #### A masked pattern was here #### PREHOOK: query: alter table alter1 set tblproperties ('EXTERNAL'='FALSE') @@ -71,8 +79,10 @@ PREHOOK: query: describe extended alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended alter1 POSTHOOK: type: DESCTABLE -a int -b int +# col_name data_type comment + +a int None +b int None #### A masked pattern was here #### PREHOOK: query: alter table alter1 set serdeproperties('s1'='9') @@ -87,8 +97,10 @@ PREHOOK: query: describe extended alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended alter1 POSTHOOK: type: DESCTABLE -a int -b int +# col_name data_type comment + +a int None +b int None #### A masked pattern was here #### PREHOOK: query: alter table alter1 set serdeproperties('s1'='10', 's2' ='20') @@ -103,8 +115,10 @@ PREHOOK: query: describe extended alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended alter1 POSTHOOK: type: DESCTABLE -a int -b int +# col_name data_type comment + +a int None +b int None #### A masked pattern was here #### PREHOOK: query: alter table alter1 set serde 'org.apache.hadoop.hive.serde2.TestSerDe' with serdeproperties('s1'='9') @@ -119,8 +133,10 @@ PREHOOK: query: describe extended alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended alter1 POSTHOOK: type: DESCTABLE -a string from deserializer -b string from deserializer +# col_name data_type comment + +a string from deserializer +b string from deserializer #### A masked pattern was here #### PREHOOK: query: alter table alter1 set serde 'org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe' @@ -135,8 +151,10 @@ PREHOOK: query: describe extended alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended alter1 POSTHOOK: type: DESCTABLE -a string from deserializer -b string from deserializer +# col_name data_type comment + +a string from deserializer +b string from deserializer #### A masked pattern was here #### PREHOOK: query: alter table alter1 replace columns (a int, b int, c string) @@ -151,9 +169,11 @@ PREHOOK: query: describe alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: describe alter1 POSTHOOK: type: DESCTABLE -a int -b int -c string +# col_name data_type comment + +a int None +b int None +c string None PREHOOK: query: -- Cleanup DROP TABLE alter1 PREHOOK: type: DROPTABLE @@ -201,8 +221,10 @@ PREHOOK: query: DESCRIBE EXTENDED alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED alter1 POSTHOOK: type: DESCTABLE -a int -b int +# col_name data_type comment + +a int None +b int None #### A masked pattern was here #### PREHOOK: query: ALTER TABLE alter1 SET TBLPROPERTIES ('a'='1', 'c'='3') @@ -217,8 +239,10 @@ PREHOOK: query: DESCRIBE EXTENDED alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED alter1 POSTHOOK: type: DESCTABLE -a int -b int +# col_name data_type comment + +a int None +b int None #### A masked pattern was here #### PREHOOK: query: ALTER TABLE alter1 SET TBLPROPERTIES ('a'='1', 'c'='4', 'd'='3') @@ -233,8 +257,10 @@ PREHOOK: query: DESCRIBE EXTENDED alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED alter1 POSTHOOK: type: DESCTABLE -a int -b int +# col_name data_type comment + +a int None +b int None #### A masked pattern was here #### PREHOOK: query: ALTER TABLE alter1 SET TBLPROPERTIES ('EXTERNAL'='TRUE') @@ -249,8 +275,10 @@ PREHOOK: query: DESCRIBE EXTENDED alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED alter1 POSTHOOK: type: DESCTABLE -a int -b int +# col_name data_type comment + +a int None +b int None #### A masked pattern was here #### PREHOOK: query: ALTER TABLE alter1 SET TBLPROPERTIES ('EXTERNAL'='FALSE') @@ -265,8 +293,10 @@ PREHOOK: query: DESCRIBE EXTENDED alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED alter1 POSTHOOK: type: DESCTABLE -a int -b int +# col_name data_type comment + +a int None +b int None #### A masked pattern was here #### PREHOOK: query: ALTER TABLE alter1 SET SERDEPROPERTIES('s1'='9') @@ -281,8 +311,10 @@ PREHOOK: query: DESCRIBE EXTENDED alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED alter1 POSTHOOK: type: DESCTABLE -a int -b int +# col_name data_type comment + +a int None +b int None #### A masked pattern was here #### PREHOOK: query: ALTER TABLE alter1 SET SERDEPROPERTIES('s1'='10', 's2' ='20') @@ -297,8 +329,10 @@ PREHOOK: query: DESCRIBE EXTENDED alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED alter1 POSTHOOK: type: DESCTABLE -a int -b int +# col_name data_type comment + +a int None +b int None #### A masked pattern was here #### PREHOOK: query: ALTER TABLE alter1 SET SERDE 'org.apache.hadoop.hive.serde2.TestSerDe' WITH SERDEPROPERTIES ('s1'='9') @@ -313,8 +347,10 @@ PREHOOK: query: DESCRIBE EXTENDED alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED alter1 POSTHOOK: type: DESCTABLE -a string from deserializer -b string from deserializer +# col_name data_type comment + +a string from deserializer +b string from deserializer #### A masked pattern was here #### PREHOOK: query: ALTER TABLE alter1 SET SERDE 'org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe' @@ -329,8 +365,10 @@ PREHOOK: query: DESCRIBE EXTENDED alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED alter1 POSTHOOK: type: DESCTABLE -a string from deserializer -b string from deserializer +# col_name data_type comment + +a string from deserializer +b string from deserializer #### A masked pattern was here #### PREHOOK: query: ALTER TABLE alter1 REPLACE COLUMNS (a int, b int, c string) @@ -345,9 +383,11 @@ PREHOOK: query: DESCRIBE alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE alter1 POSTHOOK: type: DESCTABLE -a int -b int -c string +# col_name data_type comment + +a int None +b int None +c string None PREHOOK: query: DROP TABLE alter1 PREHOOK: type: DROPTABLE PREHOOK: Input: alter1_db@alter1 diff --git ql/src/test/results/clientpositive/alter2.q.out ql/src/test/results/clientpositive/alter2.q.out index fd57426..9923ab8 100644 --- ql/src/test/results/clientpositive/alter2.q.out +++ ql/src/test/results/clientpositive/alter2.q.out @@ -7,9 +7,16 @@ PREHOOK: query: describe extended alter2 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended alter2 POSTHOOK: type: DESCTABLE -a int -b int -insertdate string +# col_name data_type comment + +a int None +b int None +insertdate string None + +# Partition Information +# col_name data_type comment + +insertdate string None #### A masked pattern was here #### PREHOOK: query: show partitions alter2 @@ -27,9 +34,16 @@ PREHOOK: query: describe extended alter2 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended alter2 POSTHOOK: type: DESCTABLE -a int -b int -insertdate string +# col_name data_type comment + +a int None +b int None +insertdate string None + +# Partition Information +# col_name data_type comment + +insertdate string None #### A masked pattern was here #### PREHOOK: query: show partitions alter2 @@ -48,9 +62,16 @@ PREHOOK: query: describe extended alter2 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended alter2 POSTHOOK: type: DESCTABLE -a int -b int -insertdate string +# col_name data_type comment + +a int None +b int None +insertdate string None + +# Partition Information +# col_name data_type comment + +insertdate string None #### A masked pattern was here #### PREHOOK: query: show partitions alter2 @@ -76,9 +97,16 @@ PREHOOK: query: describe extended alter2 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended alter2 POSTHOOK: type: DESCTABLE -a int -b int -insertdate string +# col_name data_type comment + +a int None +b int None +insertdate string None + +# Partition Information +# col_name data_type comment + +insertdate string None #### A masked pattern was here #### PREHOOK: query: show partitions alter2 @@ -96,9 +124,16 @@ PREHOOK: query: describe extended alter2 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended alter2 POSTHOOK: type: DESCTABLE -a int -b int -insertdate string +# col_name data_type comment + +a int None +b int None +insertdate string None + +# Partition Information +# col_name data_type comment + +insertdate string None #### A masked pattern was here #### PREHOOK: query: show partitions alter2 @@ -117,9 +152,16 @@ PREHOOK: query: describe extended alter2 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended alter2 POSTHOOK: type: DESCTABLE -a int -b int -insertdate string +# col_name data_type comment + +a int None +b int None +insertdate string None + +# Partition Information +# col_name data_type comment + +insertdate string None #### A masked pattern was here #### PREHOOK: query: show partitions alter2 @@ -175,9 +217,16 @@ PREHOOK: query: DESCRIBE EXTENDED alter2 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED alter2 POSTHOOK: type: DESCTABLE -a int -b int -insertdate string +# col_name data_type comment + +a int None +b int None +insertdate string None + +# Partition Information +# col_name data_type comment + +insertdate string None #### A masked pattern was here #### PREHOOK: query: SHOW PARTITIONS alter2 @@ -195,9 +244,16 @@ PREHOOK: query: DESCRIBE EXTENDED alter2 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED alter2 POSTHOOK: type: DESCTABLE -a int -b int -insertdate string +# col_name data_type comment + +a int None +b int None +insertdate string None + +# Partition Information +# col_name data_type comment + +insertdate string None #### A masked pattern was here #### PREHOOK: query: SHOW PARTITIONS alter2 @@ -216,9 +272,16 @@ PREHOOK: query: DESCRIBE EXTENDED alter2 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED alter2 POSTHOOK: type: DESCTABLE -a int -b int -insertdate string +# col_name data_type comment + +a int None +b int None +insertdate string None + +# Partition Information +# col_name data_type comment + +insertdate string None #### A masked pattern was here #### PREHOOK: query: SHOW PARTITIONS alter2 @@ -244,9 +307,16 @@ PREHOOK: query: DESCRIBE EXTENDED alter2 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED alter2 POSTHOOK: type: DESCTABLE -a int -b int -insertdate string +# col_name data_type comment + +a int None +b int None +insertdate string None + +# Partition Information +# col_name data_type comment + +insertdate string None #### A masked pattern was here #### PREHOOK: query: SHOW PARTITIONS alter2 @@ -264,9 +334,16 @@ PREHOOK: query: DESCRIBE EXTENDED alter2 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED alter2 POSTHOOK: type: DESCTABLE -a int -b int -insertdate string +# col_name data_type comment + +a int None +b int None +insertdate string None + +# Partition Information +# col_name data_type comment + +insertdate string None #### A masked pattern was here #### PREHOOK: query: SHOW PARTITIONS alter2 @@ -285,9 +362,16 @@ PREHOOK: query: DESCRIBE EXTENDED alter2 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED alter2 POSTHOOK: type: DESCTABLE -a int -b int -insertdate string +# col_name data_type comment + +a int None +b int None +insertdate string None + +# Partition Information +# col_name data_type comment + +insertdate string None #### A masked pattern was here #### PREHOOK: query: SHOW PARTITIONS alter2 diff --git ql/src/test/results/clientpositive/alter3.q.out ql/src/test/results/clientpositive/alter3.q.out index 5f3b0b4..c8716ba 100644 --- ql/src/test/results/clientpositive/alter3.q.out +++ ql/src/test/results/clientpositive/alter3.q.out @@ -58,9 +58,17 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended alter3_renamed POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: alter3 PARTITION(pcol1=test_part:,pcol2=test_part:).col1 SIMPLE [(alter3_src)alter3_src.FieldSchema(name:col1, type:string, comment:null), ] -col1 string -pcol1 string -pcol2 string +# col_name data_type comment + +col1 string None +pcol1 string None +pcol2 string None + +# Partition Information +# col_name data_type comment + +pcol1 string None +pcol2 string None #### A masked pattern was here #### PREHOOK: query: describe extended alter3_renamed partition (pCol1='test_part:', pcol2='test_part:') @@ -68,9 +76,17 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended alter3_renamed partition (pCol1='test_part:', pcol2='test_part:') POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: alter3 PARTITION(pcol1=test_part:,pcol2=test_part:).col1 SIMPLE [(alter3_src)alter3_src.FieldSchema(name:col1, type:string, comment:null), ] -col1 string -pcol1 string -pcol2 string +# col_name data_type comment + +col1 string None +pcol1 string None +pcol2 string None + +# Partition Information +# col_name data_type comment + +pcol1 string None +pcol2 string None #### A masked pattern was here #### PREHOOK: query: select * from alter3_renamed where pcol1='test_part:' and pcol2='test_part:' @@ -119,9 +135,17 @@ POSTHOOK: query: describe extended alter3_like_renamed POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: alter3 PARTITION(pcol1=test_part:,pcol2=test_part:).col1 SIMPLE [(alter3_src)alter3_src.FieldSchema(name:col1, type:string, comment:null), ] POSTHOOK: Lineage: alter3_like PARTITION(pcol1=test_part:,pcol2=test_part:).col1 SIMPLE [(alter3_src)alter3_src.FieldSchema(name:col1, type:string, comment:null), ] -col1 string -pcol1 string -pcol2 string +# col_name data_type comment + +col1 string None +pcol1 string None +pcol2 string None + +# Partition Information +# col_name data_type comment + +pcol1 string None +pcol2 string None #### A masked pattern was here #### PREHOOK: query: -- Cleanup @@ -268,9 +292,17 @@ POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: alter3 PARTITION(pcol1=test_part:,pcol2=test_part:).col1 SIMPLE [(alter3_src)alter3_src.FieldSchema(name:col1, type:string, comment:null), ] POSTHOOK: Lineage: alter3 PARTITION(pcol1=test_part:,pcol2=test_part:).col1 SIMPLE [(alter3_src)alter3_src.FieldSchema(name:col1, type:string, comment:null), ] POSTHOOK: Lineage: alter3_like PARTITION(pcol1=test_part:,pcol2=test_part:).col1 SIMPLE [(alter3_src)alter3_src.FieldSchema(name:col1, type:string, comment:null), ] -col1 string -pcol1 string -pcol2 string +# col_name data_type comment + +col1 string None +pcol1 string None +pcol2 string None + +# Partition Information +# col_name data_type comment + +pcol1 string None +pcol2 string None #### A masked pattern was here #### PREHOOK: query: DESCRIBE EXTENDED alter3_renamed PARTITION (pCol1='test_part:', pcol2='test_part:') @@ -280,9 +312,17 @@ POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: alter3 PARTITION(pcol1=test_part:,pcol2=test_part:).col1 SIMPLE [(alter3_src)alter3_src.FieldSchema(name:col1, type:string, comment:null), ] POSTHOOK: Lineage: alter3 PARTITION(pcol1=test_part:,pcol2=test_part:).col1 SIMPLE [(alter3_src)alter3_src.FieldSchema(name:col1, type:string, comment:null), ] POSTHOOK: Lineage: alter3_like PARTITION(pcol1=test_part:,pcol2=test_part:).col1 SIMPLE [(alter3_src)alter3_src.FieldSchema(name:col1, type:string, comment:null), ] -col1 string -pcol1 string -pcol2 string +# col_name data_type comment + +col1 string None +pcol1 string None +pcol2 string None + +# Partition Information +# col_name data_type comment + +pcol1 string None +pcol2 string None #### A masked pattern was here #### PREHOOK: query: SELECT * FROM alter3_renamed WHERE pcol1='test_part:' AND pcol2='test_part:' @@ -339,8 +379,16 @@ POSTHOOK: Lineage: alter3 PARTITION(pcol1=test_part:,pcol2=test_part:).col1 SIMP POSTHOOK: Lineage: alter3 PARTITION(pcol1=test_part:,pcol2=test_part:).col1 SIMPLE [(alter3_src)alter3_src.FieldSchema(name:col1, type:string, comment:null), ] POSTHOOK: Lineage: alter3_like PARTITION(pcol1=test_part:,pcol2=test_part:).col1 SIMPLE [(alter3_src)alter3_src.FieldSchema(name:col1, type:string, comment:null), ] POSTHOOK: Lineage: alter3_like PARTITION(pcol1=test_part:,pcol2=test_part:).col1 SIMPLE [(alter3_src)alter3_src.FieldSchema(name:col1, type:string, comment:null), ] -col1 string -pcol1 string -pcol2 string +# col_name data_type comment + +col1 string None +pcol1 string None +pcol2 string None + +# Partition Information +# col_name data_type comment + +pcol1 string None +pcol2 string None #### A masked pattern was here #### diff --git ql/src/test/results/clientpositive/alter5.q.out ql/src/test/results/clientpositive/alter5.q.out index e60e7ca..1db890b 100644 --- ql/src/test/results/clientpositive/alter5.q.out +++ ql/src/test/results/clientpositive/alter5.q.out @@ -41,8 +41,15 @@ PREHOOK: query: describe extended alter5 partition (dt='a') PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended alter5 partition (dt='a') POSTHOOK: type: DESCTABLE -col1 string -dt string +# col_name data_type comment + +col1 string None +dt string None + +# Partition Information +# col_name data_type comment + +dt string None #### A masked pattern was here #### PREHOOK: query: insert overwrite table alter5 partition (dt='a') select col1 from alter5_src @@ -74,8 +81,15 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended alter5 partition (dt='a') POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: alter5 PARTITION(dt=a).col1 SIMPLE [(alter5_src)alter5_src.FieldSchema(name:col1, type:string, comment:null), ] -col1 string -dt string +# col_name data_type comment + +col1 string None +dt string None + +# Partition Information +# col_name data_type comment + +dt string None #### A masked pattern was here #### PREHOOK: query: -- Cleanup @@ -162,8 +176,15 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended alter5 partition (dt='a') POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: alter5 PARTITION(dt=a).col1 SIMPLE [(alter5_src)alter5_src.FieldSchema(name:col1, type:string, comment:null), ] -col1 string -dt string +# col_name data_type comment + +col1 string None +dt string None + +# Partition Information +# col_name data_type comment + +dt string None #### A masked pattern was here #### PREHOOK: query: insert overwrite table alter5 partition (dt='a') select col1 from alter5_src @@ -198,7 +219,14 @@ POSTHOOK: query: describe extended alter5 partition (dt='a') POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: alter5 PARTITION(dt=a).col1 SIMPLE [(alter5_src)alter5_src.FieldSchema(name:col1, type:string, comment:null), ] POSTHOOK: Lineage: alter5 PARTITION(dt=a).col1 SIMPLE [(alter5_src)alter5_src.FieldSchema(name:col1, type:string, comment:null), ] -col1 string -dt string +# col_name data_type comment + +col1 string None +dt string None + +# Partition Information +# col_name data_type comment + +dt string None #### A masked pattern was here #### diff --git ql/src/test/results/clientpositive/alter_table_serde.q.out ql/src/test/results/clientpositive/alter_table_serde.q.out index c88a985..0c80720 100644 --- ql/src/test/results/clientpositive/alter_table_serde.q.out +++ ql/src/test/results/clientpositive/alter_table_serde.q.out @@ -9,9 +9,11 @@ PREHOOK: query: describe extended test_table PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended test_table POSTHOOK: type: DESCTABLE -id int -query string -name string +# col_name data_type comment + +id int None +query string None +name string None #### A masked pattern was here #### PREHOOK: query: alter table test_table set serde 'org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe' @@ -26,9 +28,11 @@ PREHOOK: query: describe extended test_table PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended test_table POSTHOOK: type: DESCTABLE -id int from deserializer -query string from deserializer -name string from deserializer +# col_name data_type comment + +id int from deserializer +query string from deserializer +name string from deserializer #### A masked pattern was here #### PREHOOK: query: alter table test_table set serdeproperties ('field.delim' = ',') @@ -43,9 +47,11 @@ PREHOOK: query: describe extended test_table PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended test_table POSTHOOK: type: DESCTABLE -id int from deserializer -query string from deserializer -name string from deserializer +# col_name data_type comment + +id int from deserializer +query string from deserializer +name string from deserializer #### A masked pattern was here #### PREHOOK: query: drop table test_table @@ -74,10 +80,17 @@ PREHOOK: query: describe extended test_table partition (dt='2011') PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended test_table partition (dt='2011') POSTHOOK: type: DESCTABLE -id int -query string -name string -dt string +# col_name data_type comment + +id int None +query string None +name string None +dt string None + +# Partition Information +# col_name data_type comment + +dt string None #### A masked pattern was here #### PREHOOK: query: alter table test_table set serde 'org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe' @@ -92,10 +105,17 @@ PREHOOK: query: describe extended test_table partition (dt='2011') PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended test_table partition (dt='2011') POSTHOOK: type: DESCTABLE -id int -query string -name string -dt string +# col_name data_type comment + +id int None +query string None +name string None +dt string None + +# Partition Information +# col_name data_type comment + +dt string None #### A masked pattern was here #### PREHOOK: query: alter table test_table set serdeproperties ('field.delim' = ',') @@ -110,10 +130,17 @@ PREHOOK: query: describe extended test_table partition (dt='2011') PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended test_table partition (dt='2011') POSTHOOK: type: DESCTABLE -id int -query string -name string -dt string +# col_name data_type comment + +id int None +query string None +name string None +dt string None + +# Partition Information +# col_name data_type comment + +dt string None #### A masked pattern was here #### PREHOOK: query: -- test partitions @@ -133,10 +160,17 @@ PREHOOK: query: describe extended test_table partition (dt='2011') PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended test_table partition (dt='2011') POSTHOOK: type: DESCTABLE -id int -query string -name string -dt string +# col_name data_type comment + +id int None +query string None +name string None +dt string None + +# Partition Information +# col_name data_type comment + +dt string None #### A masked pattern was here #### PREHOOK: query: alter table test_table partition(dt='2011') set serdeproperties ('field.delim' = ',') @@ -152,10 +186,17 @@ PREHOOK: query: describe extended test_table partition (dt='2011') PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended test_table partition (dt='2011') POSTHOOK: type: DESCTABLE -id int -query string -name string -dt string +# col_name data_type comment + +id int None +query string None +name string None +dt string None + +# Partition Information +# col_name data_type comment + +dt string None #### A masked pattern was here #### PREHOOK: query: drop table test_table diff --git ql/src/test/results/clientpositive/archive_corrupt.q.out ql/src/test/results/clientpositive/archive_corrupt.q.out index f1ac0e4..6b8d199 100644 --- ql/src/test/results/clientpositive/archive_corrupt.q.out +++ ql/src/test/results/clientpositive/archive_corrupt.q.out @@ -84,10 +84,18 @@ POSTHOOK: Lineage: tstsrcpart PARTITION(ds=2008-04-09,hr=11).key SIMPLE [(srcpar POSTHOOK: Lineage: tstsrcpart PARTITION(ds=2008-04-09,hr=11).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: tstsrcpart PARTITION(ds=2008-04-09,hr=12).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: tstsrcpart PARTITION(ds=2008-04-09,hr=12).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ] -key string default -value string default -ds string -hr string +# col_name data_type comment + +key string default +value string default +ds string None +hr string None + +# Partition Information +# col_name data_type comment + +ds string None +hr string None #### A masked pattern was here #### PREHOOK: query: alter table tstsrcpart archive partition (ds='2008-04-08', hr='11') @@ -114,10 +122,18 @@ POSTHOOK: Lineage: tstsrcpart PARTITION(ds=2008-04-09,hr=11).key SIMPLE [(srcpar POSTHOOK: Lineage: tstsrcpart PARTITION(ds=2008-04-09,hr=11).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: tstsrcpart PARTITION(ds=2008-04-09,hr=12).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: tstsrcpart PARTITION(ds=2008-04-09,hr=12).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ] -key string default -value string default -ds string -hr string +# col_name data_type comment + +key string default +value string default +ds string None +hr string None + +# Partition Information +# col_name data_type comment + +ds string None +hr string None #### A masked pattern was here #### PREHOOK: query: alter table tstsrcpart unarchive partition (ds='2008-04-08', hr='11') diff --git ql/src/test/results/clientpositive/autogen_colalias.q.out ql/src/test/results/clientpositive/autogen_colalias.q.out index 3964079..889494d 100644 --- ql/src/test/results/clientpositive/autogen_colalias.q.out +++ ql/src/test/results/clientpositive/autogen_colalias.q.out @@ -19,16 +19,18 @@ PREHOOK: query: describe dest_grouped_old1 PREHOOK: type: DESCTABLE POSTHOOK: query: describe dest_grouped_old1 POSTHOOK: type: DESCTABLE -_c0 int -zz int -key string -_c3 int -_c4 bigint -_c5 double -_c6 bigint -_c7 bigint -_c8 int -_c9 int +# col_name data_type comment + +_c0 int None +zz int None +key string None +_c3 int None +_c4 bigint None +_c5 double None +_c6 bigint None +_c7 bigint None +_c8 int None +_c9 int None PREHOOK: query: create table dest_grouped_old2 as select distinct src.key from src PREHOOK: type: CREATETABLE_AS_SELECT PREHOOK: Input: default@src @@ -40,7 +42,9 @@ PREHOOK: query: describe dest_grouped_old2 PREHOOK: type: DESCTABLE POSTHOOK: query: describe dest_grouped_old2 POSTHOOK: type: DESCTABLE -key string +# col_name data_type comment + +key string None PREHOOK: query: create table dest_grouped_new1 as select 1+1, 2+2 as zz, ((src.key % 2)+2)/2, test_max(length(src.value)), count(src.value), sin(count(src.value)), count(sin(src.value)), unix_timestamp(), CAST(SUM(IF(value > 10, value, 1)) AS INT), if(src.key > 10, (src.key +5) % 2, 0) @@ -58,16 +62,18 @@ PREHOOK: query: describe dest_grouped_new1 PREHOOK: type: DESCTABLE POSTHOOK: query: describe dest_grouped_new1 POSTHOOK: type: DESCTABLE -column_0 int -zz int -column_2 double -test_max_length_src__3 int -count_src_value_4 bigint -sin_count_src_value_5 double -count_sin_src_value_6 bigint -unix_timestamp_7 bigint -sum_if_value_10_valu_8 int -if_src_key_10_src_ke_9 double +# col_name data_type comment + +column_0 int None +zz int None +column_2 double None +test_max_length_src__3 int None +count_src_value_4 bigint None +sin_count_src_value_5 double None +count_sin_src_value_6 bigint None +unix_timestamp_7 bigint None +sum_if_value_10_valu_8 int None +if_src_key_10_src_ke_9 double None PREHOOK: query: create table dest_grouped_new2 as select distinct src.key from src PREHOOK: type: CREATETABLE_AS_SELECT PREHOOK: Input: default@src @@ -79,7 +85,9 @@ PREHOOK: query: describe dest_grouped_new2 PREHOOK: type: DESCTABLE POSTHOOK: query: describe dest_grouped_new2 POSTHOOK: type: DESCTABLE -key string +# col_name data_type comment + +key string None PREHOOK: query: -- Drop the temporary function at the end till HIVE-3160 gets fixed DROP TEMPORARY FUNCTION test_max PREHOOK: type: DROPFUNCTION diff --git ql/src/test/results/clientpositive/ba_table1.q.out ql/src/test/results/clientpositive/ba_table1.q.out index 3da85ea..2b98c59 100644 --- ql/src/test/results/clientpositive/ba_table1.q.out +++ ql/src/test/results/clientpositive/ba_table1.q.out @@ -15,8 +15,10 @@ PREHOOK: query: describe extended ba_test PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended ba_test POSTHOOK: type: DESCTABLE -ba_key binary -ba_val binary +# col_name data_type comment + +ba_key binary None +ba_val binary None #### A masked pattern was here #### PREHOOK: query: from src insert overwrite table ba_test select cast (src.key as binary), cast (src.value as binary) diff --git ql/src/test/results/clientpositive/ba_table2.q.out ql/src/test/results/clientpositive/ba_table2.q.out index 9a00dc6..8942cb9 100644 --- ql/src/test/results/clientpositive/ba_table2.q.out +++ ql/src/test/results/clientpositive/ba_table2.q.out @@ -23,8 +23,10 @@ PREHOOK: query: describe extended ba_test PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended ba_test POSTHOOK: type: DESCTABLE -ba_key binary from deserializer -ba_val binary from deserializer +# col_name data_type comment + +ba_key binary from deserializer +ba_val binary from deserializer #### A masked pattern was here #### PREHOOK: query: from src insert overwrite table ba_test select cast (src.key as binary), cast (src.value as binary) diff --git ql/src/test/results/clientpositive/ba_table_union.q.out ql/src/test/results/clientpositive/ba_table_union.q.out index 9e4bf82..85ea093 100644 --- ql/src/test/results/clientpositive/ba_table_union.q.out +++ ql/src/test/results/clientpositive/ba_table_union.q.out @@ -13,8 +13,10 @@ PREHOOK: query: describe extended ba_test PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended ba_test POSTHOOK: type: DESCTABLE -ba_key binary -ba_val binary +# col_name data_type comment + +ba_key binary None +ba_val binary None #### A masked pattern was here #### PREHOOK: query: from src insert overwrite table ba_test select cast (src.key as binary), cast (src.value as binary) diff --git ql/src/test/results/clientpositive/binary_table_bincolserde.q.out ql/src/test/results/clientpositive/binary_table_bincolserde.q.out index 3f5e371..2b90acd 100644 --- ql/src/test/results/clientpositive/binary_table_bincolserde.q.out +++ ql/src/test/results/clientpositive/binary_table_bincolserde.q.out @@ -23,8 +23,10 @@ PREHOOK: query: describe extended ba_test PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended ba_test POSTHOOK: type: DESCTABLE -ba_key binary from deserializer -ba_val binary from deserializer +# col_name data_type comment + +ba_key binary from deserializer +ba_val binary from deserializer #### A masked pattern was here #### PREHOOK: query: from src insert overwrite table ba_test select cast (src.key as binary), cast (src.value as binary) diff --git ql/src/test/results/clientpositive/binary_table_colserde.q.out ql/src/test/results/clientpositive/binary_table_colserde.q.out index 33ae7ea..e747129 100644 --- ql/src/test/results/clientpositive/binary_table_colserde.q.out +++ ql/src/test/results/clientpositive/binary_table_colserde.q.out @@ -15,8 +15,10 @@ PREHOOK: query: describe extended ba_test PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended ba_test POSTHOOK: type: DESCTABLE -ba_key binary -ba_val binary +# col_name data_type comment + +ba_key binary None +ba_val binary None #### A masked pattern was here #### PREHOOK: query: from src insert overwrite table ba_test select cast (src.key as binary), cast (src.value as binary) diff --git ql/src/test/results/clientpositive/bucket_groupby.q.out ql/src/test/results/clientpositive/bucket_groupby.q.out index f8ce712..394ac16 100644 --- ql/src/test/results/clientpositive/bucket_groupby.q.out +++ ql/src/test/results/clientpositive/bucket_groupby.q.out @@ -7,9 +7,16 @@ PREHOOK: query: describe extended clustergroupby PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended clustergroupby POSTHOOK: type: DESCTABLE -key string -value string -ds string +# col_name data_type comment + +key string None +value string None +ds string None + +# Partition Information +# col_name data_type comment + +ds string None #### A masked pattern was here #### PREHOOK: query: alter table clustergroupby clustered by (key) into 1 buckets @@ -134,9 +141,16 @@ POSTHOOK: query: describe extended clustergroupby POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: clustergroupby PARTITION(ds=100).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: clustergroupby PARTITION(ds=100).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -key string -value string -ds string +# col_name data_type comment + +key string None +value string None +ds string None + +# Partition Information +# col_name data_type comment + +ds string None #### A masked pattern was here #### PREHOOK: query: insert overwrite table clustergroupby partition (ds='101') select key, value from src distribute by key @@ -1202,9 +1216,16 @@ POSTHOOK: Lineage: clustergroupby PARTITION(ds=100).key SIMPLE [(src)src.FieldSc POSTHOOK: Lineage: clustergroupby PARTITION(ds=100).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: clustergroupby PARTITION(ds=101).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: clustergroupby PARTITION(ds=101).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -key string -value string -ds string +# col_name data_type comment + +key string None +value string None +ds string None + +# Partition Information +# col_name data_type comment + +ds string None #### A masked pattern was here #### PREHOOK: query: insert overwrite table clustergroupby partition (ds='102') select key, value from src distribute by value sort by key, value @@ -1600,9 +1621,16 @@ POSTHOOK: Lineage: clustergroupby PARTITION(ds=101).key SIMPLE [(src)src.FieldSc POSTHOOK: Lineage: clustergroupby PARTITION(ds=101).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: clustergroupby PARTITION(ds=102).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: clustergroupby PARTITION(ds=102).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -key string -value string -ds string +# col_name data_type comment + +key string None +value string None +ds string None + +# Partition Information +# col_name data_type comment + +ds string None #### A masked pattern was here #### PREHOOK: query: insert overwrite table clustergroupby partition (ds='103') select key, value from src distribute by value, key sort by key diff --git ql/src/test/results/clientpositive/columnarserde_create_shortcut.q.out ql/src/test/results/clientpositive/columnarserde_create_shortcut.q.out index 70c3b0b..f4b2830 100644 --- ql/src/test/results/clientpositive/columnarserde_create_shortcut.q.out +++ ql/src/test/results/clientpositive/columnarserde_create_shortcut.q.out @@ -182,8 +182,10 @@ POSTHOOK: Lineage: columnarserde_create_shortcut.d SIMPLE [(src_thrift)src_thrif POSTHOOK: Lineage: columnarserde_create_shortcut.e SIMPLE [(src_thrift)src_thrift.FieldSchema(name:astring, type:string, comment:from deserializer), ] POSTHOOK: Lineage: columnshortcuttable.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: columnshortcuttable.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -key string -value string +# col_name data_type comment + +key string None +value string None PREHOOK: query: SELECT columnShortcutTable.* FROM columnShortcutTable ORDER BY key ASC, value ASC PREHOOK: type: QUERY PREHOOK: Input: default@columnshortcuttable diff --git ql/src/test/results/clientpositive/convert_enum_to_string.q.out ql/src/test/results/clientpositive/convert_enum_to_string.q.out index e58ed44..af981a7 100644 --- ql/src/test/results/clientpositive/convert_enum_to_string.q.out +++ ql/src/test/results/clientpositive/convert_enum_to_string.q.out @@ -21,25 +21,32 @@ PREHOOK: query: describe convert_enum_to_string PREHOOK: type: DESCTABLE POSTHOOK: query: describe convert_enum_to_string POSTHOOK: type: DESCTABLE -my_bool boolean from deserializer -my_byte tinyint from deserializer -my_16bit_int smallint from deserializer -my_32bit_int int from deserializer -my_64bit_int bigint from deserializer -my_double double from deserializer -my_string string from deserializer -my_binary struct from deserializer -my_string_string_map map from deserializer -my_string_enum_map map from deserializer -my_enum_string_map map from deserializer -my_enum_struct_map map>> from deserializer -my_enum_stringlist_map map> from deserializer -my_enum_structlist_map map>>> from deserializer -my_stringlist array from deserializer -my_structlist array>> from deserializer -my_enumlist array from deserializer -my_stringset struct<> from deserializer -my_enumset struct<> from deserializer -my_structset struct<> from deserializer -optionals struct<> from deserializer -b string +# col_name data_type comment + +my_bool boolean from deserializer +my_byte tinyint from deserializer +my_16bit_int smallint from deserializer +my_32bit_int int from deserializer +my_64bit_int bigint from deserializer +my_double double from deserializer +my_string string from deserializer +my_binary struct from deserializer +my_string_string_map map from deserializer +my_string_enum_map map from deserializer +my_enum_string_map map from deserializer +my_enum_struct_map map>> from deserializer +my_enum_stringlist_map map> from deserializer +my_enum_structlist_map map>>> from deserializer +my_stringlist array from deserializer +my_structlist array>> from deserializer +my_enumlist array from deserializer +my_stringset struct<> from deserializer +my_enumset struct<> from deserializer +my_structset struct<> from deserializer +optionals struct<> from deserializer +b string None + +# Partition Information +# col_name data_type comment + +b string None diff --git ql/src/test/results/clientpositive/create_insert_outputformat.q.out ql/src/test/results/clientpositive/create_insert_outputformat.q.out index 1ca2281..d6599a7 100644 --- ql/src/test/results/clientpositive/create_insert_outputformat.q.out +++ ql/src/test/results/clientpositive/create_insert_outputformat.q.out @@ -25,8 +25,10 @@ POSTHOOK: query: describe table_test_output_format POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: table_test_output_format.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: table_test_output_format.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -key int -value string +# col_name data_type comment + +key int None +value string None PREHOOK: query: CREATE TABLE table_test_output_format_sequencefile(key INT, value STRING) STORED AS INPUTFORMAT 'org.apache.hadoop.mapred.SequenceFileInputFormat' OUTPUTFORMAT 'org.apache.hadoop.mapred.SequenceFileOutputFormat' @@ -60,8 +62,10 @@ POSTHOOK: Lineage: table_test_output_format.key EXPRESSION [(src)src.FieldSchema POSTHOOK: Lineage: table_test_output_format.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: table_test_output_format_sequencefile.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: table_test_output_format_sequencefile.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -key int -value string +# col_name data_type comment + +key int None +value string None PREHOOK: query: CREATE TABLE table_test_output_format_hivesequencefile(key INT, value STRING) STORED AS INPUTFORMAT 'org.apache.hadoop.mapred.SequenceFileInputFormat' OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat' @@ -101,5 +105,7 @@ POSTHOOK: Lineage: table_test_output_format_hivesequencefile.key EXPRESSION [(sr POSTHOOK: Lineage: table_test_output_format_hivesequencefile.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: table_test_output_format_sequencefile.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: table_test_output_format_sequencefile.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -key int -value string +# col_name data_type comment + +key int None +value string None diff --git ql/src/test/results/clientpositive/create_like_view.q.out ql/src/test/results/clientpositive/create_like_view.q.out index 5abe38c..cb43bb3 100644 --- ql/src/test/results/clientpositive/create_like_view.q.out +++ ql/src/test/results/clientpositive/create_like_view.q.out @@ -23,8 +23,10 @@ PREHOOK: query: DESCRIBE table1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE table1 POSTHOOK: type: DESCTABLE -a string -b string +# col_name data_type comment + +a string None +b string None PREHOOK: query: DESCRIBE FORMATTED table1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE FORMATTED table1 @@ -70,8 +72,10 @@ PREHOOK: query: DESCRIBE table2 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE table2 POSTHOOK: type: DESCTABLE -a string -b string +# col_name data_type comment + +a string None +b string None PREHOOK: query: DESCRIBE FORMATTED table2 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE FORMATTED table2 @@ -118,8 +122,10 @@ PREHOOK: query: DESCRIBE table3 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE table3 POSTHOOK: type: DESCTABLE -a string -b string +# col_name data_type comment + +a string None +b string None PREHOOK: query: DESCRIBE FORMATTED table3 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE FORMATTED table3 diff --git ql/src/test/results/clientpositive/describe_comment_indent.q.out ql/src/test/results/clientpositive/describe_comment_indent.q.out new file mode 100644 index 0000000..9379f85 --- /dev/null +++ ql/src/test/results/clientpositive/describe_comment_indent.q.out @@ -0,0 +1,71 @@ +PREHOOK: query: -- test comment indent processing for multi-line comments + +CREATE TABLE test_table( + col1 INT COMMENT 'col1 one line comment', + col2 STRING COMMENT 'col2 +two lines comment', + col3 STRING COMMENT 'col3 +three lines +comment') +COMMENT 'table comment +two lines' +PREHOOK: type: CREATETABLE +POSTHOOK: query: -- test comment indent processing for multi-line comments + +CREATE TABLE test_table( + col1 INT COMMENT 'col1 one line comment', + col2 STRING COMMENT 'col2 +two lines comment', + col3 STRING COMMENT 'col3 +three lines +comment') +COMMENT 'table comment +two lines' +POSTHOOK: type: CREATETABLE +POSTHOOK: Output: default@test_table +PREHOOK: query: DESCRIBE test_table +PREHOOK: type: DESCTABLE +POSTHOOK: query: DESCRIBE test_table +POSTHOOK: type: DESCTABLE +# col_name data_type comment + +col1 int col1 one line comment +col2 string col2 + two lines comment +col3 string col3 + three lines + comment +PREHOOK: query: DESCRIBE FORMATTED test_table +PREHOOK: type: DESCTABLE +POSTHOOK: query: DESCRIBE FORMATTED test_table +POSTHOOK: type: DESCTABLE +# col_name data_type comment + +col1 int col1 one line comment +col2 string col2 + two lines comment +col3 string col3 + three lines + comment + +# Detailed Table Information +Database: default +#### A masked pattern was here #### +Protect Mode: None +Retention: 0 +#### A masked pattern was here #### +Table Type: MANAGED_TABLE +Table Parameters: + comment table comment\ntwo lines +#### A masked pattern was here #### + +# Storage Information +SerDe Library: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe +InputFormat: org.apache.hadoop.mapred.TextInputFormat +OutputFormat: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat +Compressed: No +Num Buckets: -1 +Bucket Columns: [] +Sort Columns: [] +Storage Desc Params: + serialization.format 1 diff --git ql/src/test/results/clientpositive/describe_syntax.q.out ql/src/test/results/clientpositive/describe_syntax.q.out index 40f22b1..fefd983 100644 --- ql/src/test/results/clientpositive/describe_syntax.q.out +++ ql/src/test/results/clientpositive/describe_syntax.q.out @@ -38,18 +38,34 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: -- describe table DESCRIBE t1 POSTHOOK: type: DESCTABLE -key1 int -value1 string -ds string -part string +# col_name data_type comment + +key1 int None +value1 string None +ds string None +part string None + +# Partition Information +# col_name data_type comment + +ds string None +part string None PREHOOK: query: DESCRIBE EXTENDED t1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED t1 POSTHOOK: type: DESCTABLE -key1 int -value1 string -ds string -part string +# col_name data_type comment + +key1 int None +value1 string None +ds string None +part string None + +# Partition Information +# col_name data_type comment + +ds string None +part string None #### A masked pattern was here #### PREHOOK: query: DESCRIBE FORMATTED t1 @@ -93,18 +109,34 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: -- describe database.table DESCRIBE db1.t1 POSTHOOK: type: DESCTABLE -key1 int -value1 string -ds string -part string +# col_name data_type comment + +key1 int None +value1 string None +ds string None +part string None + +# Partition Information +# col_name data_type comment + +ds string None +part string None PREHOOK: query: DESCRIBE EXTENDED db1.t1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED db1.t1 POSTHOOK: type: DESCTABLE -key1 int -value1 string -ds string -part string +# col_name data_type comment + +key1 int None +value1 string None +ds string None +part string None + +# Partition Information +# col_name data_type comment + +ds string None +part string None #### A masked pattern was here #### PREHOOK: query: DESCRIBE FORMATTED db1.t1 @@ -148,12 +180,16 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: -- describe table column DESCRIBE t1 key1 POSTHOOK: type: DESCTABLE -key1 int from deserializer +# col_name data_type comment + +key1 int from deserializer PREHOOK: query: DESCRIBE EXTENDED t1 key1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED t1 key1 POSTHOOK: type: DESCTABLE -key1 int from deserializer +# col_name data_type comment + +key1 int from deserializer PREHOOK: query: DESCRIBE FORMATTED t1 key1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE FORMATTED t1 key1 @@ -167,12 +203,16 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: -- describe database.tabe column DESCRIBE db1.t1 key1 POSTHOOK: type: DESCTABLE -key1 int from deserializer +# col_name data_type comment + +key1 int from deserializer PREHOOK: query: DESCRIBE EXTENDED db1.t1 key1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED db1.t1 key1 POSTHOOK: type: DESCTABLE -key1 int from deserializer +# col_name data_type comment + +key1 int from deserializer PREHOOK: query: DESCRIBE FORMATTED db1.t1 key1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE FORMATTED db1.t1 key1 @@ -190,12 +230,16 @@ POSTHOOK: query: -- describe table.column -- fall back to the old syntax table.column DESCRIBE t1.key1 POSTHOOK: type: DESCTABLE -key1 int from deserializer +# col_name data_type comment + +key1 int from deserializer PREHOOK: query: DESCRIBE EXTENDED t1.key1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED t1.key1 POSTHOOK: type: DESCTABLE -key1 int from deserializer +# col_name data_type comment + +key1 int from deserializer PREHOOK: query: DESCRIBE FORMATTED t1.key1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE FORMATTED t1.key1 @@ -209,18 +253,34 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: -- describe table partition DESCRIBE t1 PARTITION(ds='4', part='5') POSTHOOK: type: DESCTABLE -key1 int -value1 string -ds string -part string +# col_name data_type comment + +key1 int None +value1 string None +ds string None +part string None + +# Partition Information +# col_name data_type comment + +ds string None +part string None PREHOOK: query: DESCRIBE EXTENDED t1 PARTITION(ds='4', part='5') PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED t1 PARTITION(ds='4', part='5') POSTHOOK: type: DESCTABLE -key1 int -value1 string -ds string -part string +# col_name data_type comment + +key1 int None +value1 string None +ds string None +part string None + +# Partition Information +# col_name data_type comment + +ds string None +part string None #### A masked pattern was here #### PREHOOK: query: DESCRIBE FORMATTED t1 PARTITION(ds='4', part='5') @@ -264,18 +324,34 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: -- describe database.table partition DESCRIBE db1.t1 PARTITION(ds='4', part='5') POSTHOOK: type: DESCTABLE -key1 int -value1 string -ds string -part string +# col_name data_type comment + +key1 int None +value1 string None +ds string None +part string None + +# Partition Information +# col_name data_type comment + +ds string None +part string None PREHOOK: query: DESCRIBE EXTENDED db1.t1 PARTITION(ds='4', part='5') PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED db1.t1 PARTITION(ds='4', part='5') POSTHOOK: type: DESCTABLE -key1 int -value1 string -ds string -part string +# col_name data_type comment + +key1 int None +value1 string None +ds string None +part string None + +# Partition Information +# col_name data_type comment + +ds string None +part string None #### A masked pattern was here #### PREHOOK: query: DESCRIBE FORMATTED db1.t1 PARTITION(ds='4', part='5') diff --git ql/src/test/results/clientpositive/describe_table.q.out ql/src/test/results/clientpositive/describe_table.q.out index 1143f59..ea18601 100644 --- ql/src/test/results/clientpositive/describe_table.q.out +++ ql/src/test/results/clientpositive/describe_table.q.out @@ -2,46 +2,82 @@ PREHOOK: query: describe srcpart PREHOOK: type: DESCTABLE POSTHOOK: query: describe srcpart POSTHOOK: type: DESCTABLE -key string default -value string default -ds string -hr string +# col_name data_type comment + +key string default +value string default +ds string None +hr string None + +# Partition Information +# col_name data_type comment + +ds string None +hr string None PREHOOK: query: describe srcpart.key PREHOOK: type: DESCTABLE POSTHOOK: query: describe srcpart.key POSTHOOK: type: DESCTABLE -key string from deserializer +# col_name data_type comment + +key string from deserializer PREHOOK: query: describe srcpart PARTITION(ds='2008-04-08', hr='12') PREHOOK: type: DESCTABLE POSTHOOK: query: describe srcpart PARTITION(ds='2008-04-08', hr='12') POSTHOOK: type: DESCTABLE -key string default -value string default -ds string -hr string +# col_name data_type comment + +key string default +value string default +ds string None +hr string None + +# Partition Information +# col_name data_type comment + +ds string None +hr string None PREHOOK: query: describe extended srcpart PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended srcpart POSTHOOK: type: DESCTABLE -key string default -value string default -ds string -hr string +# col_name data_type comment + +key string default +value string default +ds string None +hr string None + +# Partition Information +# col_name data_type comment + +ds string None +hr string None #### A masked pattern was here #### PREHOOK: query: describe extended srcpart.key PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended srcpart.key POSTHOOK: type: DESCTABLE -key string from deserializer +# col_name data_type comment + +key string from deserializer PREHOOK: query: describe extended srcpart PARTITION(ds='2008-04-08', hr='12') PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended srcpart PARTITION(ds='2008-04-08', hr='12') POSTHOOK: type: DESCTABLE -key string default -value string default -ds string -hr string +# col_name data_type comment + +key string default +value string default +ds string None +hr string None + +# Partition Information +# col_name data_type comment + +ds string None +hr string None #### A masked pattern was here #### PREHOOK: query: describe formatted srcpart diff --git ql/src/test/results/clientpositive/describe_xpath.q.out ql/src/test/results/clientpositive/describe_xpath.q.out index 1c3a46a..282d325 100644 --- ql/src/test/results/clientpositive/describe_xpath.q.out +++ ql/src/test/results/clientpositive/describe_xpath.q.out @@ -4,41 +4,53 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: -- Describe a list structure in a thrift table describe src_thrift.lint POSTHOOK: type: DESCTABLE -lint array from deserializer +# col_name data_type comment + +lint array from deserializer PREHOOK: query: -- Describe the element of a list describe src_thrift.lint.$elem$ PREHOOK: type: DESCTABLE POSTHOOK: query: -- Describe the element of a list describe src_thrift.lint.$elem$ POSTHOOK: type: DESCTABLE -$elem$ int from deserializer +# col_name data_type comment + +$elem$ int from deserializer PREHOOK: query: -- Describe the key of a map describe src_thrift.mStringString.$key$ PREHOOK: type: DESCTABLE POSTHOOK: query: -- Describe the key of a map describe src_thrift.mStringString.$key$ POSTHOOK: type: DESCTABLE -$key$ string from deserializer +# col_name data_type comment + +$key$ string from deserializer PREHOOK: query: -- Describe the value of a map describe src_thrift.mStringString.$value$ PREHOOK: type: DESCTABLE POSTHOOK: query: -- Describe the value of a map describe src_thrift.mStringString.$value$ POSTHOOK: type: DESCTABLE -$value$ string from deserializer +# col_name data_type comment + +$value$ string from deserializer PREHOOK: query: -- Describe a complex element of a list describe src_thrift.lintString.$elem$ PREHOOK: type: DESCTABLE POSTHOOK: query: -- Describe a complex element of a list describe src_thrift.lintString.$elem$ POSTHOOK: type: DESCTABLE -myint int from deserializer -mystring string from deserializer -underscore_int int from deserializer +# col_name data_type comment + +myint int from deserializer +mystring string from deserializer +underscore_int int from deserializer PREHOOK: query: -- Describe a member of an element of a list describe src_thrift.lintString.$elem$.myint PREHOOK: type: DESCTABLE POSTHOOK: query: -- Describe a member of an element of a list describe src_thrift.lintString.$elem$.myint POSTHOOK: type: DESCTABLE -myint int from deserializer +# col_name data_type comment + +myint int from deserializer diff --git ql/src/test/results/clientpositive/drop_partitions_filter.q.out ql/src/test/results/clientpositive/drop_partitions_filter.q.out index 9ebc603..9b36f19 100644 --- ql/src/test/results/clientpositive/drop_partitions_filter.q.out +++ ql/src/test/results/clientpositive/drop_partitions_filter.q.out @@ -7,10 +7,18 @@ PREHOOK: query: describe ptestfilter PREHOOK: type: DESCTABLE POSTHOOK: query: describe ptestfilter POSTHOOK: type: DESCTABLE -a string -b int -c string -d string +# col_name data_type comment + +a string None +b int None +c string None +d string None + +# Partition Information +# col_name data_type comment + +c string None +d string None PREHOOK: query: alter table ptestfilter add partition (c='US', d=1) PREHOOK: type: ALTERTABLE_ADDPARTS PREHOOK: Input: default@ptestfilter diff --git ql/src/test/results/clientpositive/drop_partitions_filter2.q.out ql/src/test/results/clientpositive/drop_partitions_filter2.q.out index 10f45b3..fb9ae4a 100644 --- ql/src/test/results/clientpositive/drop_partitions_filter2.q.out +++ ql/src/test/results/clientpositive/drop_partitions_filter2.q.out @@ -7,10 +7,18 @@ PREHOOK: query: describe ptestfilter PREHOOK: type: DESCTABLE POSTHOOK: query: describe ptestfilter POSTHOOK: type: DESCTABLE -a string -b int -c int -d int +# col_name data_type comment + +a string None +b int None +c int None +d int None + +# Partition Information +# col_name data_type comment + +c int None +d int None PREHOOK: query: alter table ptestfilter add partition (c=1, d=1) PREHOOK: type: ALTERTABLE_ADDPARTS PREHOOK: Input: default@ptestfilter diff --git ql/src/test/results/clientpositive/drop_partitions_filter3.q.out ql/src/test/results/clientpositive/drop_partitions_filter3.q.out index d32721b..2033faa 100644 --- ql/src/test/results/clientpositive/drop_partitions_filter3.q.out +++ ql/src/test/results/clientpositive/drop_partitions_filter3.q.out @@ -7,10 +7,18 @@ PREHOOK: query: describe ptestfilter PREHOOK: type: DESCTABLE POSTHOOK: query: describe ptestfilter POSTHOOK: type: DESCTABLE -a string -b int -c string -d int +# col_name data_type comment + +a string None +b int None +c string None +d int None + +# Partition Information +# col_name data_type comment + +c string None +d int None PREHOOK: query: alter table ptestfilter add partition (c='1', d=1) PREHOOK: type: ALTERTABLE_ADDPARTS PREHOOK: Input: default@ptestfilter diff --git ql/src/test/results/clientpositive/exim_00_nonpart_empty.q.out ql/src/test/results/clientpositive/exim_00_nonpart_empty.q.out index b1db059..75b7096 100644 --- ql/src/test/results/clientpositive/exim_00_nonpart_empty.q.out +++ ql/src/test/results/clientpositive/exim_00_nonpart_empty.q.out @@ -41,7 +41,9 @@ PREHOOK: query: describe extended exim_department PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended exim_department POSTHOOK: type: DESCTABLE -dep_id int department id +# col_name data_type comment + +dep_id int department id #### A masked pattern was here #### PREHOOK: query: show table extended like exim_department diff --git ql/src/test/results/clientpositive/exim_01_nonpart.q.out ql/src/test/results/clientpositive/exim_01_nonpart.q.out index 910013d..0c0fd01 100644 --- ql/src/test/results/clientpositive/exim_01_nonpart.q.out +++ ql/src/test/results/clientpositive/exim_01_nonpart.q.out @@ -47,7 +47,9 @@ PREHOOK: query: describe extended exim_department PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended exim_department POSTHOOK: type: DESCTABLE -dep_id int department id +# col_name data_type comment + +dep_id int department id #### A masked pattern was here #### PREHOOK: query: show table extended like exim_department diff --git ql/src/test/results/clientpositive/exim_02_00_part_empty.q.out ql/src/test/results/clientpositive/exim_02_00_part_empty.q.out index d8d840a..f9c0115 100644 --- ql/src/test/results/clientpositive/exim_02_00_part_empty.q.out +++ ql/src/test/results/clientpositive/exim_02_00_part_empty.q.out @@ -43,9 +43,17 @@ PREHOOK: query: describe extended exim_employee PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended exim_employee POSTHOOK: type: DESCTABLE -emp_id int employee id -emp_country string two char iso code -emp_state string free text +# col_name data_type comment + +emp_id int employee id +emp_country string two char iso code +emp_state string free text + +# Partition Information +# col_name data_type comment + +emp_country string two char iso code +emp_state string free text #### A masked pattern was here #### PREHOOK: query: show table extended like exim_employee diff --git ql/src/test/results/clientpositive/exim_02_part.q.out ql/src/test/results/clientpositive/exim_02_part.q.out index 104a1d6..94949a3 100644 --- ql/src/test/results/clientpositive/exim_02_part.q.out +++ ql/src/test/results/clientpositive/exim_02_part.q.out @@ -55,9 +55,17 @@ PREHOOK: query: describe extended exim_employee PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended exim_employee POSTHOOK: type: DESCTABLE -emp_id int employee id -emp_country string two char iso code -emp_state string free text +# col_name data_type comment + +emp_id int employee id +emp_country string two char iso code +emp_state string free text + +# Partition Information +# col_name data_type comment + +emp_country string two char iso code +emp_state string free text #### A masked pattern was here #### PREHOOK: query: show table extended like exim_employee diff --git ql/src/test/results/clientpositive/exim_03_nonpart_over_compat.q.out ql/src/test/results/clientpositive/exim_03_nonpart_over_compat.q.out index 0e9d85c..d47b132 100644 --- ql/src/test/results/clientpositive/exim_03_nonpart_over_compat.q.out +++ ql/src/test/results/clientpositive/exim_03_nonpart_over_compat.q.out @@ -57,7 +57,9 @@ PREHOOK: query: describe extended exim_department PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended exim_department POSTHOOK: type: DESCTABLE -dep_id int department identifier +# col_name data_type comment + +dep_id int department identifier #### A masked pattern was here #### PREHOOK: query: select * from exim_department diff --git ql/src/test/results/clientpositive/exim_04_all_part.q.out ql/src/test/results/clientpositive/exim_04_all_part.q.out index 6a3acb3..e214dad 100644 --- ql/src/test/results/clientpositive/exim_04_all_part.q.out +++ ql/src/test/results/clientpositive/exim_04_all_part.q.out @@ -91,9 +91,17 @@ PREHOOK: query: describe extended exim_employee PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended exim_employee POSTHOOK: type: DESCTABLE -emp_id int employee id -emp_country string two char iso code -emp_state string free text +# col_name data_type comment + +emp_id int employee id +emp_country string two char iso code +emp_state string free text + +# Partition Information +# col_name data_type comment + +emp_country string two char iso code +emp_state string free text #### A masked pattern was here #### PREHOOK: query: show table extended like exim_employee diff --git ql/src/test/results/clientpositive/exim_04_evolved_parts.q.out ql/src/test/results/clientpositive/exim_04_evolved_parts.q.out index e510833..daf3daf 100644 --- ql/src/test/results/clientpositive/exim_04_evolved_parts.q.out +++ ql/src/test/results/clientpositive/exim_04_evolved_parts.q.out @@ -101,39 +101,63 @@ PREHOOK: query: describe extended exim_employee PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended exim_employee POSTHOOK: type: DESCTABLE -emp_id int from deserializer -emp_name string from deserializer -emp_dob string from deserializer -emp_sex string from deserializer -emp_dept int from deserializer -emp_country string 2-char code -emp_state string 2-char code +# col_name data_type comment + +emp_id int from deserializer +emp_name string from deserializer +emp_dob string from deserializer +emp_sex string from deserializer +emp_dept int from deserializer +emp_country string 2-char code +emp_state string 2-char code + +# Partition Information +# col_name data_type comment + +emp_country string 2-char code +emp_state string 2-char code #### A masked pattern was here #### PREHOOK: query: describe extended exim_employee partition (emp_country='in', emp_state='tn') PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended exim_employee partition (emp_country='in', emp_state='tn') POSTHOOK: type: DESCTABLE -emp_id int employee id -emp_name string -emp_dob string employee date of birth -emp_sex string M/F -emp_dept int -emp_country string 2-char code -emp_state string 2-char code +# col_name data_type comment + +emp_id int employee id +emp_name string None +emp_dob string employee date of birth +emp_sex string M/F +emp_dept int None +emp_country string 2-char code +emp_state string 2-char code + +# Partition Information +# col_name data_type comment + +emp_country string 2-char code +emp_state string 2-char code #### A masked pattern was here #### PREHOOK: query: describe extended exim_employee partition (emp_country='in', emp_state='ka') PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended exim_employee partition (emp_country='in', emp_state='ka') POSTHOOK: type: DESCTABLE -emp_id int from deserializer -emp_name string from deserializer -emp_dob string from deserializer -emp_sex string from deserializer -emp_dept int from deserializer -emp_country string 2-char code -emp_state string 2-char code +# col_name data_type comment + +emp_id int from deserializer +emp_name string from deserializer +emp_dob string from deserializer +emp_sex string from deserializer +emp_dept int from deserializer +emp_country string 2-char code +emp_state string 2-char code + +# Partition Information +# col_name data_type comment + +emp_country string 2-char code +emp_state string 2-char code #### A masked pattern was here #### PREHOOK: query: show table extended like exim_employee diff --git ql/src/test/results/clientpositive/exim_05_some_part.q.out ql/src/test/results/clientpositive/exim_05_some_part.q.out index 2ab36ee..410edfa 100644 --- ql/src/test/results/clientpositive/exim_05_some_part.q.out +++ ql/src/test/results/clientpositive/exim_05_some_part.q.out @@ -85,9 +85,17 @@ PREHOOK: query: describe extended exim_employee PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended exim_employee POSTHOOK: type: DESCTABLE -emp_id int employee id -emp_country string two char iso code -emp_state string free text +# col_name data_type comment + +emp_id int employee id +emp_country string two char iso code +emp_state string free text + +# Partition Information +# col_name data_type comment + +emp_country string two char iso code +emp_state string free text #### A masked pattern was here #### PREHOOK: query: show table extended like exim_employee diff --git ql/src/test/results/clientpositive/exim_06_one_part.q.out ql/src/test/results/clientpositive/exim_06_one_part.q.out index b300543..e1e3a26 100644 --- ql/src/test/results/clientpositive/exim_06_one_part.q.out +++ ql/src/test/results/clientpositive/exim_06_one_part.q.out @@ -82,9 +82,17 @@ PREHOOK: query: describe extended exim_employee PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended exim_employee POSTHOOK: type: DESCTABLE -emp_id int employee id -emp_country string two char iso code -emp_state string free text +# col_name data_type comment + +emp_id int employee id +emp_country string two char iso code +emp_state string free text + +# Partition Information +# col_name data_type comment + +emp_country string two char iso code +emp_state string free text #### A masked pattern was here #### PREHOOK: query: show table extended like exim_employee diff --git ql/src/test/results/clientpositive/exim_07_all_part_over_nonoverlap.q.out ql/src/test/results/clientpositive/exim_07_all_part_over_nonoverlap.q.out index 2decb91..4e0ab6d 100644 --- ql/src/test/results/clientpositive/exim_07_all_part_over_nonoverlap.q.out +++ ql/src/test/results/clientpositive/exim_07_all_part_over_nonoverlap.q.out @@ -114,9 +114,17 @@ PREHOOK: query: describe extended exim_employee PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended exim_employee POSTHOOK: type: DESCTABLE -emp_id int employee id -emp_country string iso code -emp_state string free-form text +# col_name data_type comment + +emp_id int employee id +emp_country string iso code +emp_state string free-form text + +# Partition Information +# col_name data_type comment + +emp_country string iso code +emp_state string free-form text #### A masked pattern was here #### PREHOOK: query: select * from exim_employee diff --git ql/src/test/results/clientpositive/exim_08_nonpart_rename.q.out ql/src/test/results/clientpositive/exim_08_nonpart_rename.q.out index b722437..1e1d677 100644 --- ql/src/test/results/clientpositive/exim_08_nonpart_rename.q.out +++ ql/src/test/results/clientpositive/exim_08_nonpart_rename.q.out @@ -65,7 +65,9 @@ PREHOOK: query: describe extended exim_imported_dept PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended exim_imported_dept POSTHOOK: type: DESCTABLE -dep_id int department id +# col_name data_type comment + +dep_id int department id #### A masked pattern was here #### PREHOOK: query: select * from exim_imported_dept diff --git ql/src/test/results/clientpositive/exim_09_part_spec_nonoverlap.q.out ql/src/test/results/clientpositive/exim_09_part_spec_nonoverlap.q.out index 47ce26c..2e20805 100644 --- ql/src/test/results/clientpositive/exim_09_part_spec_nonoverlap.q.out +++ ql/src/test/results/clientpositive/exim_09_part_spec_nonoverlap.q.out @@ -120,9 +120,17 @@ PREHOOK: query: describe extended exim_employee PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended exim_employee POSTHOOK: type: DESCTABLE -emp_id int employee id -emp_country string two char iso code -emp_state string free text +# col_name data_type comment + +emp_id int employee id +emp_country string two char iso code +emp_state string free text + +# Partition Information +# col_name data_type comment + +emp_country string two char iso code +emp_state string free text #### A masked pattern was here #### PREHOOK: query: select * from exim_employee diff --git ql/src/test/results/clientpositive/exim_10_external_managed.q.out ql/src/test/results/clientpositive/exim_10_external_managed.q.out index 530b273..4b82efd 100644 --- ql/src/test/results/clientpositive/exim_10_external_managed.q.out +++ ql/src/test/results/clientpositive/exim_10_external_managed.q.out @@ -51,7 +51,9 @@ PREHOOK: query: describe extended exim_department PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended exim_department POSTHOOK: type: DESCTABLE -dep_id int department id +# col_name data_type comment + +dep_id int department id #### A masked pattern was here #### PREHOOK: query: select * from exim_department diff --git ql/src/test/results/clientpositive/exim_11_managed_external.q.out ql/src/test/results/clientpositive/exim_11_managed_external.q.out index 8b4238d..7c73c96 100644 --- ql/src/test/results/clientpositive/exim_11_managed_external.q.out +++ ql/src/test/results/clientpositive/exim_11_managed_external.q.out @@ -47,7 +47,9 @@ PREHOOK: query: describe extended exim_department PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended exim_department POSTHOOK: type: DESCTABLE -dep_id int department id +# col_name data_type comment + +dep_id int department id #### A masked pattern was here #### PREHOOK: query: select * from exim_department diff --git ql/src/test/results/clientpositive/exim_12_external_location.q.out ql/src/test/results/clientpositive/exim_12_external_location.q.out index 4f40737..2bd523d 100644 --- ql/src/test/results/clientpositive/exim_12_external_location.q.out +++ ql/src/test/results/clientpositive/exim_12_external_location.q.out @@ -50,7 +50,9 @@ PREHOOK: query: describe extended exim_department PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended exim_department POSTHOOK: type: DESCTABLE -dep_id int department id +# col_name data_type comment + +dep_id int department id #### A masked pattern was here #### PREHOOK: query: select * from exim_department diff --git ql/src/test/results/clientpositive/exim_13_managed_location.q.out ql/src/test/results/clientpositive/exim_13_managed_location.q.out index 138a396..99f160f 100644 --- ql/src/test/results/clientpositive/exim_13_managed_location.q.out +++ ql/src/test/results/clientpositive/exim_13_managed_location.q.out @@ -50,7 +50,9 @@ PREHOOK: query: describe extended exim_department PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended exim_department POSTHOOK: type: DESCTABLE -dep_id int department id +# col_name data_type comment + +dep_id int department id #### A masked pattern was here #### PREHOOK: query: select * from exim_department diff --git ql/src/test/results/clientpositive/exim_14_managed_location_over_existing.q.out ql/src/test/results/clientpositive/exim_14_managed_location_over_existing.q.out index 4042914..5b22dfa 100644 --- ql/src/test/results/clientpositive/exim_14_managed_location_over_existing.q.out +++ ql/src/test/results/clientpositive/exim_14_managed_location_over_existing.q.out @@ -62,7 +62,9 @@ PREHOOK: query: describe extended exim_department PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended exim_department POSTHOOK: type: DESCTABLE -dep_id int department id +# col_name data_type comment + +dep_id int department id #### A masked pattern was here #### PREHOOK: query: select * from exim_department diff --git ql/src/test/results/clientpositive/exim_15_external_part.q.out ql/src/test/results/clientpositive/exim_15_external_part.q.out index 98a3700..7e10f08 100644 --- ql/src/test/results/clientpositive/exim_15_external_part.q.out +++ ql/src/test/results/clientpositive/exim_15_external_part.q.out @@ -125,9 +125,17 @@ PREHOOK: query: describe extended exim_employee PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended exim_employee POSTHOOK: type: DESCTABLE -emp_id int employee id -emp_country string two char iso code -emp_state string free text +# col_name data_type comment + +emp_id int employee id +emp_country string two char iso code +emp_state string free text + +# Partition Information +# col_name data_type comment + +emp_country string two char iso code +emp_state string free text #### A masked pattern was here #### PREHOOK: query: select * from exim_employee diff --git ql/src/test/results/clientpositive/exim_18_part_external.q.out ql/src/test/results/clientpositive/exim_18_part_external.q.out index ceeb342..cbf18b2 100644 --- ql/src/test/results/clientpositive/exim_18_part_external.q.out +++ ql/src/test/results/clientpositive/exim_18_part_external.q.out @@ -90,9 +90,17 @@ PREHOOK: query: describe extended exim_employee PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended exim_employee POSTHOOK: type: DESCTABLE -emp_id int employee id -emp_country string two char iso code -emp_state string free text +# col_name data_type comment + +emp_id int employee id +emp_country string two char iso code +emp_state string free text + +# Partition Information +# col_name data_type comment + +emp_country string two char iso code +emp_state string free text #### A masked pattern was here #### PREHOOK: query: show table extended like exim_employee diff --git ql/src/test/results/clientpositive/exim_19_00_part_external_location.q.out ql/src/test/results/clientpositive/exim_19_00_part_external_location.q.out index fc59807..66af54e 100644 --- ql/src/test/results/clientpositive/exim_19_00_part_external_location.q.out +++ ql/src/test/results/clientpositive/exim_19_00_part_external_location.q.out @@ -72,9 +72,17 @@ PREHOOK: query: describe extended exim_employee PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended exim_employee POSTHOOK: type: DESCTABLE -emp_id int employee id -emp_country string two char iso code -emp_state string free text +# col_name data_type comment + +emp_id int employee id +emp_country string two char iso code +emp_state string free text + +# Partition Information +# col_name data_type comment + +emp_country string two char iso code +emp_state string free text #### A masked pattern was here #### PREHOOK: query: show table extended like exim_employee diff --git ql/src/test/results/clientpositive/exim_19_part_external_location.q.out ql/src/test/results/clientpositive/exim_19_part_external_location.q.out index 86a3ea6..fe674f6 100644 --- ql/src/test/results/clientpositive/exim_19_part_external_location.q.out +++ ql/src/test/results/clientpositive/exim_19_part_external_location.q.out @@ -93,9 +93,17 @@ PREHOOK: query: describe extended exim_employee PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended exim_employee POSTHOOK: type: DESCTABLE -emp_id int employee id -emp_country string two char iso code -emp_state string free text +# col_name data_type comment + +emp_id int employee id +emp_country string two char iso code +emp_state string free text + +# Partition Information +# col_name data_type comment + +emp_country string two char iso code +emp_state string free text #### A masked pattern was here #### PREHOOK: query: show table extended like exim_employee diff --git ql/src/test/results/clientpositive/exim_20_part_managed_location.q.out ql/src/test/results/clientpositive/exim_20_part_managed_location.q.out index b1ba7e0..1e1866f 100644 --- ql/src/test/results/clientpositive/exim_20_part_managed_location.q.out +++ ql/src/test/results/clientpositive/exim_20_part_managed_location.q.out @@ -93,9 +93,17 @@ PREHOOK: query: describe extended exim_employee PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended exim_employee POSTHOOK: type: DESCTABLE -emp_id int employee id -emp_country string two char iso code -emp_state string free text +# col_name data_type comment + +emp_id int employee id +emp_country string two char iso code +emp_state string free text + +# Partition Information +# col_name data_type comment + +emp_country string two char iso code +emp_state string free text #### A masked pattern was here #### PREHOOK: query: show table extended like exim_employee diff --git ql/src/test/results/clientpositive/inputddl6.q.out ql/src/test/results/clientpositive/inputddl6.q.out index 68fa4ad..52b8f0a 100644 --- ql/src/test/results/clientpositive/inputddl6.q.out +++ ql/src/test/results/clientpositive/inputddl6.q.out @@ -27,18 +27,32 @@ PREHOOK: query: DESCRIBE EXTENDED INPUTDDL6 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED INPUTDDL6 POSTHOOK: type: DESCTABLE -key string -value string -ds string +# col_name data_type comment + +key string None +value string None +ds string None + +# Partition Information +# col_name data_type comment + +ds string None #### A masked pattern was here #### PREHOOK: query: DESCRIBE EXTENDED INPUTDDL6 PARTITION (ds='2008-04-08') PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED INPUTDDL6 PARTITION (ds='2008-04-08') POSTHOOK: type: DESCTABLE -key string -value string -ds string +# col_name data_type comment + +key string None +value string None +ds string None + +# Partition Information +# col_name data_type comment + +ds string None #### A masked pattern was here #### PREHOOK: query: SHOW PARTITIONS INPUTDDL6 diff --git ql/src/test/results/clientpositive/load_dyn_part1.q.out ql/src/test/results/clientpositive/load_dyn_part1.q.out index 4204e48..b6fd6a7 100644 --- ql/src/test/results/clientpositive/load_dyn_part1.q.out +++ ql/src/test/results/clientpositive/load_dyn_part1.q.out @@ -20,10 +20,18 @@ PREHOOK: query: describe extended nzhang_part1 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended nzhang_part1 POSTHOOK: type: DESCTABLE -key string default -value string default -ds string -hr string +# col_name data_type comment + +key string default +value string default +ds string None +hr string None + +# Partition Information +# col_name data_type comment + +ds string None +hr string None #### A masked pattern was here #### PREHOOK: query: explain diff --git ql/src/test/results/clientpositive/load_dyn_part10.q.out ql/src/test/results/clientpositive/load_dyn_part10.q.out index 3477f3e..5dc2e68 100644 --- ql/src/test/results/clientpositive/load_dyn_part10.q.out +++ ql/src/test/results/clientpositive/load_dyn_part10.q.out @@ -15,10 +15,18 @@ PREHOOK: query: describe extended nzhang_part10 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended nzhang_part10 POSTHOOK: type: DESCTABLE -key string default -value string default -ds string -hr string +# col_name data_type comment + +key string default +value string default +ds string None +hr string None + +# Partition Information +# col_name data_type comment + +ds string None +hr string None #### A masked pattern was here #### PREHOOK: query: explain diff --git ql/src/test/results/clientpositive/load_dyn_part11.q.out ql/src/test/results/clientpositive/load_dyn_part11.q.out index bcba1cd..c3fae60 100644 --- ql/src/test/results/clientpositive/load_dyn_part11.q.out +++ ql/src/test/results/clientpositive/load_dyn_part11.q.out @@ -15,10 +15,18 @@ PREHOOK: query: describe extended nzhang_part PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended nzhang_part POSTHOOK: type: DESCTABLE -key string default -value string default -ds string -hr string +# col_name data_type comment + +key string default +value string default +ds string None +hr string None + +# Partition Information +# col_name data_type comment + +ds string None +hr string None #### A masked pattern was here #### PREHOOK: query: insert overwrite table nzhang_part partition (ds="2010-03-03", hr) select key, value, hr from srcpart where ds is not null and hr is not null diff --git ql/src/test/results/clientpositive/load_dyn_part12.q.out ql/src/test/results/clientpositive/load_dyn_part12.q.out index d8970fe..629ef48 100644 --- ql/src/test/results/clientpositive/load_dyn_part12.q.out +++ ql/src/test/results/clientpositive/load_dyn_part12.q.out @@ -15,10 +15,18 @@ PREHOOK: query: describe extended nzhang_part12 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended nzhang_part12 POSTHOOK: type: DESCTABLE -key string default -value string default -ds string -hr string +# col_name data_type comment + +key string default +value string default +ds string None +hr string None + +# Partition Information +# col_name data_type comment + +ds string None +hr string None #### A masked pattern was here #### PREHOOK: query: insert overwrite table nzhang_part12 partition (ds="2010-03-03", hr) select key, value, cast(hr*2 as int) from srcpart where ds is not null and hr is not null diff --git ql/src/test/results/clientpositive/load_dyn_part13.q.out ql/src/test/results/clientpositive/load_dyn_part13.q.out index 8824ecf..69672b3 100644 --- ql/src/test/results/clientpositive/load_dyn_part13.q.out +++ ql/src/test/results/clientpositive/load_dyn_part13.q.out @@ -15,10 +15,18 @@ PREHOOK: query: describe extended nzhang_part13 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended nzhang_part13 POSTHOOK: type: DESCTABLE -key string default -value string default -ds string -hr string +# col_name data_type comment + +key string default +value string default +ds string None +hr string None + +# Partition Information +# col_name data_type comment + +ds string None +hr string None #### A masked pattern was here #### PREHOOK: query: explain diff --git ql/src/test/results/clientpositive/load_dyn_part14.q.out ql/src/test/results/clientpositive/load_dyn_part14.q.out index 99d7e24..8c784cc 100644 --- ql/src/test/results/clientpositive/load_dyn_part14.q.out +++ ql/src/test/results/clientpositive/load_dyn_part14.q.out @@ -15,8 +15,15 @@ PREHOOK: query: describe extended nzhang_part14 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended nzhang_part14 POSTHOOK: type: DESCTABLE -key string -value string +# col_name data_type comment + +key string None +value string None + +# Partition Information +# col_name data_type comment + +value string None #### A masked pattern was here #### PREHOOK: query: explain diff --git ql/src/test/results/clientpositive/load_dyn_part2.q.out ql/src/test/results/clientpositive/load_dyn_part2.q.out index ecbe7da..8400506 100644 --- ql/src/test/results/clientpositive/load_dyn_part2.q.out +++ ql/src/test/results/clientpositive/load_dyn_part2.q.out @@ -11,10 +11,18 @@ PREHOOK: query: describe extended nzhang_part_bucket PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended nzhang_part_bucket POSTHOOK: type: DESCTABLE -key string -value string -ds string -hr string +# col_name data_type comment + +key string None +value string None +ds string None +hr string None + +# Partition Information +# col_name data_type comment + +ds string None +hr string None #### A masked pattern was here #### PREHOOK: query: explain diff --git ql/src/test/results/clientpositive/load_dyn_part3.q.out ql/src/test/results/clientpositive/load_dyn_part3.q.out index 0a689e6..6012275 100644 --- ql/src/test/results/clientpositive/load_dyn_part3.q.out +++ ql/src/test/results/clientpositive/load_dyn_part3.q.out @@ -15,10 +15,18 @@ PREHOOK: query: describe extended nzhang_part3 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended nzhang_part3 POSTHOOK: type: DESCTABLE -key string default -value string default -ds string -hr string +# col_name data_type comment + +key string default +value string default +ds string None +hr string None + +# Partition Information +# col_name data_type comment + +ds string None +hr string None #### A masked pattern was here #### PREHOOK: query: explain diff --git ql/src/test/results/clientpositive/load_dyn_part4.q.out ql/src/test/results/clientpositive/load_dyn_part4.q.out index 2fdc875..ac99003 100644 --- ql/src/test/results/clientpositive/load_dyn_part4.q.out +++ ql/src/test/results/clientpositive/load_dyn_part4.q.out @@ -15,10 +15,18 @@ PREHOOK: query: describe extended nzhang_part4 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended nzhang_part4 POSTHOOK: type: DESCTABLE -key string default -value string default -ds string -hr string +# col_name data_type comment + +key string default +value string default +ds string None +hr string None + +# Partition Information +# col_name data_type comment + +ds string None +hr string None #### A masked pattern was here #### PREHOOK: query: insert overwrite table nzhang_part4 partition (ds='2008-04-08', hr='existing_value') select key, value from src diff --git ql/src/test/results/clientpositive/load_dyn_part5.q.out ql/src/test/results/clientpositive/load_dyn_part5.q.out index 8bdc266..5ef4a4f 100644 --- ql/src/test/results/clientpositive/load_dyn_part5.q.out +++ ql/src/test/results/clientpositive/load_dyn_part5.q.out @@ -7,8 +7,15 @@ PREHOOK: query: describe extended nzhang_part5 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended nzhang_part5 POSTHOOK: type: DESCTABLE -key string -value string +# col_name data_type comment + +key string None +value string None + +# Partition Information +# col_name data_type comment + +value string None #### A masked pattern was here #### PREHOOK: query: explain diff --git ql/src/test/results/clientpositive/load_dyn_part6.q.out ql/src/test/results/clientpositive/load_dyn_part6.q.out index 2923320..7019619 100644 --- ql/src/test/results/clientpositive/load_dyn_part6.q.out +++ ql/src/test/results/clientpositive/load_dyn_part6.q.out @@ -15,10 +15,18 @@ PREHOOK: query: describe extended nzhang_part6 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended nzhang_part6 POSTHOOK: type: DESCTABLE -key string default -value string default -ds string -hr string +# col_name data_type comment + +key string default +value string default +ds string None +hr string None + +# Partition Information +# col_name data_type comment + +ds string None +hr string None #### A masked pattern was here #### PREHOOK: query: insert overwrite table nzhang_part6 partition (ds="2010-03-03", hr) select key, value, hr from srcpart where ds is not null and hr is not null diff --git ql/src/test/results/clientpositive/load_dyn_part7.q.out ql/src/test/results/clientpositive/load_dyn_part7.q.out index 9f642d2..efba75e 100644 --- ql/src/test/results/clientpositive/load_dyn_part7.q.out +++ ql/src/test/results/clientpositive/load_dyn_part7.q.out @@ -15,10 +15,18 @@ PREHOOK: query: describe extended nzhang_part7 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended nzhang_part7 POSTHOOK: type: DESCTABLE -key string default -value string default -ds string -hr string +# col_name data_type comment + +key string default +value string default +ds string None +hr string None + +# Partition Information +# col_name data_type comment + +ds string None +hr string None #### A masked pattern was here #### PREHOOK: query: insert overwrite table nzhang_part7 partition (ds='2010-03-03', hr='12') select key, value from srcpart where ds = '2008-04-08' and hr = '12' diff --git ql/src/test/results/clientpositive/load_dyn_part8.q.out ql/src/test/results/clientpositive/load_dyn_part8.q.out index ac91714..bc6069a 100644 --- ql/src/test/results/clientpositive/load_dyn_part8.q.out +++ ql/src/test/results/clientpositive/load_dyn_part8.q.out @@ -15,10 +15,18 @@ PREHOOK: query: describe extended nzhang_part8 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended nzhang_part8 POSTHOOK: type: DESCTABLE -key string default -value string default -ds string -hr string +# col_name data_type comment + +key string default +value string default +ds string None +hr string None + +# Partition Information +# col_name data_type comment + +ds string None +hr string None #### A masked pattern was here #### PREHOOK: query: explain extended diff --git ql/src/test/results/clientpositive/load_dyn_part9.q.out ql/src/test/results/clientpositive/load_dyn_part9.q.out index 18e2596..9e1a42d 100644 --- ql/src/test/results/clientpositive/load_dyn_part9.q.out +++ ql/src/test/results/clientpositive/load_dyn_part9.q.out @@ -15,10 +15,18 @@ PREHOOK: query: describe extended nzhang_part9 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended nzhang_part9 POSTHOOK: type: DESCTABLE -key string default -value string default -ds string -hr string +# col_name data_type comment + +key string default +value string default +ds string None +hr string None + +# Partition Information +# col_name data_type comment + +ds string None +hr string None #### A masked pattern was here #### PREHOOK: query: explain diff --git ql/src/test/results/clientpositive/rcfile_bigdata.q.out ql/src/test/results/clientpositive/rcfile_bigdata.q.out index 932dfcc..08a62a0 100644 --- ql/src/test/results/clientpositive/rcfile_bigdata.q.out +++ ql/src/test/results/clientpositive/rcfile_bigdata.q.out @@ -31,8 +31,10 @@ POSTHOOK: query: describe columnTable_Bigdata POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: columntable_bigdata.key SCRIPT [(src)src.FieldSchema(name:key, type:string, comment:default), (src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: columntable_bigdata.value SCRIPT [(src)src.FieldSchema(name:key, type:string, comment:default), (src)src.FieldSchema(name:value, type:string, comment:default), ] -key string -value string +# col_name data_type comment + +key string None +value string None PREHOOK: query: select count(columnTable_Bigdata.key) from columnTable_Bigdata PREHOOK: type: QUERY PREHOOK: Input: default@columntable_bigdata diff --git ql/src/test/results/clientpositive/rcfile_columnar.q.out ql/src/test/results/clientpositive/rcfile_columnar.q.out index 6f05ab3..7e67bb8 100644 --- ql/src/test/results/clientpositive/rcfile_columnar.q.out +++ ql/src/test/results/clientpositive/rcfile_columnar.q.out @@ -31,8 +31,10 @@ POSTHOOK: query: describe columnTable POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: columntable.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: columntable.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -key string -value string +# col_name data_type comment + +key string None +value string None PREHOOK: query: SELECT columnTable.* FROM columnTable ORDER BY key ASC, value ASC PREHOOK: type: QUERY PREHOOK: Input: default@columntable diff --git ql/src/test/results/clientpositive/serde_reported_schema.q.out ql/src/test/results/clientpositive/serde_reported_schema.q.out index 6fac935..5dd81b4 100644 --- ql/src/test/results/clientpositive/serde_reported_schema.q.out +++ ql/src/test/results/clientpositive/serde_reported_schema.q.out @@ -17,10 +17,17 @@ PREHOOK: query: describe int_string PREHOOK: type: DESCTABLE POSTHOOK: query: describe int_string POSTHOOK: type: DESCTABLE -myint int from deserializer -mystring string from deserializer -underscore_int int from deserializer -b string +# col_name data_type comment + +myint int from deserializer +mystring string from deserializer +underscore_int int from deserializer +b string None + +# Partition Information +# col_name data_type comment + +b string None PREHOOK: query: alter table int_string add partition (b='part1') PREHOOK: type: ALTERTABLE_ADDPARTS PREHOOK: Input: default@int_string @@ -32,7 +39,14 @@ PREHOOK: query: describe int_string partition (b='part1') PREHOOK: type: DESCTABLE POSTHOOK: query: describe int_string partition (b='part1') POSTHOOK: type: DESCTABLE -myint int from deserializer -mystring string from deserializer -underscore_int int from deserializer -b string +# col_name data_type comment + +myint int from deserializer +mystring string from deserializer +underscore_int int from deserializer +b string None + +# Partition Information +# col_name data_type comment + +b string None