diff --git contrib/src/test/results/clientpositive/fileformat_base64.q.out contrib/src/test/results/clientpositive/fileformat_base64.q.out index 6c941de..2b3ae49 100644 --- contrib/src/test/results/clientpositive/fileformat_base64.q.out +++ contrib/src/test/results/clientpositive/fileformat_base64.q.out @@ -44,8 +44,10 @@ PREHOOK: query: DESCRIBE EXTENDED base64_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED base64_test POSTHOOK: type: DESCTABLE -key int -value string +# col_name data_type comment + +key int None +value string None #### A masked pattern was here #### PREHOOK: query: FROM src diff --git contrib/src/test/results/clientpositive/serde_s3.q.out contrib/src/test/results/clientpositive/serde_s3.q.out index e1ecc4b..8f4335a 100644 --- contrib/src/test/results/clientpositive/serde_s3.q.out +++ contrib/src/test/results/clientpositive/serde_s3.q.out @@ -15,23 +15,25 @@ PREHOOK: query: DESCRIBE s3log PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE s3log POSTHOOK: type: DESCTABLE +# col_name data_type comment + #### A masked pattern was here #### -bucketname string from deserializer -rdatetime string from deserializer -rip string from deserializer -requester string from deserializer -requestid string from deserializer -operation string from deserializer -rkey string from deserializer -requesturi string from deserializer -httpstatus int from deserializer -errorcode string from deserializer -bytessent int from deserializer -objsize int from deserializer -totaltime int from deserializer -turnaroundtime int from deserializer -referer string from deserializer -useragent string from deserializer +bucketname string from deserializer +rdatetime string from deserializer +rip string from deserializer +requester string from deserializer +requestid string from deserializer +operation string from deserializer +rkey string from deserializer +requesturi string from deserializer +httpstatus int from deserializer +errorcode string from deserializer +bytessent int from deserializer +objsize int from deserializer +totaltime int from deserializer +turnaroundtime int from deserializer +referer string from deserializer +useragent string from deserializer PREHOOK: query: LOAD DATA LOCAL INPATH '../contrib/data/files/s3.log' INTO TABLE s3log PREHOOK: type: LOAD PREHOOK: Output: default@s3log 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 hwi/src/test/org/apache/hadoop/hive/hwi/TestHWISessionManager.java hwi/src/test/org/apache/hadoop/hive/hwi/TestHWISessionManager.java index 8f05dc8..adcbd83 100644 --- hwi/src/test/org/apache/hadoop/hive/hwi/TestHWISessionManager.java +++ hwi/src/test/org/apache/hadoop/hive/hwi/TestHWISessionManager.java @@ -121,10 +121,15 @@ public class TestHWISessionManager extends TestCase { ArrayList> searchBlockRes = searchItem.getResultBucket(); - String resLine = searchBlockRes.get(0).get(0); + // "describe [table_name]" result format + // first line should be format name: + // "# col_name data_type comment" + // second line is empty + // the following lines contain the values + String resLine = searchBlockRes.get(0).get(2); assertEquals(true, resLine.contains("key")); assertEquals(true, resLine.contains("int")); - String resLine2 = searchBlockRes.get(0).get(1); + String resLine2 = searchBlockRes.get(0).get(3); assertEquals(true, resLine2.contains("value")); assertEquals(true, resLine2.contains("string")); diff --git jdbc/src/test/org/apache/hadoop/hive/jdbc/TestJdbcDriver.java jdbc/src/test/org/apache/hadoop/hive/jdbc/TestJdbcDriver.java index c316acf..1c59cb3 100644 --- jdbc/src/test/org/apache/hadoop/hive/jdbc/TestJdbcDriver.java +++ jdbc/src/test/org/apache/hadoop/hive/jdbc/TestJdbcDriver.java @@ -764,17 +764,23 @@ public class TestJdbcDriver extends TestCase { ResultSet res = stmt.executeQuery("describe " + tableName); + // "describe [table_name]" result format + // first line should be format name: + // "# col_name data_type comment" + // second line is empty + // the following lines contain the values res.next(); - assertEquals("Column name 'under_col' not found", "under_col", res.getString(1)); - assertEquals("Column type 'under_col' for column under_col not found", "int", res - .getString(2)); + assertEquals(true, res.getString(1).contains("col_name")); + assertEquals(true, res.getString(2).contains("data_type")); + assertEquals(true, res.getString(3).contains("comment")); res.next(); - assertEquals("Column name 'value' not found", "value", res.getString(1)); - assertEquals("Column type 'string' for column key not found", "string", res - .getString(2)); - + res.next(); + assertEquals(true, res.getString(1).contains("under_col")); + assertEquals(true, res.getString(2).contains("int")); + res.next(); + assertEquals(true, res.getString(1).contains("value")); + assertEquals(true, res.getString(2).contains("string")); assertFalse("More results found than expected", res.next()); - } public void testDatabaseMetaData() throws SQLException { 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/clientnegative/desc_failure2.q.out ql/src/test/results/clientnegative/desc_failure2.q.out index f0f6668..333a26a 100644 --- ql/src/test/results/clientnegative/desc_failure2.q.out +++ ql/src/test/results/clientnegative/desc_failure2.q.out @@ -2,8 +2,16 @@ PREHOOK: query: DESC srcpart PREHOOK: type: DESCTABLE POSTHOOK: query: DESC 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 FAILED: SemanticException [Error 10006]: Partition not found {ds=2012-04-08, hr=15} diff --git ql/src/test/results/clientnegative/drop_partition_filter_failure2.q.out ql/src/test/results/clientnegative/drop_partition_filter_failure2.q.out index 405015c..ea8f147 100644 --- ql/src/test/results/clientnegative/drop_partition_filter_failure2.q.out +++ ql/src/test/results/clientnegative/drop_partition_filter_failure2.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='US', d=1) PREHOOK: type: ALTERTABLE_ADDPARTS PREHOOK: Input: default@ptestfilter diff --git ql/src/test/results/clientnegative/protectmode_part_no_drop.q.out ql/src/test/results/clientnegative/protectmode_part_no_drop.q.out index db9abd2..2ec06df 100644 --- ql/src/test/results/clientnegative/protectmode_part_no_drop.q.out +++ ql/src/test/results/clientnegative/protectmode_part_no_drop.q.out @@ -31,9 +31,16 @@ PREHOOK: query: desc extended tbl_protectmode_no_drop partition (p='p1') PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl_protectmode_no_drop partition (p='p1') POSTHOOK: type: DESCTABLE -c1 string -c2 string -p string +# col_name data_type comment + +c1 string None +c2 string None +p string None + +# Partition Information +# col_name data_type comment + +p string None #### A masked pattern was here #### PREHOOK: query: alter table tbl_protectmode_no_drop drop partition (p='p1') diff --git ql/src/test/results/clientnegative/protectmode_tbl2.q.out ql/src/test/results/clientnegative/protectmode_tbl2.q.out index 844f055..480ca5c 100644 --- ql/src/test/results/clientnegative/protectmode_tbl2.q.out +++ ql/src/test/results/clientnegative/protectmode_tbl2.q.out @@ -46,8 +46,15 @@ PREHOOK: query: desc extended tbl_protectmode2 PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl_protectmode2 POSTHOOK: type: DESCTABLE -col string -p string +# col_name data_type comment + +col string None +p string None + +# Partition Information +# col_name data_type comment + +p string None #### A masked pattern was here #### FAILED: SemanticException [Error 10113]: Query against an offline table or partition Table tbl_protectmode2 diff --git ql/src/test/results/clientnegative/protectmode_tbl3.q.out ql/src/test/results/clientnegative/protectmode_tbl3.q.out index c625cc0..6dc70ef 100644 --- ql/src/test/results/clientnegative/protectmode_tbl3.q.out +++ ql/src/test/results/clientnegative/protectmode_tbl3.q.out @@ -31,7 +31,9 @@ PREHOOK: query: desc extended tbl_protectmode_4 PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl_protectmode_4 POSTHOOK: type: DESCTABLE -col string +# col_name data_type comment + +col string None #### A masked pattern was here #### FAILED: SemanticException [Error 10113]: Query against an offline table or partition Table tbl_protectmode_4 diff --git ql/src/test/results/clientnegative/protectmode_tbl4.q.out ql/src/test/results/clientnegative/protectmode_tbl4.q.out index 3c8902d..7a5058f 100644 --- ql/src/test/results/clientnegative/protectmode_tbl4.q.out +++ ql/src/test/results/clientnegative/protectmode_tbl4.q.out @@ -55,8 +55,15 @@ PREHOOK: query: desc extended tbl_protectmode_tbl4 PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl_protectmode_tbl4 POSTHOOK: type: DESCTABLE -col string -p string +# col_name data_type comment + +col string None +p string None + +# Partition Information +# col_name data_type comment + +p string None #### A masked pattern was here #### FAILED: SemanticException [Error 10113]: Query against an offline table or partition Table tbl_protectmode_tbl4 diff --git ql/src/test/results/clientnegative/protectmode_tbl5.q.out ql/src/test/results/clientnegative/protectmode_tbl5.q.out index 9825f84..4bb7b87 100644 --- ql/src/test/results/clientnegative/protectmode_tbl5.q.out +++ ql/src/test/results/clientnegative/protectmode_tbl5.q.out @@ -55,8 +55,15 @@ PREHOOK: query: desc extended tbl_protectmode_tbl5 PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl_protectmode_tbl5 POSTHOOK: type: DESCTABLE -col string -p string +# col_name data_type comment + +col string None +p string None + +# Partition Information +# col_name data_type comment + +p string None #### A masked pattern was here #### FAILED: SemanticException [Error 10113]: Query against an offline table or partition Table tbl_protectmode_tbl5 diff --git ql/src/test/results/clientnegative/protectmode_tbl_no_drop.q.out ql/src/test/results/clientnegative/protectmode_tbl_no_drop.q.out index 2bcc424..7ef9334 100644 --- ql/src/test/results/clientnegative/protectmode_tbl_no_drop.q.out +++ ql/src/test/results/clientnegative/protectmode_tbl_no_drop.q.out @@ -31,7 +31,9 @@ PREHOOK: query: desc extended tbl_protectmode__no_drop PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl_protectmode__no_drop POSTHOOK: type: DESCTABLE -col string +# col_name data_type comment + +col string None #### A masked pattern was here #### PREHOOK: query: drop table tbl_protectmode__no_drop diff --git ql/src/test/results/clientnegative/set_hiveconf_validation0.q.out ql/src/test/results/clientnegative/set_hiveconf_validation0.q.out index 9ecff1d..2cd2f58 100644 --- ql/src/test/results/clientnegative/set_hiveconf_validation0.q.out +++ ql/src/test/results/clientnegative/set_hiveconf_validation0.q.out @@ -4,6 +4,8 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: -- should fail: hive.join.cache.size accepts int type desc src POSTHOOK: type: DESCTABLE -key string default -value string default +# col_name data_type comment + +key string default +value string default Query returned non-zero code: 1, cause: 'SET hive.join.cache.size=test' FAILED because hive.join.cache.size expects an INT value. diff --git ql/src/test/results/clientnegative/set_hiveconf_validation1.q.out ql/src/test/results/clientnegative/set_hiveconf_validation1.q.out index 893d012..054cbe8 100644 --- ql/src/test/results/clientnegative/set_hiveconf_validation1.q.out +++ ql/src/test/results/clientnegative/set_hiveconf_validation1.q.out @@ -4,6 +4,8 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: -- should fail: hive.map.aggr.hash.min.reduction accepts float type desc src POSTHOOK: type: DESCTABLE -key string default -value string default +# col_name data_type comment + +key string default +value string default Query returned non-zero code: 1, cause: 'SET hive.map.aggr.hash.min.reduction=false' FAILED because hive.map.aggr.hash.min.reduction expects an FLOAT value. 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/alter4.q.out ql/src/test/results/clientpositive/alter4.q.out index e471131..d618fa6 100644 --- ql/src/test/results/clientpositive/alter4.q.out +++ ql/src/test/results/clientpositive/alter4.q.out @@ -7,8 +7,10 @@ PREHOOK: query: DESCRIBE EXTENDED set_bucketing_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED set_bucketing_test POSTHOOK: type: DESCTABLE -key int -value string +# col_name data_type comment + +key int None +value string None #### A masked pattern was here #### PREHOOK: query: ALTER TABLE set_bucketing_test NOT CLUSTERED @@ -23,8 +25,10 @@ PREHOOK: query: DESCRIBE EXTENDED set_bucketing_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED set_bucketing_test POSTHOOK: type: DESCTABLE -key int -value string +# col_name data_type comment + +key int None +value string None #### A masked pattern was here #### PREHOOK: query: -- Cleanup @@ -74,8 +78,10 @@ PREHOOK: query: DESCRIBE EXTENDED set_bucketing_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED set_bucketing_test POSTHOOK: type: DESCTABLE -key int -value string +# col_name data_type comment + +key int None +value string None #### A masked pattern was here #### PREHOOK: query: ALTER TABLE set_bucketing_test NOT CLUSTERED @@ -90,8 +96,10 @@ PREHOOK: query: DESCRIBE EXTENDED set_bucketing_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED set_bucketing_test POSTHOOK: type: DESCTABLE -key int -value string +# col_name data_type comment + +key int None +value string None #### A masked pattern was here #### PREHOOK: query: DROP TABLE set_bucketing_test 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_index.q.out ql/src/test/results/clientpositive/alter_index.q.out index 5218c8f..d34bd67 100644 --- ql/src/test/results/clientpositive/alter_index.q.out +++ ql/src/test/results/clientpositive/alter_index.q.out @@ -11,9 +11,11 @@ PREHOOK: query: desc extended default__src_src_index_8__ PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended default__src_src_index_8__ POSTHOOK: type: DESCTABLE -key string default -_bucketname string -_offsets array +# col_name data_type comment + +key string default +_bucketname string +_offsets array #### A masked pattern was here #### PREHOOK: query: alter index src_index_8 on src set IDXPROPERTIES ("prop1"="val1_new", "prop3"="val3") @@ -24,9 +26,11 @@ PREHOOK: query: desc extended default__src_src_index_8__ PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended default__src_src_index_8__ POSTHOOK: type: DESCTABLE -key string default -_bucketname string -_offsets array +# col_name data_type comment + +key string default +_bucketname string +_offsets array #### A masked pattern was here #### PREHOOK: query: drop index src_index_8 on src diff --git ql/src/test/results/clientpositive/alter_merge_2.q.out ql/src/test/results/clientpositive/alter_merge_2.q.out index 29ded41..d786447 100644 --- ql/src/test/results/clientpositive/alter_merge_2.q.out +++ ql/src/test/results/clientpositive/alter_merge_2.q.out @@ -14,10 +14,18 @@ PREHOOK: query: desc extended src_rc_merge_test_part partition (ds='2012-01-03', PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended src_rc_merge_test_part partition (ds='2012-01-03', ts='2012-01-03+14:46:31') POSTHOOK: type: DESCTABLE -key int -value string -ds string -ts string +# col_name data_type comment + +key int None +value string None +ds string None +ts string None + +# Partition Information +# col_name data_type comment + +ds string None +ts string None #### A masked pattern was here #### PREHOOK: query: load data local inpath '../data/files/smbbucket_1.rc' into table src_rc_merge_test_part partition (ds='2012-01-03', ts='2012-01-03+14:46:31') diff --git ql/src/test/results/clientpositive/alter_merge_stats.q.out ql/src/test/results/clientpositive/alter_merge_stats.q.out index 907ad64..bc43f0b 100644 --- ql/src/test/results/clientpositive/alter_merge_stats.q.out +++ ql/src/test/results/clientpositive/alter_merge_stats.q.out @@ -42,8 +42,10 @@ PREHOOK: query: desc extended src_rc_merge_test_stat PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended src_rc_merge_test_stat POSTHOOK: type: DESCTABLE -key int -value string +# col_name data_type comment + +key int None +value string None #### A masked pattern was here #### PREHOOK: query: analyze table src_rc_merge_test_stat compute statistics @@ -58,8 +60,10 @@ PREHOOK: query: desc extended src_rc_merge_test_stat PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended src_rc_merge_test_stat POSTHOOK: type: DESCTABLE -key int -value string +# col_name data_type comment + +key int None +value string None #### A masked pattern was here #### PREHOOK: query: alter table src_rc_merge_test_stat concatenate @@ -91,8 +95,10 @@ PREHOOK: query: desc extended src_rc_merge_test_stat PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended src_rc_merge_test_stat POSTHOOK: type: DESCTABLE -key int -value string +# col_name data_type comment + +key int None +value string None #### A masked pattern was here #### PREHOOK: query: create table src_rc_merge_test_part_stat(key int, value string) partitioned by (ds string) stored as rcfile @@ -146,9 +152,16 @@ PREHOOK: query: desc extended src_rc_merge_test_part_stat PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended src_rc_merge_test_part_stat POSTHOOK: type: DESCTABLE -key int -value string -ds string +# col_name data_type comment + +key int None +value string None +ds string None + +# Partition Information +# col_name data_type comment + +ds string None #### A masked pattern was here #### PREHOOK: query: analyze table src_rc_merge_test_part_stat partition(ds='2011') compute statistics @@ -165,9 +178,16 @@ PREHOOK: query: desc extended src_rc_merge_test_part_stat PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended src_rc_merge_test_part_stat POSTHOOK: type: DESCTABLE -key int -value string -ds string +# col_name data_type comment + +key int 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 src_rc_merge_test_part_stat partition (ds='2011') concatenate @@ -199,9 +219,16 @@ PREHOOK: query: desc extended src_rc_merge_test_part_stat PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended src_rc_merge_test_part_stat POSTHOOK: type: DESCTABLE -key int -value string -ds string +# col_name data_type comment + +key int None +value string None +ds string None + +# Partition Information +# col_name data_type comment + +ds string None #### A masked pattern was here #### PREHOOK: query: drop table src_rc_merge_test_stat diff --git ql/src/test/results/clientpositive/alter_partition_format_loc.q.out ql/src/test/results/clientpositive/alter_partition_format_loc.q.out index 6d3f631..22f3467 100644 --- ql/src/test/results/clientpositive/alter_partition_format_loc.q.out +++ ql/src/test/results/clientpositive/alter_partition_format_loc.q.out @@ -7,8 +7,10 @@ PREHOOK: query: desc extended alter_partition_format_test PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended alter_partition_format_test POSTHOOK: type: DESCTABLE -key int -value string +# col_name data_type comment + +key int None +value string None #### A masked pattern was here #### PREHOOK: query: alter table alter_partition_format_test set fileformat rcfile @@ -23,8 +25,10 @@ PREHOOK: query: desc extended alter_partition_format_test PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended alter_partition_format_test POSTHOOK: type: DESCTABLE -key int -value string +# col_name data_type comment + +key int None +value string None #### A masked pattern was here #### PREHOOK: type: ALTERTABLE_LOCATION @@ -38,8 +42,10 @@ PREHOOK: query: desc extended alter_partition_format_test PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended alter_partition_format_test POSTHOOK: type: DESCTABLE -key int -value string +# col_name data_type comment + +key int None +value string None #### A masked pattern was here #### PREHOOK: query: drop table alter_partition_format_test @@ -68,9 +74,16 @@ PREHOOK: query: desc extended alter_partition_format_test partition(ds='2010') PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended alter_partition_format_test partition(ds='2010') POSTHOOK: type: DESCTABLE -key int -value string -ds string +# col_name data_type comment + +key int 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 alter_partition_format_test partition(ds='2010') set fileformat rcfile @@ -86,9 +99,16 @@ PREHOOK: query: desc extended alter_partition_format_test partition(ds='2010') PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended alter_partition_format_test partition(ds='2010') POSTHOOK: type: DESCTABLE -key int -value string -ds string +# col_name data_type comment + +key int None +value string None +ds string None + +# Partition Information +# col_name data_type comment + +ds string None #### A masked pattern was here #### PREHOOK: type: ALTERPARTITION_LOCATION @@ -103,18 +123,32 @@ PREHOOK: query: desc extended alter_partition_format_test partition(ds='2010') PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended alter_partition_format_test partition(ds='2010') POSTHOOK: type: DESCTABLE -key int -value string -ds string +# col_name data_type comment + +key int None +value string None +ds string None + +# Partition Information +# col_name data_type comment + +ds string None #### A masked pattern was here #### PREHOOK: query: desc extended alter_partition_format_test PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended alter_partition_format_test POSTHOOK: type: DESCTABLE -key int -value string -ds string +# col_name data_type comment + +key int 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 alter_partition_format_test set fileformat rcfile @@ -129,9 +163,16 @@ PREHOOK: query: desc extended alter_partition_format_test PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended alter_partition_format_test POSTHOOK: type: DESCTABLE -key int -value string -ds string +# col_name data_type comment + +key int None +value string None +ds string None + +# Partition Information +# col_name data_type comment + +ds string None #### A masked pattern was here #### PREHOOK: type: ALTERTABLE_LOCATION @@ -145,9 +186,16 @@ PREHOOK: query: desc extended alter_partition_format_test PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended alter_partition_format_test POSTHOOK: type: DESCTABLE -key int -value string -ds string +# col_name data_type comment + +key int None +value string None +ds string None + +# Partition Information +# col_name data_type comment + +ds string None #### A masked pattern was here #### PREHOOK: query: drop table alter_partition_format_test 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/alter_view_rename.q.out ql/src/test/results/clientpositive/alter_view_rename.q.out index e83b08b..33af843 100644 --- ql/src/test/results/clientpositive/alter_view_rename.q.out +++ ql/src/test/results/clientpositive/alter_view_rename.q.out @@ -14,9 +14,11 @@ PREHOOK: query: DESCRIBE EXTENDED view1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED view1 POSTHOOK: type: DESCTABLE -foo int -bar string -ds string +# col_name data_type comment + +foo int None +bar string None +ds string None #### A masked pattern was here #### PREHOOK: query: ALTER VIEW view1 RENAME TO view2 @@ -32,9 +34,11 @@ PREHOOK: query: DESCRIBE EXTENDED view2 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED view2 POSTHOOK: type: DESCTABLE -foo int -bar string -ds string +# col_name data_type comment + +foo int None +bar string None +ds string None #### A masked pattern was here #### PREHOOK: query: SELECT * FROM view2 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/authorization_7.q.out ql/src/test/results/clientpositive/authorization_7.q.out index 285a1ac..ee94e92 100644 --- ql/src/test/results/clientpositive/authorization_7.q.out +++ ql/src/test/results/clientpositive/authorization_7.q.out @@ -11,8 +11,10 @@ PREHOOK: query: DESCRIBE src_authorization_7 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE src_authorization_7 POSTHOOK: type: DESCTABLE -key int -value string +# col_name data_type comment + +key int None +value string None PREHOOK: query: DROP TABLE src_authorization_7 PREHOOK: type: DROPTABLE PREHOOK: Input: default@src_authorization_7 @@ -38,8 +40,10 @@ PREHOOK: query: DESCRIBE src_authorization_7 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE src_authorization_7 POSTHOOK: type: DESCTABLE -key int -value string +# col_name data_type comment + +key int None +value string None PREHOOK: query: DROP TABLE src_authorization_7 PREHOOK: type: DROPTABLE PREHOOK: Input: default@src_authorization_7 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/avro_change_schema.q.out ql/src/test/results/clientpositive/avro_change_schema.q.out index ad56a65..87edc83 100644 --- ql/src/test/results/clientpositive/avro_change_schema.q.out +++ ql/src/test/results/clientpositive/avro_change_schema.q.out @@ -33,8 +33,10 @@ PREHOOK: query: DESCRIBE avro2 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE avro2 POSTHOOK: type: DESCTABLE -string1 string from deserializer -string2 string from deserializer +# col_name data_type comment + +string1 string from deserializer +string2 string from deserializer PREHOOK: query: ALTER TABLE avro2 SET TBLPROPERTIES ('avro.schema.literal'='{ "namespace": "org.apache.hive", "name": "second_schema", "type": "record", @@ -61,6 +63,8 @@ PREHOOK: query: DESCRIBE avro2 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE avro2 POSTHOOK: type: DESCTABLE -int1 int from deserializer -float1 float from deserializer -double1 double from deserializer +# col_name data_type comment + +int1 int from deserializer +float1 float from deserializer +double1 double from deserializer diff --git ql/src/test/results/clientpositive/avro_evolved_schemas.q.out ql/src/test/results/clientpositive/avro_evolved_schemas.q.out index b2fd75c..40d700d 100644 --- ql/src/test/results/clientpositive/avro_evolved_schemas.q.out +++ ql/src/test/results/clientpositive/avro_evolved_schemas.q.out @@ -75,10 +75,12 @@ PREHOOK: query: DESCRIBE doctors_with_new_field PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE doctors_with_new_field POSTHOOK: type: DESCTABLE -number int from deserializer -first_name string from deserializer -last_name string from deserializer -extra_field string from deserializer +# col_name data_type comment + +number int from deserializer +first_name string from deserializer +last_name string from deserializer +extra_field string from deserializer PREHOOK: query: LOAD DATA LOCAL INPATH '../data/files/doctors.avro' INTO TABLE doctors_with_new_field PREHOOK: type: LOAD PREHOOK: Output: default@doctors_with_new_field diff --git ql/src/test/results/clientpositive/avro_joins.q.out ql/src/test/results/clientpositive/avro_joins.q.out index 208c09d..db98485 100644 --- ql/src/test/results/clientpositive/avro_joins.q.out +++ ql/src/test/results/clientpositive/avro_joins.q.out @@ -77,10 +77,12 @@ PREHOOK: query: DESCRIBE doctors4 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE doctors4 POSTHOOK: type: DESCTABLE -number int from deserializer -first_name string from deserializer -last_name string from deserializer -extra_field string from deserializer +# col_name data_type comment + +number int from deserializer +first_name string from deserializer +last_name string from deserializer +extra_field string from deserializer PREHOOK: query: LOAD DATA LOCAL INPATH '../data/files/doctors.avro' INTO TABLE doctors4 PREHOOK: type: LOAD PREHOOK: Output: default@doctors4 @@ -150,9 +152,11 @@ PREHOOK: query: DESCRIBE episodes PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE episodes POSTHOOK: type: DESCTABLE -title string from deserializer -air_date string from deserializer -doctor int from deserializer +# col_name data_type comment + +title string from deserializer +air_date string from deserializer +doctor int from deserializer PREHOOK: query: LOAD DATA LOCAL INPATH '../data/files/episodes.avro' INTO TABLE episodes PREHOOK: type: LOAD PREHOOK: Output: default@episodes diff --git ql/src/test/results/clientpositive/avro_sanity_test.q.out ql/src/test/results/clientpositive/avro_sanity_test.q.out index 40e4e42..e625a4c 100644 --- ql/src/test/results/clientpositive/avro_sanity_test.q.out +++ ql/src/test/results/clientpositive/avro_sanity_test.q.out @@ -63,9 +63,11 @@ PREHOOK: query: DESCRIBE doctors PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE doctors POSTHOOK: type: DESCTABLE -number int from deserializer -first_name string from deserializer -last_name string from deserializer +# col_name data_type comment + +number int from deserializer +first_name string from deserializer +last_name string from deserializer PREHOOK: query: LOAD DATA LOCAL INPATH '../data/files/doctors.avro' INTO TABLE doctors PREHOOK: type: LOAD PREHOOK: Output: default@doctors diff --git ql/src/test/results/clientpositive/avro_schema_error_message.q.out ql/src/test/results/clientpositive/avro_schema_error_message.q.out index 4fe9581..b699181 100644 --- ql/src/test/results/clientpositive/avro_schema_error_message.q.out +++ ql/src/test/results/clientpositive/avro_schema_error_message.q.out @@ -21,10 +21,12 @@ PREHOOK: query: DESCRIBE avro_with_no_schema PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE avro_with_no_schema POSTHOOK: type: DESCTABLE -error_error_error_error_error_error_error string from deserializer -cannot_determine_schema string from deserializer -check string from deserializer -schema string from deserializer -url string from deserializer -and string from deserializer -literal string from deserializer +# col_name data_type comment + +error_error_error_error_error_error_error string from deserializer +cannot_determine_schema string from deserializer +check string from deserializer +schema string from deserializer +url string from deserializer +and string from deserializer +literal string from deserializer diff --git ql/src/test/results/clientpositive/avro_schema_literal.q.out ql/src/test/results/clientpositive/avro_schema_literal.q.out index 4f821d1..87de151 100644 --- ql/src/test/results/clientpositive/avro_schema_literal.q.out +++ ql/src/test/results/clientpositive/avro_schema_literal.q.out @@ -63,19 +63,21 @@ PREHOOK: query: DESCRIBE avro1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE avro1 POSTHOOK: type: DESCTABLE -string1 string from deserializer -int1 int from deserializer -tinyint1 int from deserializer -smallint1 int from deserializer -bigint1 bigint from deserializer -boolean1 boolean from deserializer -float1 float from deserializer -double1 double from deserializer -list1 array from deserializer -map1 map from deserializer -struct1 struct from deserializer -union1 uniontype from deserializer -enum1 string from deserializer -nullableint int from deserializer -bytes1 array from deserializer -fixed1 array from deserializer +# col_name data_type comment + +string1 string from deserializer +int1 int from deserializer +tinyint1 int from deserializer +smallint1 int from deserializer +bigint1 bigint from deserializer +boolean1 boolean from deserializer +float1 float from deserializer +double1 double from deserializer +list1 array from deserializer +map1 map from deserializer +struct1 struct from deserializer +union1 uniontype from deserializer +enum1 string from deserializer +nullableint int from deserializer +bytes1 array from deserializer +fixed1 array from deserializer 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/combine3.q.out ql/src/test/results/clientpositive/combine3.q.out index 19eba39..b4dee27 100644 --- ql/src/test/results/clientpositive/combine3.q.out +++ ql/src/test/results/clientpositive/combine3.q.out @@ -47,10 +47,18 @@ POSTHOOK: Lineage: combine_3_srcpart_seq_rc PARTITION(ds=2010-08-03,hr=001).key POSTHOOK: Lineage: combine_3_srcpart_seq_rc PARTITION(ds=2010-08-03,hr=001).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: combine_3_srcpart_seq_rc PARTITION(ds=2010-08-03,hr=00).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: combine_3_srcpart_seq_rc PARTITION(ds=2010-08-03,hr=00).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -key int -value string -ds string -hr string +# col_name data_type comment + +key int 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: desc extended combine_3_srcpart_seq_rc partition(ds="2010-08-03", hr="001") @@ -61,10 +69,18 @@ POSTHOOK: Lineage: combine_3_srcpart_seq_rc PARTITION(ds=2010-08-03,hr=001).key POSTHOOK: Lineage: combine_3_srcpart_seq_rc PARTITION(ds=2010-08-03,hr=001).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: combine_3_srcpart_seq_rc PARTITION(ds=2010-08-03,hr=00).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: combine_3_srcpart_seq_rc PARTITION(ds=2010-08-03,hr=00).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -key int -value string -ds string -hr string +# col_name data_type comment + +key int 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: select key, value, ds, hr from combine_3_srcpart_seq_rc where ds="2010-08-03" order by key, hr limit 30 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_1.q.out ql/src/test/results/clientpositive/create_1.q.out index 8668420..ed65478 100644 --- ql/src/test/results/clientpositive/create_1.q.out +++ ql/src/test/results/clientpositive/create_1.q.out @@ -7,14 +7,18 @@ 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 EXTENDED table1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED table1 POSTHOOK: type: DESCTABLE -a string -b string +# col_name data_type comment + +a string None +b string None #### A masked pattern was here #### PREHOOK: query: CREATE TABLE IF NOT EXISTS table1 (a STRING, b STRING) STORED AS TEXTFILE @@ -30,14 +34,18 @@ PREHOOK: query: DESCRIBE table2 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE table2 POSTHOOK: type: DESCTABLE -a string -b int +# col_name data_type comment + +a string None +b int None PREHOOK: query: DESCRIBE EXTENDED table2 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED table2 POSTHOOK: type: DESCTABLE -a string -b int +# col_name data_type comment + +a string None +b int None #### A masked pattern was here #### PREHOOK: query: CREATE TABLE table3 (a STRING, b STRING) @@ -53,14 +61,18 @@ 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 EXTENDED table3 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED table3 POSTHOOK: type: DESCTABLE -a string -b string +# col_name data_type comment + +a string None +b string None #### A masked pattern was here #### PREHOOK: query: CREATE TABLE table4 (a STRING, b STRING) @@ -76,14 +88,18 @@ PREHOOK: query: DESCRIBE table4 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE table4 POSTHOOK: type: DESCTABLE -a string -b string +# col_name data_type comment + +a string None +b string None PREHOOK: query: DESCRIBE EXTENDED table4 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED table4 POSTHOOK: type: DESCTABLE -a string -b string +# col_name data_type comment + +a string None +b string None #### A masked pattern was here #### PREHOOK: query: CREATE TABLE table5 (a STRING, b STRING) @@ -99,13 +115,17 @@ PREHOOK: query: DESCRIBE table5 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE table5 POSTHOOK: type: DESCTABLE -a string -b string +# col_name data_type comment + +a string None +b string None PREHOOK: query: DESCRIBE EXTENDED table5 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED table5 POSTHOOK: type: DESCTABLE -a string -b string +# col_name data_type comment + +a string None +b string None #### A masked pattern was here #### diff --git ql/src/test/results/clientpositive/create_default_prop.q.out ql/src/test/results/clientpositive/create_default_prop.q.out index ccd7a7e..b8f9985 100644 --- ql/src/test/results/clientpositive/create_default_prop.q.out +++ ql/src/test/results/clientpositive/create_default_prop.q.out @@ -7,7 +7,9 @@ PREHOOK: query: DESC EXTENDED table_p1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESC EXTENDED table_p1 POSTHOOK: type: DESCTABLE -a string +# col_name data_type comment + +a string None #### A masked pattern was here #### PREHOOK: query: CREATE TABLE table_p2 LIKE table_p1 @@ -19,7 +21,9 @@ PREHOOK: query: DESC EXTENDED table_p2 PREHOOK: type: DESCTABLE POSTHOOK: query: DESC EXTENDED table_p2 POSTHOOK: type: DESCTABLE -a string +# col_name data_type comment + +a string None #### A masked pattern was here #### PREHOOK: query: CREATE TABLE table_p3 AS SELECT * FROM table_p1 @@ -33,6 +37,8 @@ PREHOOK: query: DESC EXTENDED table_p3 PREHOOK: type: DESCTABLE POSTHOOK: query: DESC EXTENDED table_p3 POSTHOOK: type: DESCTABLE -a string +# col_name data_type comment + +a string None #### A masked pattern was here #### diff --git ql/src/test/results/clientpositive/create_escape.q.out ql/src/test/results/clientpositive/create_escape.q.out index 37f693d..f6b93e6 100644 --- ql/src/test/results/clientpositive/create_escape.q.out +++ ql/src/test/results/clientpositive/create_escape.q.out @@ -11,14 +11,18 @@ 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 EXTENDED table1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED table1 POSTHOOK: type: DESCTABLE -a string -b string +# col_name data_type comment + +a string None +b string None #### A masked pattern was here #### PREHOOK: query: INSERT OVERWRITE TABLE table1 SELECT key, '\\\t\\' FROM src WHERE key = 86 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/create_nested_type.q.out ql/src/test/results/clientpositive/create_nested_type.q.out index d71178a..9c44708 100644 --- ql/src/test/results/clientpositive/create_nested_type.q.out +++ ql/src/test/results/clientpositive/create_nested_type.q.out @@ -17,18 +17,22 @@ PREHOOK: query: DESCRIBE table1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE table1 POSTHOOK: type: DESCTABLE -a string -b array -c array> -d map> +# col_name data_type comment + +a string None +b array None +c array> None +d map> None PREHOOK: query: DESCRIBE EXTENDED table1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED table1 POSTHOOK: type: DESCTABLE -a string -b array -c array> -d map> +# col_name data_type comment + +a string None +b array None +c array> None +d map> None #### A masked pattern was here #### PREHOOK: query: LOAD DATA LOCAL INPATH '../data/files/create_nested_type.txt' OVERWRITE INTO TABLE table1 diff --git ql/src/test/results/clientpositive/create_view.q.out ql/src/test/results/clientpositive/create_view.q.out index c390dcf..08049f3 100644 --- ql/src/test/results/clientpositive/create_view.q.out +++ ql/src/test/results/clientpositive/create_view.q.out @@ -231,12 +231,16 @@ PREHOOK: query: DESCRIBE view1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE view1 POSTHOOK: type: DESCTABLE -value string +# col_name data_type comment + +value string None PREHOOK: query: DESCRIBE EXTENDED view1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED view1 POSTHOOK: type: DESCTABLE -value string +# col_name data_type comment + +value string None #### A masked pattern was here #### PREHOOK: query: DESCRIBE FORMATTED view1 @@ -272,14 +276,18 @@ PREHOOK: query: DESCRIBE view2 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE view2 POSTHOOK: type: DESCTABLE -key string -value string +# col_name data_type comment + +key string None +value string None PREHOOK: query: DESCRIBE EXTENDED view2 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED view2 POSTHOOK: type: DESCTABLE -key string -value string +# col_name data_type comment + +key string None +value string None #### A masked pattern was here #### PREHOOK: query: DESCRIBE FORMATTED view2 @@ -316,12 +324,16 @@ PREHOOK: query: DESCRIBE view3 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE view3 POSTHOOK: type: DESCTABLE -valoo string +# col_name data_type comment + +valoo string None PREHOOK: query: DESCRIBE EXTENDED view3 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED view3 POSTHOOK: type: DESCTABLE -valoo string +# col_name data_type comment + +valoo string None #### A masked pattern was here #### PREHOOK: query: DESCRIBE FORMATTED view3 @@ -366,7 +378,9 @@ PREHOOK: query: DESCRIBE EXTENDED view3 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED view3 POSTHOOK: type: DESCTABLE -valoo string +# col_name data_type comment + +valoo string None #### A masked pattern was here #### PREHOOK: query: DESCRIBE FORMATTED view3 @@ -413,15 +427,19 @@ POSTHOOK: query: -- use DESCRIBE EXTENDED on a base table and an external table -- of comparison for view descriptions DESCRIBE EXTENDED table1 POSTHOOK: type: DESCTABLE -key int +# col_name data_type comment + +key int None #### A masked pattern was here #### PREHOOK: query: DESCRIBE EXTENDED src1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED src1 POSTHOOK: type: DESCTABLE -key string default -value string default +# col_name data_type comment + +key string default +value string default #### A masked pattern was here #### PREHOOK: query: -- use DESCRIBE EXTENDED on a base table as a point of comparison for @@ -432,7 +450,9 @@ POSTHOOK: query: -- use DESCRIBE EXTENDED on a base table as a point of comparis -- view descriptions DESCRIBE EXTENDED table1 POSTHOOK: type: DESCTABLE -key int +# col_name data_type comment + +key int None #### A masked pattern was here #### PREHOOK: query: INSERT OVERWRITE TABLE table1 SELECT key FROM src WHERE key = 86 @@ -479,7 +499,9 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE view4 POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] -key int +# col_name data_type comment + +key int None PREHOOK: query: ALTER TABLE table1 ADD COLUMNS (value STRING) PREHOOK: type: ALTERTABLE_ADDCOLS PREHOOK: Input: default@table1 @@ -516,14 +538,18 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE table1 POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] -key int -value string +# col_name data_type comment + +key int None +value string None PREHOOK: query: DESCRIBE view4 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE view4 POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] -key int +# col_name data_type comment + +key int None PREHOOK: query: CREATE VIEW view5 AS SELECT v1.key as key1, v2.key as key2 FROM view4 v1 join view4 v2 PREHOOK: type: CREATEVIEW @@ -555,8 +581,10 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE view5 POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] -key1 int -key2 int +# col_name data_type comment + +key1 int None +key2 int None PREHOOK: query: -- verify that column name and comment in DDL portion -- overrides column alias in SELECT CREATE VIEW view6(valoo COMMENT 'I cannot spell') AS @@ -576,7 +604,9 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE view6 POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] -valoo string I cannot spell +# col_name data_type comment + +valoo string I cannot spell PREHOOK: query: -- verify that ORDER BY and LIMIT are both supported in view def CREATE VIEW view7 AS SELECT * FROM src @@ -710,7 +740,9 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED view8 POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] -c string +# col_name data_type comment + +c string None #### A masked pattern was here #### FROM table1, viewExpandedText:SELECT `_c0` AS `c` FROM (SELECT `test_translate`('abc', 'a', 'b') @@ -787,7 +819,9 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED view9 POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] -m int +# col_name data_type comment + +m int None #### A masked pattern was here #### FROM src, viewExpandedText:SELECT `_c0` AS `m` FROM (SELECT `test_max`(length(`src`.`value`)) @@ -864,7 +898,9 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED view9 POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] -m int +# col_name data_type comment + +m int None #### A masked pattern was here #### FROM src, viewExpandedText:SELECT `_c0` AS `m` FROM (SELECT `test_max`(length(`src`.`value`)) @@ -930,8 +966,10 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED view10 POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] -key string -value string +# col_name data_type comment + +key string None +value string None #### A masked pattern was here #### PREHOOK: query: DESCRIBE FORMATTED view10 @@ -1003,7 +1041,9 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED view11 POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] -boom int +# col_name data_type comment + +boom int None #### A masked pattern was here #### FROM table1, viewExpandedText:SELECT `test_explode`(array(1,2,3)) AS (`boom`) @@ -1071,9 +1111,11 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED view12 POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] -key string -value string -mycol int +# col_name data_type comment + +key string None +value string None +mycol int None #### A masked pattern was here #### PREHOOK: query: DESCRIBE FORMATTED view12 @@ -1157,7 +1199,9 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED view13 POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] -key int +# col_name data_type comment + +key int None #### A masked pattern was here #### FROM srcbucket TABLESAMPLE (BUCKET 1 OUT OF 5 ON key) s, viewExpandedText:SELECT `s`.`key` @@ -1254,10 +1298,12 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED view14 POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] -k1 string -v1 string -k2 string -v2 string +# col_name data_type comment + +k1 string None +v1 string None +k2 string None +v2 string None #### A masked pattern was here #### unionsrc2.key as k2, unionsrc2.value as v2 @@ -1386,8 +1432,10 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED view15 POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] -key string -value_count bigint +# col_name data_type comment + +key string None +value_count bigint None #### A masked pattern was here #### FROM src @@ -1473,7 +1521,9 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED view16 POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] -value string +# col_name data_type comment + +value string None #### A masked pattern was here #### FROM src, viewExpandedText:SELECT DISTINCT `src`.`value` @@ -1551,7 +1601,9 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE view16 POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] -value string +# col_name data_type comment + +value string None PREHOOK: query: -- Likewise, DROP VIEW IF EXISTS should ignore a matching table name DROP VIEW IF EXISTS table1 PREHOOK: type: DROPVIEW @@ -1568,8 +1620,10 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE table1 POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] -key int -value string +# col_name data_type comment + +key int None +value string None PREHOOK: query: -- this should work since currently we don't track view->table -- dependencies for implementing RESTRICT diff --git ql/src/test/results/clientpositive/create_view_partitioned.q.out ql/src/test/results/clientpositive/create_view_partitioned.q.out index 83ece94..16aff3c 100644 --- ql/src/test/results/clientpositive/create_view_partitioned.q.out +++ ql/src/test/results/clientpositive/create_view_partitioned.q.out @@ -35,8 +35,15 @@ PREHOOK: query: DESCRIBE EXTENDED vp1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED vp1 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 #### FROM src diff --git ql/src/test/results/clientpositive/database.q.out ql/src/test/results/clientpositive/database.q.out index 86620b8..52abafc 100644 --- ql/src/test/results/clientpositive/database.q.out +++ ql/src/test/results/clientpositive/database.q.out @@ -129,14 +129,18 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: -- DESCRIBE table in non-default DB DESCRIBE test_table POSTHOOK: type: DESCTABLE -col1 string +# col_name data_type comment + +col1 string None PREHOOK: query: -- DESCRIBE EXTENDED in non-default DB DESCRIBE EXTENDED test_table PREHOOK: type: DESCTABLE POSTHOOK: query: -- DESCRIBE EXTENDED in non-default DB DESCRIBE EXTENDED test_table POSTHOOK: type: DESCTABLE -col1 string +# col_name data_type comment + +col1 string None #### A masked pattern was here #### PREHOOK: query: -- CREATE LIKE in non-default DB @@ -156,7 +160,9 @@ PREHOOK: query: DESCRIBE EXTENDED test_table_like PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED test_table_like POSTHOOK: type: DESCTABLE -col1 string +# col_name data_type comment + +col1 string None #### A masked pattern was here #### PREHOOK: query: -- LOAD and SELECT @@ -1336,8 +1342,10 @@ POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: bucketized_src.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: bucketized_src.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: temp_tbl2.c EXPRESSION [(temp_tbl)temp_tbl.null, ] -key string default -value string default +# col_name data_type comment + +key string default +value string default #### A masked pattern was here #### PREHOOK: query: -- character escaping diff --git ql/src/test/results/clientpositive/ddltime.q.out ql/src/test/results/clientpositive/ddltime.q.out index c110ccc..d919481 100644 --- ql/src/test/results/clientpositive/ddltime.q.out +++ ql/src/test/results/clientpositive/ddltime.q.out @@ -7,8 +7,10 @@ PREHOOK: query: desc extended T1 PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended T1 POSTHOOK: type: DESCTABLE -key string default -value string default +# col_name data_type comment + +key string default +value string default #### A masked pattern was here #### PREHOOK: query: insert overwrite table T1 select * from src @@ -27,8 +29,10 @@ POSTHOOK: query: desc extended T1 POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: t1.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: t1.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -key string default -value string default +# col_name data_type comment + +key string default +value string default #### A masked pattern was here #### PREHOOK: query: insert overwrite table T1 select /*+ HOLD_DDLTIME*/ * from src @@ -51,8 +55,10 @@ POSTHOOK: Lineage: t1.key SIMPLE [(src)src.FieldSchema(name:key, type:string, co POSTHOOK: Lineage: t1.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: t1.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: t1.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -key string default -value string default +# col_name data_type comment + +key string default +value string default #### A masked pattern was here #### PREHOOK: query: insert overwrite table T1 select * from src @@ -79,8 +85,10 @@ POSTHOOK: Lineage: t1.key SIMPLE [(src)src.FieldSchema(name:key, type:string, co POSTHOOK: Lineage: t1.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: t1.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: t1.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -key string default -value string default +# col_name data_type comment + +key string default +value string default #### A masked pattern was here #### PREHOOK: query: create table if not exists T2 like srcpart @@ -104,10 +112,18 @@ POSTHOOK: Lineage: t1.key SIMPLE [(src)src.FieldSchema(name:key, type:string, co POSTHOOK: Lineage: t1.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: t1.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: t1.value SIMPLE [(src)src.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: insert overwrite table T2 partition (ds = '2010-06-21', hr = '1') select key, value from src where key > 10 @@ -138,10 +154,18 @@ POSTHOOK: Lineage: t1.value SIMPLE [(src)src.FieldSchema(name:value, type:string POSTHOOK: Lineage: t1.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: t2 PARTITION(ds=2010-06-21,hr=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: t2 PARTITION(ds=2010-06-21,hr=1).value SIMPLE [(src)src.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: insert overwrite table T2 partition (ds = '2010-06-21', hr='1') select /*+ HOLD_DDLTIME */ key, value from src where key > 10 @@ -176,10 +200,18 @@ POSTHOOK: Lineage: t2 PARTITION(ds=2010-06-21,hr=1).key SIMPLE [(src)src.FieldSc POSTHOOK: Lineage: t2 PARTITION(ds=2010-06-21,hr=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: t2 PARTITION(ds=2010-06-21,hr=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: t2 PARTITION(ds=2010-06-21,hr=1).value SIMPLE [(src)src.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: insert overwrite table T2 partition (ds='2010-06-01', hr='1') select key, value from src where key > 10 @@ -218,9 +250,17 @@ POSTHOOK: Lineage: t2 PARTITION(ds=2010-06-21,hr=1).key SIMPLE [(src)src.FieldSc POSTHOOK: Lineage: t2 PARTITION(ds=2010-06-21,hr=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: t2 PARTITION(ds=2010-06-21,hr=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: t2 PARTITION(ds=2010-06-21,hr=1).value SIMPLE [(src)src.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 #### 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/fileformat_sequencefile.q.out ql/src/test/results/clientpositive/fileformat_sequencefile.q.out index 6edd838..cc86db4 100644 --- ql/src/test/results/clientpositive/fileformat_sequencefile.q.out +++ ql/src/test/results/clientpositive/fileformat_sequencefile.q.out @@ -40,8 +40,10 @@ PREHOOK: query: DESCRIBE EXTENDED dest1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED dest1 POSTHOOK: type: DESCTABLE -key int -value string +# col_name data_type comment + +key int None +value string None #### A masked pattern was here #### PREHOOK: query: FROM src diff --git ql/src/test/results/clientpositive/fileformat_text.q.out ql/src/test/results/clientpositive/fileformat_text.q.out index 6d8a2d5..0cafd62 100644 --- ql/src/test/results/clientpositive/fileformat_text.q.out +++ ql/src/test/results/clientpositive/fileformat_text.q.out @@ -40,8 +40,10 @@ PREHOOK: query: DESCRIBE EXTENDED dest1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED dest1 POSTHOOK: type: DESCTABLE -key int -value string +# col_name data_type comment + +key int None +value string None #### A masked pattern was here #### PREHOOK: query: FROM src diff --git ql/src/test/results/clientpositive/index_creation.q.out ql/src/test/results/clientpositive/index_creation.q.out index f7106a6..ad2d121 100644 --- ql/src/test/results/clientpositive/index_creation.q.out +++ ql/src/test/results/clientpositive/index_creation.q.out @@ -43,9 +43,11 @@ PREHOOK: query: desc extended default__src_src_index_2__ PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended default__src_src_index_2__ POSTHOOK: type: DESCTABLE -key string default -_bucketname string -_offsets array +# col_name data_type comment + +key string default +_bucketname string +_offsets array #### A masked pattern was here #### PREHOOK: query: create index src_index_3 on table src(key) as 'compact' WITH DEFERRED REBUILD in table src_idx_src_index_3 @@ -57,9 +59,11 @@ PREHOOK: query: desc extended src_idx_src_index_3 PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended src_idx_src_index_3 POSTHOOK: type: DESCTABLE -key string default -_bucketname string -_offsets array +# col_name data_type comment + +key string default +_bucketname string +_offsets array #### A masked pattern was here #### PREHOOK: query: create index src_index_4 on table src(key) as 'compact' WITH DEFERRED REBUILD ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' STORED AS TEXTFILE @@ -71,9 +75,11 @@ PREHOOK: query: desc extended default__src_src_index_4__ PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended default__src_src_index_4__ POSTHOOK: type: DESCTABLE -key string default -_bucketname string -_offsets array +# col_name data_type comment + +key string default +_bucketname string +_offsets array #### A masked pattern was here #### PREHOOK: query: create index src_index_5 on table src(key) as 'compact' WITH DEFERRED REBUILD ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' ESCAPED BY '\\' @@ -85,9 +91,11 @@ PREHOOK: query: desc extended default__src_src_index_5__ PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended default__src_src_index_5__ POSTHOOK: type: DESCTABLE -key string default -_bucketname string -_offsets array +# col_name data_type comment + +key string default +_bucketname string +_offsets array #### A masked pattern was here #### PREHOOK: query: create index src_index_6 on table src(key) as 'compact' WITH DEFERRED REBUILD STORED AS RCFILE @@ -99,9 +107,11 @@ PREHOOK: query: desc extended default__src_src_index_6__ PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended default__src_src_index_6__ POSTHOOK: type: DESCTABLE -key string default -_bucketname string -_offsets array +# col_name data_type comment + +key string default +_bucketname string +_offsets array #### A masked pattern was here #### PREHOOK: query: create index src_index_7 on table src(key) as 'compact' WITH DEFERRED REBUILD in table src_idx_src_index_7 STORED AS RCFILE @@ -113,9 +123,11 @@ PREHOOK: query: desc extended src_idx_src_index_7 PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended src_idx_src_index_7 POSTHOOK: type: DESCTABLE -key string default -_bucketname string -_offsets array +# col_name data_type comment + +key string default +_bucketname string +_offsets array #### A masked pattern was here #### PREHOOK: query: create index src_index_8 on table src(key) as 'compact' WITH DEFERRED REBUILD IDXPROPERTIES ("prop1"="val1", "prop2"="val2") @@ -127,9 +139,11 @@ PREHOOK: query: desc extended default__src_src_index_8__ PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended default__src_src_index_8__ POSTHOOK: type: DESCTABLE -key string default -_bucketname string -_offsets array +# col_name data_type comment + +key string default +_bucketname string +_offsets array #### A masked pattern was here #### PREHOOK: query: create index src_index_9 on table src(key) as 'compact' WITH DEFERRED REBUILD TBLPROPERTIES ("prop1"="val1", "prop2"="val2") @@ -141,9 +155,11 @@ PREHOOK: query: desc extended default__src_src_index_9__ PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended default__src_src_index_9__ POSTHOOK: type: DESCTABLE -key string default -_bucketname string -_offsets array +# col_name data_type comment + +key string default +_bucketname string +_offsets array #### A masked pattern was here #### PREHOOK: query: create table `_t`(`_i` int, `_j` int) diff --git ql/src/test/results/clientpositive/inoutdriver.q.out ql/src/test/results/clientpositive/inoutdriver.q.out index 11a7e50..d3a8f98 100644 --- ql/src/test/results/clientpositive/inoutdriver.q.out +++ ql/src/test/results/clientpositive/inoutdriver.q.out @@ -7,6 +7,8 @@ PREHOOK: query: desc extended test PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended test POSTHOOK: type: DESCTABLE -a int +# col_name data_type comment + +a int None #### A masked pattern was here #### diff --git ql/src/test/results/clientpositive/input1.q.out ql/src/test/results/clientpositive/input1.q.out index cc935d9..2a11967 100644 --- ql/src/test/results/clientpositive/input1.q.out +++ ql/src/test/results/clientpositive/input1.q.out @@ -31,5 +31,7 @@ PREHOOK: query: DESCRIBE TEST1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE TEST1 POSTHOOK: type: DESCTABLE -a int -b double +# col_name data_type comment + +a int None +b double None diff --git ql/src/test/results/clientpositive/input10.q.out ql/src/test/results/clientpositive/input10.q.out index e22a2f4..436119a 100644 --- ql/src/test/results/clientpositive/input10.q.out +++ ql/src/test/results/clientpositive/input10.q.out @@ -31,7 +31,15 @@ PREHOOK: query: DESCRIBE TEST10 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE TEST10 POSTHOOK: type: DESCTABLE -key int -value string -ds string -hr string +# col_name data_type comment + +key int None +value string None +ds string None +hr string None + +# Partition Information +# col_name data_type comment + +ds string None +hr string None diff --git ql/src/test/results/clientpositive/input15.q.out ql/src/test/results/clientpositive/input15.q.out index 2967fdb..0564184 100644 --- ql/src/test/results/clientpositive/input15.q.out +++ ql/src/test/results/clientpositive/input15.q.out @@ -33,5 +33,7 @@ PREHOOK: query: DESCRIBE TEST15 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE TEST15 POSTHOOK: type: DESCTABLE -key int -value string +# col_name data_type comment + +key int None +value string None diff --git ql/src/test/results/clientpositive/input2.q.out ql/src/test/results/clientpositive/input2.q.out index 69c898b..ac51d21 100644 --- ql/src/test/results/clientpositive/input2.q.out +++ ql/src/test/results/clientpositive/input2.q.out @@ -7,14 +7,18 @@ PREHOOK: query: DESCRIBE TEST2a PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE TEST2a POSTHOOK: type: DESCTABLE -a int -b double +# col_name data_type comment + +a int None +b double None PREHOOK: query: DESC TEST2a PREHOOK: type: DESCTABLE POSTHOOK: query: DESC TEST2a POSTHOOK: type: DESCTABLE -a int -b double +# col_name data_type comment + +a int None +b double None PREHOOK: query: CREATE TABLE TEST2b(A ARRAY, B DOUBLE, C MAP) STORED AS TEXTFILE PREHOOK: type: CREATETABLE POSTHOOK: query: CREATE TABLE TEST2b(A ARRAY, B DOUBLE, C MAP) STORED AS TEXTFILE @@ -24,9 +28,11 @@ PREHOOK: query: DESCRIBE TEST2b PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE TEST2b POSTHOOK: type: DESCTABLE -a array -b double -c map +# col_name data_type comment + +a array None +b double None +c map None PREHOOK: query: SHOW TABLES PREHOOK: type: SHOWTABLES POSTHOOK: query: SHOW TABLES diff --git ql/src/test/results/clientpositive/input3.q.out ql/src/test/results/clientpositive/input3.q.out index 40a126c..79cf771 100644 --- ql/src/test/results/clientpositive/input3.q.out +++ ql/src/test/results/clientpositive/input3.q.out @@ -7,8 +7,10 @@ PREHOOK: query: DESCRIBE TEST3a PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE TEST3a POSTHOOK: type: DESCTABLE -a int -b double +# col_name data_type comment + +a int None +b double None PREHOOK: query: CREATE TABLE TEST3b(A ARRAY, B DOUBLE, C MAP) STORED AS TEXTFILE PREHOOK: type: CREATETABLE POSTHOOK: query: CREATE TABLE TEST3b(A ARRAY, B DOUBLE, C MAP) STORED AS TEXTFILE @@ -18,9 +20,11 @@ PREHOOK: query: DESCRIBE TEST3b PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE TEST3b POSTHOOK: type: DESCTABLE -a array -b double -c map +# col_name data_type comment + +a array None +b double None +c map None PREHOOK: query: SHOW TABLES PREHOOK: type: SHOWTABLES POSTHOOK: query: SHOW TABLES @@ -68,10 +72,12 @@ PREHOOK: query: DESCRIBE TEST3b PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE TEST3b POSTHOOK: type: DESCTABLE -a array -b double -c map -x double +# col_name data_type comment + +a array None +b double None +c map None +x double None PREHOOK: query: EXPLAIN ALTER TABLE TEST3b RENAME TO TEST3c PREHOOK: type: ALTERTABLE_RENAME @@ -106,10 +112,12 @@ PREHOOK: query: DESCRIBE TEST3c PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE TEST3c POSTHOOK: type: DESCTABLE -a array -b double -c map -x double +# col_name data_type comment + +a array None +b double None +c map None +x double None PREHOOK: query: SHOW TABLES PREHOOK: type: SHOWTABLES POSTHOOK: query: SHOW TABLES @@ -157,7 +165,9 @@ PREHOOK: query: DESCRIBE EXTENDED TEST3c PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED TEST3c POSTHOOK: type: DESCTABLE -r1 int -r2 double +# col_name data_type comment + +r1 int None +r2 double None #### A masked pattern was here #### diff --git ql/src/test/results/clientpositive/input_part10.q.out ql/src/test/results/clientpositive/input_part10.q.out index 73c689b..377f503 100644 --- ql/src/test/results/clientpositive/input_part10.q.out +++ ql/src/test/results/clientpositive/input_part10.q.out @@ -107,10 +107,18 @@ POSTHOOK: query: DESCRIBE EXTENDED part_special PARTITION(ds='2008 04 08', ts = POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: part_special PARTITION(ds=2008 04 08,ts=10:11:12=455).a SIMPLE [] POSTHOOK: Lineage: part_special PARTITION(ds=2008 04 08,ts=10:11:12=455).b SIMPLE [] -a string -b string -ds string -ts string +# col_name data_type comment + +a string None +b string None +ds string None +ts string None + +# Partition Information +# col_name data_type comment + +ds string None +ts string None #### A masked pattern was here #### PREHOOK: query: SELECT * FROM part_special WHERE ds='2008 04 08' AND ts = '10:11:12=455' diff --git ql/src/test/results/clientpositive/inputddl2.q.out ql/src/test/results/clientpositive/inputddl2.q.out index 3521dcf..200c600 100644 --- ql/src/test/results/clientpositive/inputddl2.q.out +++ ql/src/test/results/clientpositive/inputddl2.q.out @@ -33,7 +33,15 @@ PREHOOK: query: DESCRIBE INPUTDDL2 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE INPUTDDL2 POSTHOOK: type: DESCTABLE -key int -value string -ds string -country string +# col_name data_type comment + +key int None +value string None +ds string None +country string None + +# Partition Information +# col_name data_type comment + +ds string None +country string None diff --git ql/src/test/results/clientpositive/inputddl3.q.out ql/src/test/results/clientpositive/inputddl3.q.out index 99e71e3..4b47a46 100644 --- ql/src/test/results/clientpositive/inputddl3.q.out +++ ql/src/test/results/clientpositive/inputddl3.q.out @@ -33,5 +33,7 @@ PREHOOK: query: DESCRIBE INPUTDDL3 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE INPUTDDL3 POSTHOOK: type: DESCTABLE -key int -value string +# col_name data_type comment + +key int None +value string None diff --git ql/src/test/results/clientpositive/inputddl4.q.out ql/src/test/results/clientpositive/inputddl4.q.out index 7b01e8b..3785444 100644 --- ql/src/test/results/clientpositive/inputddl4.q.out +++ ql/src/test/results/clientpositive/inputddl4.q.out @@ -23,27 +23,43 @@ PREHOOK: query: DESCRIBE INPUTDDL4 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE INPUTDDL4 POSTHOOK: type: DESCTABLE -viewtime string -userid int -page_url string -referrer_url string -friends array -properties map -ip string IP Address of the User -ds string -country string +# col_name data_type comment + +viewtime string None +userid int None +page_url string None +referrer_url string None +friends array None +properties map None +ip string IP Address of the User +ds string None +country string None + +# Partition Information +# col_name data_type comment + +ds string None +country string None PREHOOK: query: DESCRIBE EXTENDED INPUTDDL4 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED INPUTDDL4 POSTHOOK: type: DESCTABLE -viewtime string -userid int -page_url string -referrer_url string -friends array -properties map -ip string IP Address of the User -ds string -country string +# col_name data_type comment + +viewtime string None +userid int None +page_url string None +referrer_url string None +friends array None +properties map None +ip string IP Address of the User +ds string None +country string None + +# Partition Information +# col_name data_type comment + +ds string None +country string None #### A masked pattern was here #### diff --git ql/src/test/results/clientpositive/inputddl5.q.out ql/src/test/results/clientpositive/inputddl5.q.out index ac53b58..99a7bfe 100644 --- ql/src/test/results/clientpositive/inputddl5.q.out +++ ql/src/test/results/clientpositive/inputddl5.q.out @@ -17,7 +17,9 @@ PREHOOK: query: DESCRIBE INPUTDDL5 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE INPUTDDL5 POSTHOOK: type: DESCTABLE -name string +# col_name data_type comment + +name string None PREHOOK: query: SELECT INPUTDDL5.name from INPUTDDL5 PREHOOK: type: QUERY PREHOOK: Input: default@inputddl5 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/inputddl7.q.out ql/src/test/results/clientpositive/inputddl7.q.out index 4cb83c0..35931aa 100644 --- ql/src/test/results/clientpositive/inputddl7.q.out +++ ql/src/test/results/clientpositive/inputddl7.q.out @@ -92,29 +92,47 @@ PREHOOK: query: DESCRIBE EXTENDED T1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED T1 POSTHOOK: type: DESCTABLE -name string +# col_name data_type comment + +name string None #### A masked pattern was here #### PREHOOK: query: DESCRIBE EXTENDED T2 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED T2 POSTHOOK: type: DESCTABLE -name string +# col_name data_type comment + +name string None #### A masked pattern was here #### PREHOOK: query: DESCRIBE EXTENDED T3 PARTITION (ds='2008-04-09') PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED T3 PARTITION (ds='2008-04-09') POSTHOOK: type: DESCTABLE -name string -ds string +# col_name data_type comment + +name string None +ds string None + +# Partition Information +# col_name data_type comment + +ds string None #### A masked pattern was here #### PREHOOK: query: DESCRIBE EXTENDED T4 PARTITION (ds='2008-04-09') PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED T4 PARTITION (ds='2008-04-09') POSTHOOK: type: DESCTABLE -name string -ds string +# col_name data_type comment + +name string None +ds string None + +# Partition Information +# col_name data_type comment + +ds string None #### A masked pattern was here #### diff --git ql/src/test/results/clientpositive/inputddl8.q.out ql/src/test/results/clientpositive/inputddl8.q.out index cff41f5..9fc52de 100644 --- ql/src/test/results/clientpositive/inputddl8.q.out +++ ql/src/test/results/clientpositive/inputddl8.q.out @@ -19,13 +19,21 @@ PREHOOK: query: DESCRIBE EXTENDED INPUTDDL8 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED INPUTDDL8 POSTHOOK: type: DESCTABLE -aint int from deserializer -astring string from deserializer -lint array from deserializer -lstring array from deserializer -lintstring array> from deserializer -mstringstring map from deserializer -ds string -country string +# col_name data_type comment + +aint int from deserializer +astring string from deserializer +lint array from deserializer +lstring array from deserializer +lintstring array> from deserializer +mstringstring map from deserializer +ds string None +country string None + +# Partition Information +# col_name data_type comment + +ds string None +country string None #### A masked pattern was here #### diff --git ql/src/test/results/clientpositive/join_thrift.q.out ql/src/test/results/clientpositive/join_thrift.q.out index da05fc4..2ed9f61 100644 --- ql/src/test/results/clientpositive/join_thrift.q.out +++ ql/src/test/results/clientpositive/join_thrift.q.out @@ -2,12 +2,14 @@ PREHOOK: query: DESCRIBE src_thrift PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE src_thrift POSTHOOK: type: DESCTABLE -aint int from deserializer -astring string from deserializer -lint array from deserializer -lstring array from deserializer -lintstring array> from deserializer -mstringstring map from deserializer +# col_name data_type comment + +aint int from deserializer +astring string from deserializer +lint array from deserializer +lstring array from deserializer +lintstring array> from deserializer +mstringstring map from deserializer PREHOOK: query: EXPLAIN SELECT s1.aint, s2.lintstring FROM src_thrift s1 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/load_fs.q.out ql/src/test/results/clientpositive/load_fs.q.out index 7f3d23b..7d85e4b 100644 --- ql/src/test/results/clientpositive/load_fs.q.out +++ ql/src/test/results/clientpositive/load_fs.q.out @@ -47,8 +47,10 @@ PREHOOK: query: desc extended load_overwrite PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended load_overwrite POSTHOOK: type: DESCTABLE -key string -value string +# col_name data_type comment + +key string None +value string None #### A masked pattern was here #### PREHOOK: query: select count(*) from load_overwrite @@ -87,8 +89,10 @@ PREHOOK: query: desc extended load_overwrite2 PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended load_overwrite2 POSTHOOK: type: DESCTABLE -key string -value string +# col_name data_type comment + +key string None +value string None #### A masked pattern was here #### PREHOOK: query: select count(*) from load_overwrite2 diff --git ql/src/test/results/clientpositive/multi_sahooks.q.out ql/src/test/results/clientpositive/multi_sahooks.q.out index 8e01ab5..3e2cd39 100644 --- ql/src/test/results/clientpositive/multi_sahooks.q.out +++ ql/src/test/results/clientpositive/multi_sahooks.q.out @@ -13,7 +13,9 @@ PREHOOK: query: desc extended tbl_sahook PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl_sahook POSTHOOK: type: DESCTABLE -c string +# col_name data_type comment + +c string None #### A masked pattern was here #### PREHOOK: query: drop table tbl_sahook @@ -39,7 +41,9 @@ PREHOOK: query: desc extended tbl_sahooks PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl_sahooks POSTHOOK: type: DESCTABLE -c string +# col_name data_type comment + +c string None #### A masked pattern was here #### PREHOOK: query: drop table tbl_sahooks @@ -65,7 +69,9 @@ PREHOOK: query: desc extended tbl_sahooks PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl_sahooks POSTHOOK: type: DESCTABLE -c string +# col_name data_type comment + +c string None #### A masked pattern was here #### PREHOOK: query: drop table tbl_sahooks @@ -93,7 +99,9 @@ PREHOOK: query: desc extended tbl_sahooks PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl_sahooks POSTHOOK: type: DESCTABLE -c string +# col_name data_type comment + +c string None #### A masked pattern was here #### PREHOOK: query: drop table tbl_sahooks diff --git ql/src/test/results/clientpositive/partition_schema1.q.out ql/src/test/results/clientpositive/partition_schema1.q.out index f76bb83..03f366b 100644 --- ql/src/test/results/clientpositive/partition_schema1.q.out +++ ql/src/test/results/clientpositive/partition_schema1.q.out @@ -19,9 +19,16 @@ POSTHOOK: query: desc partition_schema1 partition(dt='100') POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: partition_schema1 PARTITION(dt=100).key SIMPLE [(src1)src1.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: partition_schema1 PARTITION(dt=100).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] -key string -value string -dt string +# col_name data_type comment + +key string None +value string None +dt string None + +# Partition Information +# col_name data_type comment + +dt string None PREHOOK: query: alter table partition_schema1 add columns (x string) PREHOOK: type: ALTERTABLE_ADDCOLS PREHOOK: Input: default@partition_schema1 @@ -38,16 +45,30 @@ POSTHOOK: query: desc partition_schema1 POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: partition_schema1 PARTITION(dt=100).key SIMPLE [(src1)src1.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: partition_schema1 PARTITION(dt=100).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] -key string -value string -x string -dt string +# col_name data_type comment + +key string None +value string None +x string None +dt string None + +# Partition Information +# col_name data_type comment + +dt string None PREHOOK: query: desc partition_schema1 partition (dt='100') PREHOOK: type: DESCTABLE POSTHOOK: query: desc partition_schema1 partition (dt='100') POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: partition_schema1 PARTITION(dt=100).key SIMPLE [(src1)src1.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: partition_schema1 PARTITION(dt=100).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] -key string -value string -dt string +# col_name data_type comment + +key string None +value string None +dt string None + +# Partition Information +# col_name data_type comment + +dt string None diff --git ql/src/test/results/clientpositive/protectmode.q.out ql/src/test/results/clientpositive/protectmode.q.out index a3aa692..f2a9306 100644 --- ql/src/test/results/clientpositive/protectmode.q.out +++ ql/src/test/results/clientpositive/protectmode.q.out @@ -43,7 +43,9 @@ PREHOOK: query: desc extended tbl1 PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl1 POSTHOOK: type: DESCTABLE -col string +# col_name data_type comment + +col string None #### A masked pattern was here #### PREHOOK: query: alter table tbl1 disable offline @@ -58,7 +60,9 @@ PREHOOK: query: desc extended tbl1 PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl1 POSTHOOK: type: DESCTABLE -col string +# col_name data_type comment + +col string None #### A masked pattern was here #### PREHOOK: query: select * from tbl1 @@ -138,8 +142,15 @@ PREHOOK: query: desc extended tbl2 partition (p='p1') PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl2 partition (p='p1') POSTHOOK: type: DESCTABLE -col string -p string +# col_name data_type comment + +col string None +p string None + +# Partition Information +# col_name data_type comment + +p string None #### A masked pattern was here #### PREHOOK: query: alter table tbl2 enable offline @@ -154,8 +165,15 @@ PREHOOK: query: desc extended tbl2 PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl2 POSTHOOK: type: DESCTABLE -col string -p string +# col_name data_type comment + +col string None +p string None + +# Partition Information +# col_name data_type comment + +p string None #### A masked pattern was here #### PREHOOK: query: alter table tbl2 enable no_drop @@ -170,8 +188,15 @@ PREHOOK: query: desc extended tbl2 PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl2 POSTHOOK: type: DESCTABLE -col string -p string +# col_name data_type comment + +col string None +p string None + +# Partition Information +# col_name data_type comment + +p string None #### A masked pattern was here #### PREHOOK: query: alter table tbl2 drop partition (p='p3') @@ -194,8 +219,15 @@ PREHOOK: query: desc extended tbl2 PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl2 POSTHOOK: type: DESCTABLE -col string -p string +# col_name data_type comment + +col string None +p string None + +# Partition Information +# col_name data_type comment + +p string None #### A masked pattern was here #### PREHOOK: query: alter table tbl2 disable no_drop @@ -210,8 +242,15 @@ PREHOOK: query: desc extended tbl2 PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl2 POSTHOOK: type: DESCTABLE -col string -p string +# col_name data_type comment + +col string None +p string None + +# Partition Information +# col_name data_type comment + +p string None #### A masked pattern was here #### PREHOOK: query: select * from tbl2 where p='p2' @@ -243,8 +282,15 @@ PREHOOK: query: desc extended tbl2 partition (p='p1') PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl2 partition (p='p1') POSTHOOK: type: DESCTABLE -col string -p string +# col_name data_type comment + +col string None +p string None + +# Partition Information +# col_name data_type comment + +p string None #### A masked pattern was here #### PREHOOK: query: select * from tbl2 where p='p1' diff --git ql/src/test/results/clientpositive/protectmode2.q.out ql/src/test/results/clientpositive/protectmode2.q.out index 471620a..5b0b6db 100644 --- ql/src/test/results/clientpositive/protectmode2.q.out +++ ql/src/test/results/clientpositive/protectmode2.q.out @@ -19,7 +19,9 @@ PREHOOK: query: desc extended tbl1 PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl1 POSTHOOK: type: DESCTABLE -col string +# col_name data_type comment + +col string None #### A masked pattern was here #### PREHOOK: query: alter table tbl1 enable no_drop @@ -34,7 +36,9 @@ PREHOOK: query: desc extended tbl1 PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl1 POSTHOOK: type: DESCTABLE -col string +# col_name data_type comment + +col string None #### A masked pattern was here #### PREHOOK: query: alter table tbl1 disable no_drop cascade @@ -49,7 +53,9 @@ PREHOOK: query: desc extended tbl1 PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl1 POSTHOOK: type: DESCTABLE -col string +# col_name data_type comment + +col string None #### A masked pattern was here #### PREHOOK: query: alter table tbl1 disable no_drop 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/rcfile_default_format.q.out ql/src/test/results/clientpositive/rcfile_default_format.q.out index 45c52cb..78f06e8 100644 --- ql/src/test/results/clientpositive/rcfile_default_format.q.out +++ ql/src/test/results/clientpositive/rcfile_default_format.q.out @@ -7,7 +7,9 @@ PREHOOK: query: DESCRIBE EXTENDED rcfile_default_format PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED rcfile_default_format POSTHOOK: type: DESCTABLE -key string +# col_name data_type comment + +key string None #### A masked pattern was here #### PREHOOK: query: CREATE TABLE rcfile_default_format_ctas AS SELECT key,value FROM src @@ -21,8 +23,10 @@ PREHOOK: query: DESCRIBE EXTENDED rcfile_default_format_ctas PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED rcfile_default_format_ctas POSTHOOK: type: DESCTABLE -key string -value string +# col_name data_type comment + +key string None +value string None #### A masked pattern was here #### PREHOOK: query: CREATE TABLE rcfile_default_format_txtfile (key STRING) STORED AS TEXTFILE @@ -44,7 +48,9 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED rcfile_default_format_txtfile POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: rcfile_default_format_txtfile.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] -key string +# col_name data_type comment + +key string None #### A masked pattern was here #### PREHOOK: query: CREATE TABLE textfile_default_format_ctas AS SELECT key,value FROM rcfile_default_format_ctas @@ -60,7 +66,9 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED textfile_default_format_ctas POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: rcfile_default_format_txtfile.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] -key string -value string +# col_name data_type comment + +key string None +value string None #### A masked pattern was here #### diff --git ql/src/test/results/clientpositive/rename_column.q.out ql/src/test/results/clientpositive/rename_column.q.out index 0289738..f77ba41 100644 --- ql/src/test/results/clientpositive/rename_column.q.out +++ ql/src/test/results/clientpositive/rename_column.q.out @@ -7,9 +7,11 @@ PREHOOK: query: DESCRIBE kv_rename_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE kv_rename_test POSTHOOK: type: DESCTABLE -a int -b int -c int +# col_name data_type comment + +a int None +b int None +c int None PREHOOK: query: ALTER TABLE kv_rename_test CHANGE a a STRING PREHOOK: type: ALTERTABLE_RENAMECOL PREHOOK: Input: default@kv_rename_test @@ -22,9 +24,11 @@ PREHOOK: query: DESCRIBE kv_rename_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE kv_rename_test POSTHOOK: type: DESCTABLE -a string -b int -c int +# col_name data_type comment + +a string None +b int None +c int None PREHOOK: query: ALTER TABLE kv_rename_test CHANGE a a1 INT PREHOOK: type: ALTERTABLE_RENAMECOL PREHOOK: Input: default@kv_rename_test @@ -37,9 +41,11 @@ PREHOOK: query: DESCRIBE kv_rename_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE kv_rename_test POSTHOOK: type: DESCTABLE -a1 int -b int -c int +# col_name data_type comment + +a1 int None +b int None +c int None PREHOOK: query: ALTER TABLE kv_rename_test CHANGE a1 a2 INT FIRST PREHOOK: type: ALTERTABLE_RENAMECOL PREHOOK: Input: default@kv_rename_test @@ -52,9 +58,11 @@ PREHOOK: query: DESCRIBE kv_rename_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE kv_rename_test POSTHOOK: type: DESCTABLE -a2 int -b int -c int +# col_name data_type comment + +a2 int None +b int None +c int None PREHOOK: query: ALTER TABLE kv_rename_test CHANGE a2 a INT AFTER b PREHOOK: type: ALTERTABLE_RENAMECOL PREHOOK: Input: default@kv_rename_test @@ -67,9 +75,11 @@ PREHOOK: query: DESCRIBE kv_rename_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE kv_rename_test POSTHOOK: type: DESCTABLE -b int -a int -c int +# col_name data_type comment + +b int None +a int None +c int None PREHOOK: query: ALTER TABLE kv_rename_test CHANGE a a1 INT COMMENT 'test comment1' PREHOOK: type: ALTERTABLE_RENAMECOL PREHOOK: Input: default@kv_rename_test @@ -82,9 +92,11 @@ PREHOOK: query: DESCRIBE kv_rename_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE kv_rename_test POSTHOOK: type: DESCTABLE -b int -a1 int test comment1 -c int +# col_name data_type comment + +b int None +a1 int test comment1 +c int None PREHOOK: query: ALTER TABLE kv_rename_test CHANGE a1 a2 INT COMMENT 'test comment2' FIRST PREHOOK: type: ALTERTABLE_RENAMECOL PREHOOK: Input: default@kv_rename_test @@ -97,9 +109,11 @@ PREHOOK: query: DESCRIBE kv_rename_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE kv_rename_test POSTHOOK: type: DESCTABLE -a2 int test comment2 -b int -c int +# col_name data_type comment + +a2 int test comment2 +b int None +c int None PREHOOK: query: ALTER TABLE kv_rename_test CHANGE COLUMN a2 a INT AFTER b PREHOOK: type: ALTERTABLE_RENAMECOL PREHOOK: Input: default@kv_rename_test @@ -112,9 +126,11 @@ PREHOOK: query: DESCRIBE kv_rename_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE kv_rename_test POSTHOOK: type: DESCTABLE -b int -a int test comment2 -c int +# col_name data_type comment + +b int None +a int test comment2 +c int None PREHOOK: query: DROP TABLE kv_rename_test PREHOOK: type: DROPTABLE PREHOOK: Input: default@kv_rename_test @@ -154,9 +170,11 @@ PREHOOK: query: DESCRIBE kv_rename_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE kv_rename_test POSTHOOK: type: DESCTABLE -a int -b int -c int +# col_name data_type comment + +a int None +b int None +c int None PREHOOK: query: ALTER TABLE kv_rename_test CHANGE a a STRING PREHOOK: type: ALTERTABLE_RENAMECOL PREHOOK: Input: kv_rename_test_db@kv_rename_test @@ -169,9 +187,11 @@ PREHOOK: query: DESCRIBE kv_rename_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE kv_rename_test POSTHOOK: type: DESCTABLE -a string -b int -c int +# col_name data_type comment + +a string None +b int None +c int None PREHOOK: query: ALTER TABLE kv_rename_test CHANGE a a1 INT PREHOOK: type: ALTERTABLE_RENAMECOL PREHOOK: Input: kv_rename_test_db@kv_rename_test @@ -184,9 +204,11 @@ PREHOOK: query: DESCRIBE kv_rename_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE kv_rename_test POSTHOOK: type: DESCTABLE -a1 int -b int -c int +# col_name data_type comment + +a1 int None +b int None +c int None PREHOOK: query: ALTER TABLE kv_rename_test CHANGE a1 a2 INT FIRST PREHOOK: type: ALTERTABLE_RENAMECOL PREHOOK: Input: kv_rename_test_db@kv_rename_test @@ -199,9 +221,11 @@ PREHOOK: query: DESCRIBE kv_rename_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE kv_rename_test POSTHOOK: type: DESCTABLE -a2 int -b int -c int +# col_name data_type comment + +a2 int None +b int None +c int None PREHOOK: query: ALTER TABLE kv_rename_test CHANGE a2 a INT AFTER b PREHOOK: type: ALTERTABLE_RENAMECOL PREHOOK: Input: kv_rename_test_db@kv_rename_test @@ -214,9 +238,11 @@ PREHOOK: query: DESCRIBE kv_rename_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE kv_rename_test POSTHOOK: type: DESCTABLE -b int -a int -c int +# col_name data_type comment + +b int None +a int None +c int None PREHOOK: query: ALTER TABLE kv_rename_test CHANGE a a1 INT COMMENT 'test comment1' PREHOOK: type: ALTERTABLE_RENAMECOL PREHOOK: Input: kv_rename_test_db@kv_rename_test @@ -229,9 +255,11 @@ PREHOOK: query: DESCRIBE kv_rename_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE kv_rename_test POSTHOOK: type: DESCTABLE -b int -a1 int test comment1 -c int +# col_name data_type comment + +b int None +a1 int test comment1 +c int None PREHOOK: query: ALTER TABLE kv_rename_test CHANGE a1 a2 INT COMMENT 'test comment2' FIRST PREHOOK: type: ALTERTABLE_RENAMECOL PREHOOK: Input: kv_rename_test_db@kv_rename_test @@ -244,9 +272,11 @@ PREHOOK: query: DESCRIBE kv_rename_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE kv_rename_test POSTHOOK: type: DESCTABLE -a2 int test comment2 -b int -c int +# col_name data_type comment + +a2 int test comment2 +b int None +c int None PREHOOK: query: ALTER TABLE kv_rename_test CHANGE COLUMN a2 a INT AFTER b PREHOOK: type: ALTERTABLE_RENAMECOL PREHOOK: Input: kv_rename_test_db@kv_rename_test @@ -259,9 +289,11 @@ PREHOOK: query: DESCRIBE kv_rename_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE kv_rename_test POSTHOOK: type: DESCTABLE -b int -a int test comment2 -c int +# col_name data_type comment + +b int None +a int test comment2 +c int None PREHOOK: query: DROP TABLE kv_rename_test PREHOOK: type: DROPTABLE PREHOOK: Input: kv_rename_test_db@kv_rename_test 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 diff --git ql/src/test/results/clientpositive/show_columns.q.out ql/src/test/results/clientpositive/show_columns.q.out index 3302741..10bd3ce 100644 --- ql/src/test/results/clientpositive/show_columns.q.out +++ ql/src/test/results/clientpositive/show_columns.q.out @@ -32,9 +32,11 @@ PREHOOK: Input: default@shcol_test POSTHOOK: query: SHOW COLUMNS from shcol_test POSTHOOK: type: SHOWCOLUMNS POSTHOOK: Input: default@shcol_test -key -value -ds +# col_name + +key +value +ds PREHOOK: query: -- SHOW COLUMNS CREATE DATABASE test_db PREHOOK: type: CREATEDATABASE @@ -62,14 +64,18 @@ PREHOOK: Input: test_db@foo POSTHOOK: query: SHOW COLUMNS from foo POSTHOOK: type: SHOWCOLUMNS POSTHOOK: Input: test_db@foo -a +# col_name + +a PREHOOK: query: SHOW COLUMNS in foo PREHOOK: type: SHOWCOLUMNS PREHOOK: Input: test_db@foo POSTHOOK: query: SHOW COLUMNS in foo POSTHOOK: type: SHOWCOLUMNS POSTHOOK: Input: test_db@foo -a +# col_name + +a PREHOOK: query: -- SHOW COLUMNS from a database with a name that requires escaping CREATE DATABASE `database` PREHOOK: type: CREATEDATABASE @@ -91,7 +97,9 @@ PREHOOK: Input: database@foo POSTHOOK: query: SHOW COLUMNS from foo POSTHOOK: type: SHOWCOLUMNS POSTHOOK: Input: database@foo -a +# col_name + +a PREHOOK: query: use default PREHOOK: type: SWITCHDATABASE POSTHOOK: query: use default @@ -102,11 +110,15 @@ PREHOOK: Input: test_db@foo POSTHOOK: query: SHOW COLUMNS from test_db.foo POSTHOOK: type: SHOWCOLUMNS POSTHOOK: Input: test_db@foo -a +# col_name + +a PREHOOK: query: SHOW COLUMNS from foo from test_db PREHOOK: type: SHOWCOLUMNS PREHOOK: Input: test_db@foo POSTHOOK: query: SHOW COLUMNS from foo from test_db POSTHOOK: type: SHOWCOLUMNS POSTHOOK: Input: test_db@foo -a +# col_name + +a diff --git ql/src/test/results/clientpositive/split_sample.q.out ql/src/test/results/clientpositive/split_sample.q.out index a869a74..f78b764 100644 --- ql/src/test/results/clientpositive/split_sample.q.out +++ ql/src/test/results/clientpositive/split_sample.q.out @@ -105,8 +105,10 @@ POSTHOOK: Lineage: ss_i_part PARTITION(p=2).key EXPRESSION [(src)src.FieldSchema POSTHOOK: Lineage: ss_i_part PARTITION(p=2).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: ss_i_part PARTITION(p=3).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: ss_i_part PARTITION(p=3).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: explain select key, value from ss_src2 tablesample(1 percent) limit 10 PREHOOK: type: QUERY POSTHOOK: query: explain select key, value from ss_src2 tablesample(1 percent) limit 10 diff --git ql/src/test/results/clientpositive/stats0.q.out ql/src/test/results/clientpositive/stats0.q.out index b934f0a..cfda06c 100644 --- ql/src/test/results/clientpositive/stats0.q.out +++ ql/src/test/results/clientpositive/stats0.q.out @@ -152,8 +152,10 @@ POSTHOOK: query: desc extended stats_non_partitioned POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: stats_non_partitioned.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: stats_non_partitioned.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 #### A masked pattern was here #### PREHOOK: query: select * from stats_non_partitioned @@ -1273,9 +1275,16 @@ POSTHOOK: Lineage: stats_non_partitioned.key SIMPLE [(src)src.FieldSchema(name:k POSTHOOK: Lineage: stats_non_partitioned.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: stats_partitioned PARTITION(ds=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: stats_partitioned PARTITION(ds=1).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: describe extended stats_partitioned @@ -1286,9 +1295,16 @@ POSTHOOK: Lineage: stats_non_partitioned.key SIMPLE [(src)src.FieldSchema(name:k POSTHOOK: Lineage: stats_non_partitioned.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: stats_partitioned PARTITION(ds=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: stats_partitioned PARTITION(ds=1).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: drop table stats_non_partitioned @@ -1637,8 +1653,10 @@ POSTHOOK: Lineage: stats_non_partitioned.value SIMPLE [(src)src.FieldSchema(name POSTHOOK: Lineage: stats_non_partitioned.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: stats_partitioned PARTITION(ds=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: stats_partitioned PARTITION(ds=1).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 #### A masked pattern was here #### PREHOOK: query: select * from stats_non_partitioned @@ -2832,9 +2850,16 @@ POSTHOOK: Lineage: stats_partitioned PARTITION(ds=1).key SIMPLE [(src)src.FieldS POSTHOOK: Lineage: stats_partitioned PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: stats_partitioned PARTITION(ds=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: stats_partitioned PARTITION(ds=1).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: describe extended stats_partitioned @@ -2849,8 +2874,15 @@ POSTHOOK: Lineage: stats_partitioned PARTITION(ds=1).key SIMPLE [(src)src.FieldS POSTHOOK: Lineage: stats_partitioned PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: stats_partitioned PARTITION(ds=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: stats_partitioned PARTITION(ds=1).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 #### diff --git ql/src/test/results/clientpositive/tablename_with_select.q.out ql/src/test/results/clientpositive/tablename_with_select.q.out index 8fd14ee..3a34ba1 100644 --- ql/src/test/results/clientpositive/tablename_with_select.q.out +++ ql/src/test/results/clientpositive/tablename_with_select.q.out @@ -7,8 +7,10 @@ PREHOOK: query: DESCRIBE tmp_select PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE tmp_select POSTHOOK: type: DESCTABLE -a int -b string +# col_name data_type comment + +a int None +b string None PREHOOK: query: INSERT OVERWRITE TABLE tmp_select SELECT key, value FROM src PREHOOK: type: QUERY PREHOOK: Input: default@src diff --git ql/src/test/results/clientpositive/updateAccessTime.q.out ql/src/test/results/clientpositive/updateAccessTime.q.out index 816d45e..2d1a63b 100644 --- ql/src/test/results/clientpositive/updateAccessTime.q.out +++ ql/src/test/results/clientpositive/updateAccessTime.q.out @@ -13,8 +13,10 @@ PREHOOK: query: desc extended tstsrc PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tstsrc POSTHOOK: type: DESCTABLE -key string -value string +# col_name data_type comment + +key string None +value string None #### A masked pattern was here #### PREHOOK: query: select count(1) from tstsrc @@ -30,8 +32,10 @@ PREHOOK: query: desc extended tstsrc PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tstsrc POSTHOOK: type: DESCTABLE -key string -value string +# col_name data_type comment + +key string None +value string None #### A masked pattern was here #### PREHOOK: query: drop table tstsrc @@ -88,10 +92,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: desc extended tstsrcpart partition (ds='2008-04-08', hr='11') @@ -106,10 +118,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: desc extended tstsrcpart partition (ds='2008-04-08', hr='12') @@ -124,10 +144,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: select count(1) from tstsrcpart where ds = '2008-04-08' and hr = '11' @@ -159,10 +187,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: desc extended tstsrcpart partition (ds='2008-04-08', hr='11') @@ -177,10 +213,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: desc extended tstsrcpart partition (ds='2008-04-08', hr='12') @@ -195,10 +239,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: drop table tstsrcpart