diff --git contrib/src/test/results/clientpositive/fileformat_base64.q.out contrib/src/test/results/clientpositive/fileformat_base64.q.out index 2b3ae49..2715801 100644 --- contrib/src/test/results/clientpositive/fileformat_base64.q.out +++ contrib/src/test/results/clientpositive/fileformat_base64.q.out @@ -44,8 +44,6 @@ PREHOOK: query: DESCRIBE EXTENDED base64_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED base64_test POSTHOOK: type: DESCTABLE -# col_name data_type comment - key int None value string None diff --git contrib/src/test/results/clientpositive/serde_s3.q.out contrib/src/test/results/clientpositive/serde_s3.q.out index 8f4335a..d1099f7 100644 --- contrib/src/test/results/clientpositive/serde_s3.q.out +++ contrib/src/test/results/clientpositive/serde_s3.q.out @@ -15,8 +15,6 @@ 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 diff --git hbase-handler/src/test/results/positive/hbase_queries.q.out hbase-handler/src/test/results/positive/hbase_queries.q.out index ae961c4..0bd55f6 100644 --- hbase-handler/src/test/results/positive/hbase_queries.q.out +++ hbase-handler/src/test/results/positive/hbase_queries.q.out @@ -17,8 +17,6 @@ PREHOOK: query: DESCRIBE EXTENDED hbase_table_1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED hbase_table_1 POSTHOOK: type: DESCTABLE -# col_name data_type comment - key int from deserializer value string from deserializer diff --git hwi/src/test/org/apache/hadoop/hive/hwi/TestHWISessionManager.java hwi/src/test/org/apache/hadoop/hive/hwi/TestHWISessionManager.java index adcbd83..8f05dc8 100644 --- hwi/src/test/org/apache/hadoop/hive/hwi/TestHWISessionManager.java +++ hwi/src/test/org/apache/hadoop/hive/hwi/TestHWISessionManager.java @@ -121,15 +121,10 @@ public final void testHiveDriver() throws Exception { ArrayList> searchBlockRes = searchItem.getResultBucket(); - // "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); + String resLine = searchBlockRes.get(0).get(0); assertEquals(true, resLine.contains("key")); assertEquals(true, resLine.contains("int")); - String resLine2 = searchBlockRes.get(0).get(3); + String resLine2 = searchBlockRes.get(0).get(1); assertEquals(true, resLine2.contains("value")); assertEquals(true, resLine2.contains("string")); 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 c2a539a..0364912 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java @@ -109,10 +109,10 @@ import org.apache.hadoop.hive.ql.plan.AddPartitionDesc; import org.apache.hadoop.hive.ql.plan.AlterDatabaseDesc; import org.apache.hadoop.hive.ql.plan.AlterIndexDesc; +import org.apache.hadoop.hive.ql.plan.AlterTableAlterPartDesc; import org.apache.hadoop.hive.ql.plan.AlterTableDesc; import org.apache.hadoop.hive.ql.plan.AlterTableDesc.AlterTableTypes; import org.apache.hadoop.hive.ql.plan.AlterTableSimpleDesc; -import org.apache.hadoop.hive.ql.plan.AlterTableAlterPartDesc; import org.apache.hadoop.hive.ql.plan.CreateDatabaseDesc; import org.apache.hadoop.hive.ql.plan.CreateIndexDesc; import org.apache.hadoop.hive.ql.plan.CreateTableDesc; @@ -2323,7 +2323,8 @@ public int showColumns(Hive db, ShowColumnsDesc showCols) List cols = table.getCols(); cols.addAll(table.getPartCols()); - outStream.writeBytes(MetaDataFormatUtils.getAllColumnsInformation(cols)); + outStream.writeBytes( + MetaDataFormatUtils.getAllColumnsInformation(cols, false)); ((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 bc046aa..add3988 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 @@ -62,16 +62,22 @@ private static void formatColumnsHeader(StringBuilder columnInformation) { columnInformation.append(LINE_DELIM); } - public static String getAllColumnsInformation(List cols) { + public static String getAllColumnsInformation(List cols, + boolean printHeader) { StringBuilder columnInformation = new StringBuilder(DEFAULT_STRINGBUILDER_SIZE); - formatColumnsHeader(columnInformation); + if(printHeader){ + formatColumnsHeader(columnInformation); + } formatAllFields(columnInformation, cols); return columnInformation.toString(); } - public static String getAllColumnsInformation(List cols, List partCols) { + public static String getAllColumnsInformation(List cols, List partCols, + boolean printHeader) { StringBuilder columnInformation = new StringBuilder(DEFAULT_STRINGBUILDER_SIZE); - formatColumnsHeader(columnInformation); + if(printHeader){ + formatColumnsHeader(columnInformation); + } formatAllFields(columnInformation, cols); if ((partCols != null) && (!partCols.isEmpty())) { 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 16785fb..97857f4 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 @@ -19,13 +19,14 @@ package org.apache.hadoop.hive.ql.metadata.formatting; import java.io.DataOutputStream; -import java.io.OutputStream; import java.io.IOException; +import java.io.OutputStream; import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.fs.FileStatus; @@ -143,10 +144,11 @@ public void describeTable(DataOutputStream outStream, MetaDataPrettyFormatUtils.getAllColumnsInformation( cols, partCols, prettyOutputNumCols) : - MetaDataFormatUtils.getAllColumnsInformation(cols, partCols) + MetaDataFormatUtils.getAllColumnsInformation(cols, partCols, isFormatted) ); } else { - outStream.writeBytes(MetaDataFormatUtils.getAllColumnsInformation(cols)); + outStream.writeBytes( + MetaDataFormatUtils.getAllColumnsInformation(cols, isFormatted)); } if (tableName.equals(colPath)) { @@ -455,11 +457,13 @@ public void showDatabaseDescription(DataOutputStream outStream, try { outStream.writeBytes(database); outStream.write(separator); - if (comment != null) - outStream.writeBytes(comment); + if (comment != null) { + outStream.writeBytes(comment); + } outStream.write(separator); - if (location != null) - outStream.writeBytes(location); + if (location != null) { + outStream.writeBytes(location); + } outStream.write(separator); if (params != null && !params.isEmpty()) { outStream.writeBytes(params.toString()); diff --git ql/src/test/results/clientnegative/alter_partition_coltype_2columns.q.out ql/src/test/results/clientnegative/alter_partition_coltype_2columns.q.out index dd5a7c0..8b3bf18 100644 --- ql/src/test/results/clientnegative/alter_partition_coltype_2columns.q.out +++ ql/src/test/results/clientnegative/alter_partition_coltype_2columns.q.out @@ -23,8 +23,6 @@ POSTHOOK: query: desc alter_coltype POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: alter_coltype PARTITION(dt=100x,ts=6:30pm).key SIMPLE [(src1)src1.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: alter_coltype PARTITION(dt=100x,ts=6:30pm).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] -# col_name data_type comment - key string None value string None dt string None diff --git ql/src/test/results/clientnegative/alter_partition_coltype_invalidcolname.q.out ql/src/test/results/clientnegative/alter_partition_coltype_invalidcolname.q.out index 46e467d..2d0837f 100644 --- ql/src/test/results/clientnegative/alter_partition_coltype_invalidcolname.q.out +++ ql/src/test/results/clientnegative/alter_partition_coltype_invalidcolname.q.out @@ -23,8 +23,6 @@ POSTHOOK: query: desc alter_coltype POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: alter_coltype PARTITION(dt=100x,ts=6:30pm).key SIMPLE [(src1)src1.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: alter_coltype PARTITION(dt=100x,ts=6:30pm).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] -# col_name data_type comment - key string None value string None dt string None diff --git ql/src/test/results/clientnegative/alter_partition_coltype_invalidtype.q.out ql/src/test/results/clientnegative/alter_partition_coltype_invalidtype.q.out index 54d42a7..3794d41 100644 --- ql/src/test/results/clientnegative/alter_partition_coltype_invalidtype.q.out +++ ql/src/test/results/clientnegative/alter_partition_coltype_invalidtype.q.out @@ -23,8 +23,6 @@ POSTHOOK: query: desc alter_coltype POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: alter_coltype PARTITION(dt=100x,ts=6:30pm).key SIMPLE [(src1)src1.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: alter_coltype PARTITION(dt=100x,ts=6:30pm).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] -# col_name data_type comment - key string None value string None dt string None diff --git ql/src/test/results/clientnegative/desc_failure2.q.out ql/src/test/results/clientnegative/desc_failure2.q.out index 333a26a..a2e3b36 100644 --- ql/src/test/results/clientnegative/desc_failure2.q.out +++ ql/src/test/results/clientnegative/desc_failure2.q.out @@ -2,8 +2,6 @@ PREHOOK: query: DESC srcpart PREHOOK: type: DESCTABLE POSTHOOK: query: DESC srcpart POSTHOOK: type: DESCTABLE -# col_name data_type comment - key string default value string default ds string None 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 ea8f147..d2cf16f 100644 --- ql/src/test/results/clientnegative/drop_partition_filter_failure2.q.out +++ ql/src/test/results/clientnegative/drop_partition_filter_failure2.q.out @@ -7,8 +7,6 @@ PREHOOK: query: describe ptestfilter PREHOOK: type: DESCTABLE POSTHOOK: query: describe ptestfilter POSTHOOK: type: DESCTABLE -# col_name data_type comment - a string None b int None c string None 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 035fb36..4a1c95f 100644 --- ql/src/test/results/clientnegative/protectmode_part_no_drop.q.out +++ ql/src/test/results/clientnegative/protectmode_part_no_drop.q.out @@ -31,8 +31,6 @@ 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 -# col_name data_type comment - c1 string None c2 string None p string None diff --git ql/src/test/results/clientnegative/protectmode_tbl2.q.out ql/src/test/results/clientnegative/protectmode_tbl2.q.out index 480ca5c..7c3ed81 100644 --- ql/src/test/results/clientnegative/protectmode_tbl2.q.out +++ ql/src/test/results/clientnegative/protectmode_tbl2.q.out @@ -46,8 +46,6 @@ PREHOOK: query: desc extended tbl_protectmode2 PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl_protectmode2 POSTHOOK: type: DESCTABLE -# col_name data_type comment - col string None p string None diff --git ql/src/test/results/clientnegative/protectmode_tbl3.q.out ql/src/test/results/clientnegative/protectmode_tbl3.q.out index 6dc70ef..c56f67b 100644 --- ql/src/test/results/clientnegative/protectmode_tbl3.q.out +++ ql/src/test/results/clientnegative/protectmode_tbl3.q.out @@ -31,8 +31,6 @@ PREHOOK: query: desc extended tbl_protectmode_4 PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl_protectmode_4 POSTHOOK: type: DESCTABLE -# col_name data_type comment - col string None #### A masked pattern was here #### diff --git ql/src/test/results/clientnegative/protectmode_tbl4.q.out ql/src/test/results/clientnegative/protectmode_tbl4.q.out index 7a5058f..24f9746 100644 --- ql/src/test/results/clientnegative/protectmode_tbl4.q.out +++ ql/src/test/results/clientnegative/protectmode_tbl4.q.out @@ -55,8 +55,6 @@ PREHOOK: query: desc extended tbl_protectmode_tbl4 PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl_protectmode_tbl4 POSTHOOK: type: DESCTABLE -# col_name data_type comment - col string None p string None diff --git ql/src/test/results/clientnegative/protectmode_tbl5.q.out ql/src/test/results/clientnegative/protectmode_tbl5.q.out index 4bb7b87..ce4b599 100644 --- ql/src/test/results/clientnegative/protectmode_tbl5.q.out +++ ql/src/test/results/clientnegative/protectmode_tbl5.q.out @@ -55,8 +55,6 @@ PREHOOK: query: desc extended tbl_protectmode_tbl5 PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl_protectmode_tbl5 POSTHOOK: type: DESCTABLE -# col_name data_type comment - col string None p string None 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 7ef9334..f41b12b 100644 --- ql/src/test/results/clientnegative/protectmode_tbl_no_drop.q.out +++ ql/src/test/results/clientnegative/protectmode_tbl_no_drop.q.out @@ -31,8 +31,6 @@ PREHOOK: query: desc extended tbl_protectmode__no_drop PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl_protectmode__no_drop POSTHOOK: type: DESCTABLE -# col_name data_type comment - col string None #### A masked pattern was here #### diff --git ql/src/test/results/clientnegative/set_hiveconf_validation0.q.out ql/src/test/results/clientnegative/set_hiveconf_validation0.q.out index 2cd2f58..fe21381 100644 --- ql/src/test/results/clientnegative/set_hiveconf_validation0.q.out +++ ql/src/test/results/clientnegative/set_hiveconf_validation0.q.out @@ -4,8 +4,6 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: -- should fail: hive.join.cache.size accepts int type desc src POSTHOOK: type: DESCTABLE -# 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 054cbe8..0e978ea 100644 --- ql/src/test/results/clientnegative/set_hiveconf_validation1.q.out +++ ql/src/test/results/clientnegative/set_hiveconf_validation1.q.out @@ -4,8 +4,6 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: -- should fail: hive.map.aggr.hash.min.reduction accepts float type desc src POSTHOOK: type: DESCTABLE -# 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 4e5bbdc..a944b29 100644 --- ql/src/test/results/clientpositive/alter1.q.out +++ ql/src/test/results/clientpositive/alter1.q.out @@ -7,8 +7,6 @@ PREHOOK: query: describe extended alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended alter1 POSTHOOK: type: DESCTABLE -# col_name data_type comment - a int None b int None @@ -25,8 +23,6 @@ PREHOOK: query: describe extended alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended alter1 POSTHOOK: type: DESCTABLE -# col_name data_type comment - a int None b int None @@ -43,8 +39,6 @@ PREHOOK: query: describe extended alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended alter1 POSTHOOK: type: DESCTABLE -# col_name data_type comment - a int None b int None @@ -61,8 +55,6 @@ PREHOOK: query: describe extended alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended alter1 POSTHOOK: type: DESCTABLE -# col_name data_type comment - a int None b int None @@ -79,8 +71,6 @@ PREHOOK: query: describe extended alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended alter1 POSTHOOK: type: DESCTABLE -# col_name data_type comment - a int None b int None @@ -97,8 +87,6 @@ PREHOOK: query: describe extended alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended alter1 POSTHOOK: type: DESCTABLE -# col_name data_type comment - a int None b int None @@ -115,8 +103,6 @@ PREHOOK: query: describe extended alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended alter1 POSTHOOK: type: DESCTABLE -# col_name data_type comment - a int None b int None @@ -133,8 +119,6 @@ PREHOOK: query: describe extended alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended alter1 POSTHOOK: type: DESCTABLE -# col_name data_type comment - a string from deserializer b string from deserializer @@ -151,8 +135,6 @@ PREHOOK: query: describe extended alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended alter1 POSTHOOK: type: DESCTABLE -# col_name data_type comment - a string from deserializer b string from deserializer @@ -169,8 +151,6 @@ PREHOOK: query: describe alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: describe alter1 POSTHOOK: type: DESCTABLE -# col_name data_type comment - a int None b int None c string None @@ -221,8 +201,6 @@ PREHOOK: query: DESCRIBE EXTENDED alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED alter1 POSTHOOK: type: DESCTABLE -# col_name data_type comment - a int None b int None @@ -239,8 +217,6 @@ PREHOOK: query: DESCRIBE EXTENDED alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED alter1 POSTHOOK: type: DESCTABLE -# col_name data_type comment - a int None b int None @@ -257,8 +233,6 @@ PREHOOK: query: DESCRIBE EXTENDED alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED alter1 POSTHOOK: type: DESCTABLE -# col_name data_type comment - a int None b int None @@ -275,8 +249,6 @@ PREHOOK: query: DESCRIBE EXTENDED alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED alter1 POSTHOOK: type: DESCTABLE -# col_name data_type comment - a int None b int None @@ -293,8 +265,6 @@ PREHOOK: query: DESCRIBE EXTENDED alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED alter1 POSTHOOK: type: DESCTABLE -# col_name data_type comment - a int None b int None @@ -311,8 +281,6 @@ PREHOOK: query: DESCRIBE EXTENDED alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED alter1 POSTHOOK: type: DESCTABLE -# col_name data_type comment - a int None b int None @@ -329,8 +297,6 @@ PREHOOK: query: DESCRIBE EXTENDED alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED alter1 POSTHOOK: type: DESCTABLE -# col_name data_type comment - a int None b int None @@ -347,8 +313,6 @@ PREHOOK: query: DESCRIBE EXTENDED alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED alter1 POSTHOOK: type: DESCTABLE -# col_name data_type comment - a string from deserializer b string from deserializer @@ -365,8 +329,6 @@ PREHOOK: query: DESCRIBE EXTENDED alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED alter1 POSTHOOK: type: DESCTABLE -# col_name data_type comment - a string from deserializer b string from deserializer @@ -383,8 +345,6 @@ PREHOOK: query: DESCRIBE alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE alter1 POSTHOOK: type: DESCTABLE -# col_name data_type comment - a int None b int None c string None diff --git ql/src/test/results/clientpositive/alter2.q.out ql/src/test/results/clientpositive/alter2.q.out index 9923ab8..82c78ad 100644 --- ql/src/test/results/clientpositive/alter2.q.out +++ ql/src/test/results/clientpositive/alter2.q.out @@ -7,8 +7,6 @@ PREHOOK: query: describe extended alter2 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended alter2 POSTHOOK: type: DESCTABLE -# col_name data_type comment - a int None b int None insertdate string None @@ -34,8 +32,6 @@ PREHOOK: query: describe extended alter2 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended alter2 POSTHOOK: type: DESCTABLE -# col_name data_type comment - a int None b int None insertdate string None @@ -62,8 +58,6 @@ PREHOOK: query: describe extended alter2 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended alter2 POSTHOOK: type: DESCTABLE -# col_name data_type comment - a int None b int None insertdate string None @@ -97,8 +91,6 @@ PREHOOK: query: describe extended alter2 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended alter2 POSTHOOK: type: DESCTABLE -# col_name data_type comment - a int None b int None insertdate string None @@ -124,8 +116,6 @@ PREHOOK: query: describe extended alter2 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended alter2 POSTHOOK: type: DESCTABLE -# col_name data_type comment - a int None b int None insertdate string None @@ -152,8 +142,6 @@ PREHOOK: query: describe extended alter2 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended alter2 POSTHOOK: type: DESCTABLE -# col_name data_type comment - a int None b int None insertdate string None @@ -217,8 +205,6 @@ PREHOOK: query: DESCRIBE EXTENDED alter2 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED alter2 POSTHOOK: type: DESCTABLE -# col_name data_type comment - a int None b int None insertdate string None @@ -244,8 +230,6 @@ PREHOOK: query: DESCRIBE EXTENDED alter2 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED alter2 POSTHOOK: type: DESCTABLE -# col_name data_type comment - a int None b int None insertdate string None @@ -272,8 +256,6 @@ PREHOOK: query: DESCRIBE EXTENDED alter2 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED alter2 POSTHOOK: type: DESCTABLE -# col_name data_type comment - a int None b int None insertdate string None @@ -307,8 +289,6 @@ PREHOOK: query: DESCRIBE EXTENDED alter2 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED alter2 POSTHOOK: type: DESCTABLE -# col_name data_type comment - a int None b int None insertdate string None @@ -334,8 +314,6 @@ PREHOOK: query: DESCRIBE EXTENDED alter2 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED alter2 POSTHOOK: type: DESCTABLE -# col_name data_type comment - a int None b int None insertdate string None @@ -362,8 +340,6 @@ PREHOOK: query: DESCRIBE EXTENDED alter2 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED alter2 POSTHOOK: type: DESCTABLE -# col_name data_type comment - a int None b int None insertdate string None diff --git ql/src/test/results/clientpositive/alter3.q.out ql/src/test/results/clientpositive/alter3.q.out index 9312118..43064f7 100644 --- ql/src/test/results/clientpositive/alter3.q.out +++ ql/src/test/results/clientpositive/alter3.q.out @@ -60,8 +60,6 @@ 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), ] -# col_name data_type comment - col1 string None pcol1 string None pcol2 string None @@ -78,8 +76,6 @@ 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), ] -# col_name data_type comment - col1 string None pcol1 string None pcol2 string None @@ -139,8 +135,6 @@ 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), ] -# col_name data_type comment - col1 string None pcol1 string None pcol2 string None @@ -298,8 +292,6 @@ 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), ] -# col_name data_type comment - col1 string None pcol1 string None pcol2 string None @@ -318,8 +310,6 @@ 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), ] -# col_name data_type comment - col1 string None pcol1 string None pcol2 string None @@ -387,8 +377,6 @@ 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), ] -# col_name data_type comment - col1 string None pcol1 string None pcol2 string None diff --git ql/src/test/results/clientpositive/alter4.q.out ql/src/test/results/clientpositive/alter4.q.out index d618fa6..ed8b4f6 100644 --- ql/src/test/results/clientpositive/alter4.q.out +++ ql/src/test/results/clientpositive/alter4.q.out @@ -7,8 +7,6 @@ PREHOOK: query: DESCRIBE EXTENDED set_bucketing_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED set_bucketing_test POSTHOOK: type: DESCTABLE -# col_name data_type comment - key int None value string None @@ -25,8 +23,6 @@ PREHOOK: query: DESCRIBE EXTENDED set_bucketing_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED set_bucketing_test POSTHOOK: type: DESCTABLE -# col_name data_type comment - key int None value string None @@ -78,8 +74,6 @@ PREHOOK: query: DESCRIBE EXTENDED set_bucketing_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED set_bucketing_test POSTHOOK: type: DESCTABLE -# col_name data_type comment - key int None value string None @@ -96,8 +90,6 @@ PREHOOK: query: DESCRIBE EXTENDED set_bucketing_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED set_bucketing_test POSTHOOK: type: DESCTABLE -# col_name data_type comment - key int None value string None diff --git ql/src/test/results/clientpositive/alter5.q.out ql/src/test/results/clientpositive/alter5.q.out index fc808d3..c1df0c8 100644 --- ql/src/test/results/clientpositive/alter5.q.out +++ ql/src/test/results/clientpositive/alter5.q.out @@ -41,8 +41,6 @@ PREHOOK: query: describe extended alter5 partition (dt='a') PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended alter5 partition (dt='a') POSTHOOK: type: DESCTABLE -# col_name data_type comment - col1 string None dt string None @@ -83,8 +81,6 @@ 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), ] -# col_name data_type comment - col1 string None dt string None @@ -178,8 +174,6 @@ 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), ] -# col_name data_type comment - col1 string None dt string None @@ -223,8 +217,6 @@ 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), ] -# col_name data_type comment - col1 string None dt string None diff --git ql/src/test/results/clientpositive/alter_index.q.out ql/src/test/results/clientpositive/alter_index.q.out index d34bd67..a1738ad 100644 --- ql/src/test/results/clientpositive/alter_index.q.out +++ ql/src/test/results/clientpositive/alter_index.q.out @@ -11,8 +11,6 @@ PREHOOK: query: desc extended default__src_src_index_8__ PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended default__src_src_index_8__ POSTHOOK: type: DESCTABLE -# col_name data_type comment - key string default _bucketname string _offsets array @@ -26,8 +24,6 @@ PREHOOK: query: desc extended default__src_src_index_8__ PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended default__src_src_index_8__ POSTHOOK: type: DESCTABLE -# col_name data_type comment - key string default _bucketname string _offsets array diff --git ql/src/test/results/clientpositive/alter_merge_2.q.out ql/src/test/results/clientpositive/alter_merge_2.q.out index df892a3..fe71635 100644 --- ql/src/test/results/clientpositive/alter_merge_2.q.out +++ ql/src/test/results/clientpositive/alter_merge_2.q.out @@ -14,8 +14,6 @@ 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 -# col_name data_type comment - key int None value string None ds string None diff --git ql/src/test/results/clientpositive/alter_merge_stats.q.out ql/src/test/results/clientpositive/alter_merge_stats.q.out index 19e8942..2746de2 100644 --- ql/src/test/results/clientpositive/alter_merge_stats.q.out +++ ql/src/test/results/clientpositive/alter_merge_stats.q.out @@ -42,8 +42,6 @@ PREHOOK: query: desc extended src_rc_merge_test_stat PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended src_rc_merge_test_stat POSTHOOK: type: DESCTABLE -# col_name data_type comment - key int None value string None @@ -60,8 +58,6 @@ PREHOOK: query: desc extended src_rc_merge_test_stat PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended src_rc_merge_test_stat POSTHOOK: type: DESCTABLE -# col_name data_type comment - key int None value string None @@ -95,8 +91,6 @@ PREHOOK: query: desc extended src_rc_merge_test_stat PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended src_rc_merge_test_stat POSTHOOK: type: DESCTABLE -# col_name data_type comment - key int None value string None @@ -152,8 +146,6 @@ 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 -# col_name data_type comment - key int None value string None ds string None @@ -180,8 +172,6 @@ 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 -# col_name data_type comment - key int None value string None ds string None @@ -221,8 +211,6 @@ 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 -# col_name data_type comment - key int None value string None ds string None diff --git ql/src/test/results/clientpositive/alter_partition_coltype.q.out ql/src/test/results/clientpositive/alter_partition_coltype.q.out index 2a8d185..d9c48aa 100644 --- ql/src/test/results/clientpositive/alter_partition_coltype.q.out +++ ql/src/test/results/clientpositive/alter_partition_coltype.q.out @@ -23,8 +23,6 @@ POSTHOOK: query: desc alter_coltype POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: alter_coltype PARTITION(dt=100x,ts=6:30pm).key SIMPLE [(src1)src1.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: alter_coltype PARTITION(dt=100x,ts=6:30pm).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] -# col_name data_type comment - key string None value string None dt string None @@ -1227,8 +1225,6 @@ POSTHOOK: Lineage: alter_coltype PARTITION(dt=100x,ts=3.0).key SIMPLE [(src1)src POSTHOOK: Lineage: alter_coltype PARTITION(dt=100x,ts=3.0).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: alter_coltype PARTITION(dt=100x,ts=6:30pm).key SIMPLE [(src1)src1.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: alter_coltype PARTITION(dt=100x,ts=6:30pm).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] -# col_name data_type comment - key string None value string None dt int None @@ -1249,8 +1245,6 @@ POSTHOOK: Lineage: alter_coltype PARTITION(dt=100x,ts=3.0).key SIMPLE [(src1)src POSTHOOK: Lineage: alter_coltype PARTITION(dt=100x,ts=3.0).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: alter_coltype PARTITION(dt=100x,ts=6:30pm).key SIMPLE [(src1)src1.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: alter_coltype PARTITION(dt=100x,ts=6:30pm).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] -# col_name data_type comment - key string None value string None dt int None @@ -1271,8 +1265,6 @@ POSTHOOK: Lineage: alter_coltype PARTITION(dt=100x,ts=3.0).key SIMPLE [(src1)src POSTHOOK: Lineage: alter_coltype PARTITION(dt=100x,ts=3.0).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: alter_coltype PARTITION(dt=100x,ts=6:30pm).key SIMPLE [(src1)src1.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: alter_coltype PARTITION(dt=100x,ts=6:30pm).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] -# col_name data_type comment - key string None value string None dt int None @@ -1293,8 +1285,6 @@ POSTHOOK: Lineage: alter_coltype PARTITION(dt=100x,ts=3.0).key SIMPLE [(src1)src POSTHOOK: Lineage: alter_coltype PARTITION(dt=100x,ts=3.0).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: alter_coltype PARTITION(dt=100x,ts=6:30pm).key SIMPLE [(src1)src1.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: alter_coltype PARTITION(dt=100x,ts=6:30pm).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] -# col_name data_type comment - key string None value string None dt int None 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 22f3467..0b43385 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,6 @@ PREHOOK: query: desc extended alter_partition_format_test PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended alter_partition_format_test POSTHOOK: type: DESCTABLE -# col_name data_type comment - key int None value string None @@ -25,8 +23,6 @@ PREHOOK: query: desc extended alter_partition_format_test PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended alter_partition_format_test POSTHOOK: type: DESCTABLE -# col_name data_type comment - key int None value string None @@ -42,8 +38,6 @@ PREHOOK: query: desc extended alter_partition_format_test PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended alter_partition_format_test POSTHOOK: type: DESCTABLE -# col_name data_type comment - key int None value string None @@ -74,8 +68,6 @@ 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 -# col_name data_type comment - key int None value string None ds string None @@ -99,8 +91,6 @@ 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 -# col_name data_type comment - key int None value string None ds string None @@ -123,8 +113,6 @@ 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 -# col_name data_type comment - key int None value string None ds string None @@ -139,8 +127,6 @@ PREHOOK: query: desc extended alter_partition_format_test PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended alter_partition_format_test POSTHOOK: type: DESCTABLE -# col_name data_type comment - key int None value string None ds string None @@ -163,8 +149,6 @@ PREHOOK: query: desc extended alter_partition_format_test PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended alter_partition_format_test POSTHOOK: type: DESCTABLE -# col_name data_type comment - key int None value string None ds string None @@ -186,8 +170,6 @@ PREHOOK: query: desc extended alter_partition_format_test PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended alter_partition_format_test POSTHOOK: type: DESCTABLE -# col_name data_type comment - key int None value string None ds string None diff --git ql/src/test/results/clientpositive/alter_table_serde.q.out ql/src/test/results/clientpositive/alter_table_serde.q.out index 0c80720..721229b 100644 --- ql/src/test/results/clientpositive/alter_table_serde.q.out +++ ql/src/test/results/clientpositive/alter_table_serde.q.out @@ -9,8 +9,6 @@ PREHOOK: query: describe extended test_table PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended test_table POSTHOOK: type: DESCTABLE -# col_name data_type comment - id int None query string None name string None @@ -28,8 +26,6 @@ PREHOOK: query: describe extended test_table PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended test_table POSTHOOK: type: DESCTABLE -# col_name data_type comment - id int from deserializer query string from deserializer name string from deserializer @@ -47,8 +43,6 @@ PREHOOK: query: describe extended test_table PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended test_table POSTHOOK: type: DESCTABLE -# col_name data_type comment - id int from deserializer query string from deserializer name string from deserializer @@ -80,8 +74,6 @@ PREHOOK: query: describe extended test_table partition (dt='2011') PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended test_table partition (dt='2011') POSTHOOK: type: DESCTABLE -# col_name data_type comment - id int None query string None name string None @@ -105,8 +97,6 @@ PREHOOK: query: describe extended test_table partition (dt='2011') PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended test_table partition (dt='2011') POSTHOOK: type: DESCTABLE -# col_name data_type comment - id int None query string None name string None @@ -130,8 +120,6 @@ PREHOOK: query: describe extended test_table partition (dt='2011') PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended test_table partition (dt='2011') POSTHOOK: type: DESCTABLE -# col_name data_type comment - id int None query string None name string None @@ -160,8 +148,6 @@ PREHOOK: query: describe extended test_table partition (dt='2011') PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended test_table partition (dt='2011') POSTHOOK: type: DESCTABLE -# col_name data_type comment - id int None query string None name string None @@ -186,8 +172,6 @@ PREHOOK: query: describe extended test_table partition (dt='2011') PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended test_table partition (dt='2011') POSTHOOK: type: DESCTABLE -# col_name data_type comment - id int None query string None name string None diff --git ql/src/test/results/clientpositive/alter_view_rename.q.out ql/src/test/results/clientpositive/alter_view_rename.q.out index 23fe432..9f1b098 100644 --- ql/src/test/results/clientpositive/alter_view_rename.q.out +++ ql/src/test/results/clientpositive/alter_view_rename.q.out @@ -14,8 +14,6 @@ PREHOOK: query: DESCRIBE EXTENDED view1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED view1 POSTHOOK: type: DESCTABLE -# col_name data_type comment - foo int None bar string None ds string None @@ -34,8 +32,6 @@ PREHOOK: query: DESCRIBE EXTENDED view2 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED view2 POSTHOOK: type: DESCTABLE -# col_name data_type comment - foo int None bar string None ds string None diff --git ql/src/test/results/clientpositive/authorization_7.q.out ql/src/test/results/clientpositive/authorization_7.q.out index ee94e92..240a1cc 100644 --- ql/src/test/results/clientpositive/authorization_7.q.out +++ ql/src/test/results/clientpositive/authorization_7.q.out @@ -11,8 +11,6 @@ PREHOOK: query: DESCRIBE src_authorization_7 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE src_authorization_7 POSTHOOK: type: DESCTABLE -# col_name data_type comment - key int None value string None PREHOOK: query: DROP TABLE src_authorization_7 @@ -40,8 +38,6 @@ PREHOOK: query: DESCRIBE src_authorization_7 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE src_authorization_7 POSTHOOK: type: DESCTABLE -# col_name data_type comment - key int None value string None PREHOOK: query: DROP TABLE src_authorization_7 diff --git ql/src/test/results/clientpositive/autogen_colalias.q.out ql/src/test/results/clientpositive/autogen_colalias.q.out index 889494d..a074b96 100644 --- ql/src/test/results/clientpositive/autogen_colalias.q.out +++ ql/src/test/results/clientpositive/autogen_colalias.q.out @@ -19,8 +19,6 @@ PREHOOK: query: describe dest_grouped_old1 PREHOOK: type: DESCTABLE POSTHOOK: query: describe dest_grouped_old1 POSTHOOK: type: DESCTABLE -# col_name data_type comment - _c0 int None zz int None key string None @@ -42,8 +40,6 @@ PREHOOK: query: describe dest_grouped_old2 PREHOOK: type: DESCTABLE POSTHOOK: query: describe dest_grouped_old2 POSTHOOK: type: DESCTABLE -# 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, @@ -62,8 +58,6 @@ PREHOOK: query: describe dest_grouped_new1 PREHOOK: type: DESCTABLE POSTHOOK: query: describe dest_grouped_new1 POSTHOOK: type: DESCTABLE -# col_name data_type comment - column_0 int None zz int None column_2 double None @@ -85,8 +79,6 @@ PREHOOK: query: describe dest_grouped_new2 PREHOOK: type: DESCTABLE POSTHOOK: query: describe dest_grouped_new2 POSTHOOK: type: DESCTABLE -# 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 diff --git ql/src/test/results/clientpositive/avro_change_schema.q.out ql/src/test/results/clientpositive/avro_change_schema.q.out index 87edc83..a98e715 100644 --- ql/src/test/results/clientpositive/avro_change_schema.q.out +++ ql/src/test/results/clientpositive/avro_change_schema.q.out @@ -33,8 +33,6 @@ PREHOOK: query: DESCRIBE avro2 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE avro2 POSTHOOK: type: DESCTABLE -# 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", @@ -63,8 +61,6 @@ PREHOOK: query: DESCRIBE avro2 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE avro2 POSTHOOK: type: DESCTABLE -# 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 40d700d..6bcad05 100644 --- ql/src/test/results/clientpositive/avro_evolved_schemas.q.out +++ ql/src/test/results/clientpositive/avro_evolved_schemas.q.out @@ -75,8 +75,6 @@ PREHOOK: query: DESCRIBE doctors_with_new_field PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE doctors_with_new_field POSTHOOK: type: DESCTABLE -# col_name data_type comment - number int from deserializer first_name string from deserializer last_name string from deserializer diff --git ql/src/test/results/clientpositive/avro_joins.q.out ql/src/test/results/clientpositive/avro_joins.q.out index db98485..9f9a1fb 100644 --- ql/src/test/results/clientpositive/avro_joins.q.out +++ ql/src/test/results/clientpositive/avro_joins.q.out @@ -77,8 +77,6 @@ PREHOOK: query: DESCRIBE doctors4 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE doctors4 POSTHOOK: type: DESCTABLE -# col_name data_type comment - number int from deserializer first_name string from deserializer last_name string from deserializer @@ -152,8 +150,6 @@ PREHOOK: query: DESCRIBE episodes PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE episodes POSTHOOK: type: DESCTABLE -# col_name data_type comment - title string from deserializer air_date string from deserializer doctor int from deserializer diff --git ql/src/test/results/clientpositive/avro_sanity_test.q.out ql/src/test/results/clientpositive/avro_sanity_test.q.out index e625a4c..9227f8f 100644 --- ql/src/test/results/clientpositive/avro_sanity_test.q.out +++ ql/src/test/results/clientpositive/avro_sanity_test.q.out @@ -63,8 +63,6 @@ PREHOOK: query: DESCRIBE doctors PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE doctors POSTHOOK: type: DESCTABLE -# col_name data_type comment - number int from deserializer first_name string from deserializer last_name string from deserializer 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 b699181..1e473f1 100644 --- ql/src/test/results/clientpositive/avro_schema_error_message.q.out +++ ql/src/test/results/clientpositive/avro_schema_error_message.q.out @@ -21,8 +21,6 @@ PREHOOK: query: DESCRIBE avro_with_no_schema PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE avro_with_no_schema POSTHOOK: type: DESCTABLE -# 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 diff --git ql/src/test/results/clientpositive/avro_schema_literal.q.out ql/src/test/results/clientpositive/avro_schema_literal.q.out index 87de151..be15ba1 100644 --- ql/src/test/results/clientpositive/avro_schema_literal.q.out +++ ql/src/test/results/clientpositive/avro_schema_literal.q.out @@ -63,8 +63,6 @@ PREHOOK: query: DESCRIBE avro1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE avro1 POSTHOOK: type: DESCTABLE -# col_name data_type comment - string1 string from deserializer int1 int from deserializer tinyint1 int from deserializer diff --git ql/src/test/results/clientpositive/ba_table1.q.out ql/src/test/results/clientpositive/ba_table1.q.out index 2b98c59..89742cc 100644 --- ql/src/test/results/clientpositive/ba_table1.q.out +++ ql/src/test/results/clientpositive/ba_table1.q.out @@ -15,8 +15,6 @@ PREHOOK: query: describe extended ba_test PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended ba_test POSTHOOK: type: DESCTABLE -# col_name data_type comment - ba_key binary None ba_val binary None diff --git ql/src/test/results/clientpositive/ba_table2.q.out ql/src/test/results/clientpositive/ba_table2.q.out index 8942cb9..ddf2bce 100644 --- ql/src/test/results/clientpositive/ba_table2.q.out +++ ql/src/test/results/clientpositive/ba_table2.q.out @@ -23,8 +23,6 @@ PREHOOK: query: describe extended ba_test PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended ba_test POSTHOOK: type: DESCTABLE -# col_name data_type comment - ba_key binary from deserializer ba_val binary from deserializer diff --git ql/src/test/results/clientpositive/ba_table_union.q.out ql/src/test/results/clientpositive/ba_table_union.q.out index 85ea093..ed97274 100644 --- ql/src/test/results/clientpositive/ba_table_union.q.out +++ ql/src/test/results/clientpositive/ba_table_union.q.out @@ -13,8 +13,6 @@ PREHOOK: query: describe extended ba_test PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended ba_test POSTHOOK: type: DESCTABLE -# col_name data_type comment - ba_key binary None ba_val binary None diff --git ql/src/test/results/clientpositive/binary_table_bincolserde.q.out ql/src/test/results/clientpositive/binary_table_bincolserde.q.out index 2b90acd..fbe148f 100644 --- ql/src/test/results/clientpositive/binary_table_bincolserde.q.out +++ ql/src/test/results/clientpositive/binary_table_bincolserde.q.out @@ -23,8 +23,6 @@ PREHOOK: query: describe extended ba_test PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended ba_test POSTHOOK: type: DESCTABLE -# col_name data_type comment - ba_key binary from deserializer ba_val binary from deserializer diff --git ql/src/test/results/clientpositive/binary_table_colserde.q.out ql/src/test/results/clientpositive/binary_table_colserde.q.out index e747129..69a6c6e 100644 --- ql/src/test/results/clientpositive/binary_table_colserde.q.out +++ ql/src/test/results/clientpositive/binary_table_colserde.q.out @@ -15,8 +15,6 @@ PREHOOK: query: describe extended ba_test PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended ba_test POSTHOOK: type: DESCTABLE -# col_name data_type comment - ba_key binary None ba_val binary None diff --git ql/src/test/results/clientpositive/bucket_groupby.q.out ql/src/test/results/clientpositive/bucket_groupby.q.out index 0ff90d1..f903a13 100644 --- ql/src/test/results/clientpositive/bucket_groupby.q.out +++ ql/src/test/results/clientpositive/bucket_groupby.q.out @@ -7,8 +7,6 @@ PREHOOK: query: describe extended clustergroupby PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended clustergroupby POSTHOOK: type: DESCTABLE -# col_name data_type comment - key string None value string None ds string None @@ -143,8 +141,6 @@ 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), ] -# col_name data_type comment - key string None value string None ds string None @@ -1225,8 +1221,6 @@ 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), ] -# col_name data_type comment - key string None value string None ds string None @@ -1636,8 +1630,6 @@ 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), ] -# col_name data_type comment - key string None value string None ds string None diff --git ql/src/test/results/clientpositive/columnarserde_create_shortcut.q.out ql/src/test/results/clientpositive/columnarserde_create_shortcut.q.out index f6d54c1..043686a 100644 --- ql/src/test/results/clientpositive/columnarserde_create_shortcut.q.out +++ ql/src/test/results/clientpositive/columnarserde_create_shortcut.q.out @@ -182,8 +182,6 @@ 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), ] -# col_name data_type comment - key string None value string None PREHOOK: query: SELECT columnShortcutTable.* FROM columnShortcutTable ORDER BY key ASC, value ASC diff --git ql/src/test/results/clientpositive/combine3.q.out ql/src/test/results/clientpositive/combine3.q.out index 331e8d6..8e973ea 100644 --- ql/src/test/results/clientpositive/combine3.q.out +++ ql/src/test/results/clientpositive/combine3.q.out @@ -47,8 +47,6 @@ 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), ] -# col_name data_type comment - key int None value string None ds string None @@ -69,8 +67,6 @@ 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), ] -# col_name data_type comment - key int None value string None ds string None 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 af981a7..aacedd1 100644 --- ql/src/test/results/clientpositive/convert_enum_to_string.q.out +++ ql/src/test/results/clientpositive/convert_enum_to_string.q.out @@ -21,8 +21,6 @@ PREHOOK: query: describe convert_enum_to_string PREHOOK: type: DESCTABLE POSTHOOK: query: describe convert_enum_to_string POSTHOOK: type: DESCTABLE -# col_name data_type comment - my_bool boolean from deserializer my_byte tinyint from deserializer my_16bit_int smallint from deserializer diff --git ql/src/test/results/clientpositive/create_1.q.out ql/src/test/results/clientpositive/create_1.q.out index ed65478..2055c95 100644 --- ql/src/test/results/clientpositive/create_1.q.out +++ ql/src/test/results/clientpositive/create_1.q.out @@ -7,16 +7,12 @@ PREHOOK: query: DESCRIBE table1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE table1 POSTHOOK: type: DESCTABLE -# 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 -# col_name data_type comment - a string None b string None @@ -34,16 +30,12 @@ PREHOOK: query: DESCRIBE table2 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE table2 POSTHOOK: type: DESCTABLE -# 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 -# col_name data_type comment - a string None b int None @@ -61,16 +53,12 @@ PREHOOK: query: DESCRIBE table3 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE table3 POSTHOOK: type: DESCTABLE -# 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 -# col_name data_type comment - a string None b string None @@ -88,16 +76,12 @@ PREHOOK: query: DESCRIBE table4 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE table4 POSTHOOK: type: DESCTABLE -# 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 -# col_name data_type comment - a string None b string None @@ -115,16 +99,12 @@ PREHOOK: query: DESCRIBE table5 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE table5 POSTHOOK: type: DESCTABLE -# 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 -# col_name data_type comment - a string None b string None diff --git ql/src/test/results/clientpositive/create_default_prop.q.out ql/src/test/results/clientpositive/create_default_prop.q.out index b8f9985..95b8ef0 100644 --- ql/src/test/results/clientpositive/create_default_prop.q.out +++ ql/src/test/results/clientpositive/create_default_prop.q.out @@ -7,8 +7,6 @@ PREHOOK: query: DESC EXTENDED table_p1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESC EXTENDED table_p1 POSTHOOK: type: DESCTABLE -# col_name data_type comment - a string None #### A masked pattern was here #### @@ -21,8 +19,6 @@ PREHOOK: query: DESC EXTENDED table_p2 PREHOOK: type: DESCTABLE POSTHOOK: query: DESC EXTENDED table_p2 POSTHOOK: type: DESCTABLE -# col_name data_type comment - a string None #### A masked pattern was here #### @@ -37,8 +33,6 @@ PREHOOK: query: DESC EXTENDED table_p3 PREHOOK: type: DESCTABLE POSTHOOK: query: DESC EXTENDED table_p3 POSTHOOK: type: DESCTABLE -# 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 f6b93e6..de32533 100644 --- ql/src/test/results/clientpositive/create_escape.q.out +++ ql/src/test/results/clientpositive/create_escape.q.out @@ -11,16 +11,12 @@ PREHOOK: query: DESCRIBE table1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE table1 POSTHOOK: type: DESCTABLE -# 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 -# col_name data_type comment - a string None b string None diff --git ql/src/test/results/clientpositive/create_insert_outputformat.q.out ql/src/test/results/clientpositive/create_insert_outputformat.q.out index d6599a7..ce3cb09 100644 --- ql/src/test/results/clientpositive/create_insert_outputformat.q.out +++ ql/src/test/results/clientpositive/create_insert_outputformat.q.out @@ -25,8 +25,6 @@ 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), ] -# 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 @@ -62,8 +60,6 @@ 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), ] -# 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 @@ -105,7 +101,5 @@ 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), ] -# 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 cb43bb3..f6b4d41 100644 --- ql/src/test/results/clientpositive/create_like_view.q.out +++ ql/src/test/results/clientpositive/create_like_view.q.out @@ -23,8 +23,6 @@ PREHOOK: query: DESCRIBE table1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE table1 POSTHOOK: type: DESCTABLE -# col_name data_type comment - a string None b string None PREHOOK: query: DESCRIBE FORMATTED table1 @@ -72,8 +70,6 @@ PREHOOK: query: DESCRIBE table2 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE table2 POSTHOOK: type: DESCTABLE -# col_name data_type comment - a string None b string None PREHOOK: query: DESCRIBE FORMATTED table2 @@ -122,8 +118,6 @@ PREHOOK: query: DESCRIBE table3 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE table3 POSTHOOK: type: DESCTABLE -# col_name data_type comment - a string None b string None PREHOOK: 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 7619785..12d0da5 100644 --- ql/src/test/results/clientpositive/create_nested_type.q.out +++ ql/src/test/results/clientpositive/create_nested_type.q.out @@ -17,8 +17,6 @@ PREHOOK: query: DESCRIBE table1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE table1 POSTHOOK: type: DESCTABLE -# col_name data_type comment - a string None b array None c array> None @@ -27,8 +25,6 @@ PREHOOK: query: DESCRIBE EXTENDED table1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED table1 POSTHOOK: type: DESCTABLE -# col_name data_type comment - a string None b array None c array> None diff --git ql/src/test/results/clientpositive/create_view.q.out ql/src/test/results/clientpositive/create_view.q.out index e1e8cea..72b03b9 100644 --- ql/src/test/results/clientpositive/create_view.q.out +++ ql/src/test/results/clientpositive/create_view.q.out @@ -225,15 +225,11 @@ PREHOOK: query: DESCRIBE view1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE view1 POSTHOOK: type: DESCTABLE -# col_name data_type comment - value string None PREHOOK: query: DESCRIBE EXTENDED view1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED view1 POSTHOOK: type: DESCTABLE -# col_name data_type comment - value string None #### A masked pattern was here #### @@ -270,16 +266,12 @@ PREHOOK: query: DESCRIBE view2 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE view2 POSTHOOK: type: DESCTABLE -# 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 -# col_name data_type comment - key string None value string None @@ -318,15 +310,11 @@ PREHOOK: query: DESCRIBE view3 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE view3 POSTHOOK: type: DESCTABLE -# col_name data_type comment - valoo string None PREHOOK: query: DESCRIBE EXTENDED view3 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED view3 POSTHOOK: type: DESCTABLE -# col_name data_type comment - valoo string None #### A masked pattern was here #### @@ -372,8 +360,6 @@ PREHOOK: query: DESCRIBE EXTENDED view3 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED view3 POSTHOOK: type: DESCTABLE -# col_name data_type comment - valoo string None #### A masked pattern was here #### @@ -421,8 +407,6 @@ POSTHOOK: query: -- use DESCRIBE EXTENDED on a base table and an external table -- of comparison for view descriptions DESCRIBE EXTENDED table1 POSTHOOK: type: DESCTABLE -# col_name data_type comment - key int None #### A masked pattern was here #### @@ -430,8 +414,6 @@ PREHOOK: query: DESCRIBE EXTENDED src1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED src1 POSTHOOK: type: DESCTABLE -# col_name data_type comment - key string default value string default @@ -444,8 +426,6 @@ POSTHOOK: query: -- use DESCRIBE EXTENDED on a base table as a point of comparis -- view descriptions DESCRIBE EXTENDED table1 POSTHOOK: type: DESCTABLE -# col_name data_type comment - key int None #### A masked pattern was here #### @@ -493,8 +473,6 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE view4 POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] -# col_name data_type comment - key int None PREHOOK: query: ALTER TABLE table1 ADD COLUMNS (value STRING) PREHOOK: type: ALTERTABLE_ADDCOLS @@ -532,8 +510,6 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE table1 POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] -# col_name data_type comment - key int None value string None PREHOOK: query: DESCRIBE view4 @@ -541,8 +517,6 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE view4 POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] -# 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 @@ -575,8 +549,6 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE view5 POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] -# col_name data_type comment - key1 int None key2 int None PREHOOK: query: -- verify that column name and comment in DDL portion @@ -598,8 +570,6 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE view6 POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] -# 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 @@ -734,8 +704,6 @@ 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), ] -# col_name data_type comment - c string None #### A masked pattern was here #### @@ -813,8 +781,6 @@ 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), ] -# col_name data_type comment - m int None #### A masked pattern was here #### @@ -892,8 +858,6 @@ 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), ] -# col_name data_type comment - m int None #### A masked pattern was here #### @@ -960,8 +924,6 @@ 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), ] -# col_name data_type comment - key string None value string None @@ -1035,8 +997,6 @@ 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), ] -# col_name data_type comment - boom int None #### A masked pattern was here #### @@ -1105,8 +1065,6 @@ 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), ] -# col_name data_type comment - key string None value string None mycol int None @@ -1193,8 +1151,6 @@ 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), ] -# col_name data_type comment - key int None #### A masked pattern was here #### @@ -1292,8 +1248,6 @@ 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), ] -# col_name data_type comment - k1 string None v1 string None k2 string None @@ -1426,8 +1380,6 @@ 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), ] -# col_name data_type comment - key string None value_count bigint None @@ -1515,8 +1467,6 @@ 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), ] -# col_name data_type comment - value string None #### A masked pattern was here #### @@ -1595,8 +1545,6 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE view16 POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] -# 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 @@ -1614,8 +1562,6 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE table1 POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] -# col_name data_type comment - key int None value string None PREHOOK: query: -- this should work since currently we don't track view->table diff --git ql/src/test/results/clientpositive/create_view_partitioned.q.out ql/src/test/results/clientpositive/create_view_partitioned.q.out index d5d5dcb..2b24115 100644 --- ql/src/test/results/clientpositive/create_view_partitioned.q.out +++ ql/src/test/results/clientpositive/create_view_partitioned.q.out @@ -35,8 +35,6 @@ PREHOOK: query: DESCRIBE EXTENDED vp1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED vp1 POSTHOOK: type: DESCTABLE -# col_name data_type comment - key string None value string None diff --git ql/src/test/results/clientpositive/database.q.out ql/src/test/results/clientpositive/database.q.out index 8b92629..364aa20 100644 --- ql/src/test/results/clientpositive/database.q.out +++ ql/src/test/results/clientpositive/database.q.out @@ -129,8 +129,6 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: -- DESCRIBE table in non-default DB DESCRIBE test_table POSTHOOK: type: DESCTABLE -# col_name data_type comment - col1 string None PREHOOK: query: -- DESCRIBE EXTENDED in non-default DB DESCRIBE EXTENDED test_table @@ -138,8 +136,6 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: -- DESCRIBE EXTENDED in non-default DB DESCRIBE EXTENDED test_table POSTHOOK: type: DESCTABLE -# col_name data_type comment - col1 string None #### A masked pattern was here #### @@ -160,8 +156,6 @@ PREHOOK: query: DESCRIBE EXTENDED test_table_like PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED test_table_like POSTHOOK: type: DESCTABLE -# col_name data_type comment - col1 string None #### A masked pattern was here #### @@ -1344,8 +1338,6 @@ 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, ] -# col_name data_type comment - key string default value string default diff --git ql/src/test/results/clientpositive/ddltime.q.out ql/src/test/results/clientpositive/ddltime.q.out index d919481..ef9437e 100644 --- ql/src/test/results/clientpositive/ddltime.q.out +++ ql/src/test/results/clientpositive/ddltime.q.out @@ -7,8 +7,6 @@ PREHOOK: query: desc extended T1 PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended T1 POSTHOOK: type: DESCTABLE -# col_name data_type comment - key string default value string default @@ -29,8 +27,6 @@ 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), ] -# col_name data_type comment - key string default value string default @@ -55,8 +51,6 @@ 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), ] -# col_name data_type comment - key string default value string default @@ -85,8 +79,6 @@ 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), ] -# col_name data_type comment - key string default value string default @@ -112,8 +104,6 @@ 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), ] -# col_name data_type comment - key string default value string default ds string None @@ -154,8 +144,6 @@ 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), ] -# col_name data_type comment - key string default value string default ds string None @@ -200,8 +188,6 @@ 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), ] -# col_name data_type comment - key string default value string default ds string None @@ -250,8 +236,6 @@ 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), ] -# col_name data_type comment - key string default value string default ds string None diff --git ql/src/test/results/clientpositive/describe_comment_indent.q.out ql/src/test/results/clientpositive/describe_comment_indent.q.out index 9379f85..9542e01 100644 --- ql/src/test/results/clientpositive/describe_comment_indent.q.out +++ ql/src/test/results/clientpositive/describe_comment_indent.q.out @@ -27,8 +27,6 @@ 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 diff --git ql/src/test/results/clientpositive/describe_syntax.q.out ql/src/test/results/clientpositive/describe_syntax.q.out index fefd983..4fcb1ac 100644 --- ql/src/test/results/clientpositive/describe_syntax.q.out +++ ql/src/test/results/clientpositive/describe_syntax.q.out @@ -38,8 +38,6 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: -- describe table DESCRIBE t1 POSTHOOK: type: DESCTABLE -# col_name data_type comment - key1 int None value1 string None ds string None @@ -54,8 +52,6 @@ PREHOOK: query: DESCRIBE EXTENDED t1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED t1 POSTHOOK: type: DESCTABLE -# col_name data_type comment - key1 int None value1 string None ds string None @@ -109,8 +105,6 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: -- describe database.table DESCRIBE db1.t1 POSTHOOK: type: DESCTABLE -# col_name data_type comment - key1 int None value1 string None ds string None @@ -125,8 +119,6 @@ PREHOOK: query: DESCRIBE EXTENDED db1.t1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED db1.t1 POSTHOOK: type: DESCTABLE -# col_name data_type comment - key1 int None value1 string None ds string None @@ -180,15 +172,11 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: -- describe table column DESCRIBE t1 key1 POSTHOOK: type: DESCTABLE -# 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 -# col_name data_type comment - key1 int from deserializer PREHOOK: query: DESCRIBE FORMATTED t1 key1 PREHOOK: type: DESCTABLE @@ -203,15 +191,11 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: -- describe database.tabe column DESCRIBE db1.t1 key1 POSTHOOK: type: DESCTABLE -# 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 -# col_name data_type comment - key1 int from deserializer PREHOOK: query: DESCRIBE FORMATTED db1.t1 key1 PREHOOK: type: DESCTABLE @@ -230,15 +214,11 @@ POSTHOOK: query: -- describe table.column -- fall back to the old syntax table.column DESCRIBE t1.key1 POSTHOOK: type: DESCTABLE -# 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 -# col_name data_type comment - key1 int from deserializer PREHOOK: query: DESCRIBE FORMATTED t1.key1 PREHOOK: type: DESCTABLE @@ -253,8 +233,6 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: -- describe table partition DESCRIBE t1 PARTITION(ds='4', part='5') POSTHOOK: type: DESCTABLE -# col_name data_type comment - key1 int None value1 string None ds string None @@ -269,8 +247,6 @@ 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 -# col_name data_type comment - key1 int None value1 string None ds string None @@ -324,8 +300,6 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: -- describe database.table partition DESCRIBE db1.t1 PARTITION(ds='4', part='5') POSTHOOK: type: DESCTABLE -# col_name data_type comment - key1 int None value1 string None ds string None @@ -340,8 +314,6 @@ 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 -# col_name data_type comment - key1 int None value1 string None ds string None diff --git ql/src/test/results/clientpositive/describe_table.q.out ql/src/test/results/clientpositive/describe_table.q.out index ea18601..4bc3fdd 100644 --- ql/src/test/results/clientpositive/describe_table.q.out +++ ql/src/test/results/clientpositive/describe_table.q.out @@ -2,8 +2,6 @@ PREHOOK: query: describe srcpart PREHOOK: type: DESCTABLE POSTHOOK: query: describe srcpart POSTHOOK: type: DESCTABLE -# col_name data_type comment - key string default value string default ds string None @@ -18,15 +16,11 @@ PREHOOK: query: describe srcpart.key PREHOOK: type: DESCTABLE POSTHOOK: query: describe srcpart.key POSTHOOK: type: DESCTABLE -# 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 -# col_name data_type comment - key string default value string default ds string None @@ -41,8 +35,6 @@ PREHOOK: query: describe extended srcpart PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended srcpart POSTHOOK: type: DESCTABLE -# col_name data_type comment - key string default value string default ds string None @@ -59,15 +51,11 @@ PREHOOK: query: describe extended srcpart.key PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended srcpart.key POSTHOOK: type: DESCTABLE -# 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 -# col_name data_type comment - key string default value string default ds string None diff --git ql/src/test/results/clientpositive/describe_xpath.q.out ql/src/test/results/clientpositive/describe_xpath.q.out index 282d325..da9f44f 100644 --- ql/src/test/results/clientpositive/describe_xpath.q.out +++ ql/src/test/results/clientpositive/describe_xpath.q.out @@ -4,8 +4,6 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: -- Describe a list structure in a thrift table describe src_thrift.lint POSTHOOK: type: DESCTABLE -# col_name data_type comment - lint array from deserializer PREHOOK: query: -- Describe the element of a list describe src_thrift.lint.$elem$ @@ -13,8 +11,6 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: -- Describe the element of a list describe src_thrift.lint.$elem$ POSTHOOK: type: DESCTABLE -# col_name data_type comment - $elem$ int from deserializer PREHOOK: query: -- Describe the key of a map describe src_thrift.mStringString.$key$ @@ -22,8 +18,6 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: -- Describe the key of a map describe src_thrift.mStringString.$key$ POSTHOOK: type: DESCTABLE -# col_name data_type comment - $key$ string from deserializer PREHOOK: query: -- Describe the value of a map describe src_thrift.mStringString.$value$ @@ -31,8 +25,6 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: -- Describe the value of a map describe src_thrift.mStringString.$value$ POSTHOOK: type: DESCTABLE -# col_name data_type comment - $value$ string from deserializer PREHOOK: query: -- Describe a complex element of a list describe src_thrift.lintString.$elem$ @@ -40,8 +32,6 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: -- Describe a complex element of a list describe src_thrift.lintString.$elem$ POSTHOOK: type: DESCTABLE -# col_name data_type comment - myint int from deserializer mystring string from deserializer underscore_int int from deserializer @@ -51,6 +41,4 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: -- Describe a member of an element of a list describe src_thrift.lintString.$elem$.myint POSTHOOK: type: DESCTABLE -# 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 9b36f19..b3ee582 100644 --- ql/src/test/results/clientpositive/drop_partitions_filter.q.out +++ ql/src/test/results/clientpositive/drop_partitions_filter.q.out @@ -7,8 +7,6 @@ PREHOOK: query: describe ptestfilter PREHOOK: type: DESCTABLE POSTHOOK: query: describe ptestfilter POSTHOOK: type: DESCTABLE -# col_name data_type comment - a string None b int None c string None diff --git ql/src/test/results/clientpositive/drop_partitions_filter2.q.out ql/src/test/results/clientpositive/drop_partitions_filter2.q.out index fb9ae4a..0225c3b 100644 --- ql/src/test/results/clientpositive/drop_partitions_filter2.q.out +++ ql/src/test/results/clientpositive/drop_partitions_filter2.q.out @@ -7,8 +7,6 @@ PREHOOK: query: describe ptestfilter PREHOOK: type: DESCTABLE POSTHOOK: query: describe ptestfilter POSTHOOK: type: DESCTABLE -# col_name data_type comment - a string None b int None c int None diff --git ql/src/test/results/clientpositive/drop_partitions_filter3.q.out ql/src/test/results/clientpositive/drop_partitions_filter3.q.out index 2033faa..30bb316 100644 --- ql/src/test/results/clientpositive/drop_partitions_filter3.q.out +++ ql/src/test/results/clientpositive/drop_partitions_filter3.q.out @@ -7,8 +7,6 @@ PREHOOK: query: describe ptestfilter PREHOOK: type: DESCTABLE POSTHOOK: query: describe ptestfilter POSTHOOK: type: DESCTABLE -# col_name data_type comment - a string None b int None c string None diff --git ql/src/test/results/clientpositive/drop_partitions_ignore_protection.q.out ql/src/test/results/clientpositive/drop_partitions_ignore_protection.q.out index e783982..cf44ebd 100644 --- ql/src/test/results/clientpositive/drop_partitions_ignore_protection.q.out +++ ql/src/test/results/clientpositive/drop_partitions_ignore_protection.q.out @@ -23,8 +23,6 @@ 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 -# col_name data_type comment - c1 string None c2 string None p string None 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 75b7096..4fbb6fb 100644 --- ql/src/test/results/clientpositive/exim_00_nonpart_empty.q.out +++ ql/src/test/results/clientpositive/exim_00_nonpart_empty.q.out @@ -41,8 +41,6 @@ PREHOOK: query: describe extended exim_department PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended exim_department POSTHOOK: type: DESCTABLE -# col_name data_type comment - dep_id int department id #### A masked pattern was here #### diff --git ql/src/test/results/clientpositive/exim_01_nonpart.q.out ql/src/test/results/clientpositive/exim_01_nonpart.q.out index 0c0fd01..a48c776 100644 --- ql/src/test/results/clientpositive/exim_01_nonpart.q.out +++ ql/src/test/results/clientpositive/exim_01_nonpart.q.out @@ -47,8 +47,6 @@ PREHOOK: query: describe extended exim_department PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended exim_department POSTHOOK: type: DESCTABLE -# col_name data_type comment - dep_id int department id #### A masked pattern was here #### 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 90ae3f5..c5f08f2 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,8 +43,6 @@ PREHOOK: query: describe extended exim_employee PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended exim_employee POSTHOOK: type: DESCTABLE -# col_name data_type comment - emp_id int employee id emp_country string two char iso code emp_state string free text diff --git ql/src/test/results/clientpositive/exim_02_part.q.out ql/src/test/results/clientpositive/exim_02_part.q.out index 538a8cb..6efd684 100644 --- ql/src/test/results/clientpositive/exim_02_part.q.out +++ ql/src/test/results/clientpositive/exim_02_part.q.out @@ -55,8 +55,6 @@ PREHOOK: query: describe extended exim_employee PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended exim_employee POSTHOOK: type: DESCTABLE -# col_name data_type comment - emp_id int employee id emp_country string two char iso code emp_state string free text 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 d47b132..656a690 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,8 +57,6 @@ PREHOOK: query: describe extended exim_department PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended exim_department POSTHOOK: type: DESCTABLE -# col_name data_type comment - dep_id int department identifier #### A masked pattern was here #### 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 171b5f5..f776333 100644 --- ql/src/test/results/clientpositive/exim_04_all_part.q.out +++ ql/src/test/results/clientpositive/exim_04_all_part.q.out @@ -91,8 +91,6 @@ PREHOOK: query: describe extended exim_employee PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended exim_employee POSTHOOK: type: DESCTABLE -# col_name data_type comment - emp_id int employee id emp_country string two char iso code emp_state string free text 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 eff0d91..1977ae1 100644 --- ql/src/test/results/clientpositive/exim_04_evolved_parts.q.out +++ ql/src/test/results/clientpositive/exim_04_evolved_parts.q.out @@ -101,8 +101,6 @@ PREHOOK: query: describe extended exim_employee PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended exim_employee POSTHOOK: type: DESCTABLE -# col_name data_type comment - emp_id int from deserializer emp_name string from deserializer emp_dob string from deserializer @@ -122,8 +120,6 @@ PREHOOK: query: describe extended exim_employee partition (emp_country='in', emp PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended exim_employee partition (emp_country='in', emp_state='tn') POSTHOOK: type: DESCTABLE -# col_name data_type comment - emp_id int employee id emp_name string None emp_dob string employee date of birth @@ -143,8 +139,6 @@ PREHOOK: query: describe extended exim_employee partition (emp_country='in', emp PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended exim_employee partition (emp_country='in', emp_state='ka') POSTHOOK: type: DESCTABLE -# col_name data_type comment - emp_id int from deserializer emp_name string from deserializer emp_dob string from deserializer 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 7548170..b7661bc 100644 --- ql/src/test/results/clientpositive/exim_05_some_part.q.out +++ ql/src/test/results/clientpositive/exim_05_some_part.q.out @@ -85,8 +85,6 @@ PREHOOK: query: describe extended exim_employee PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended exim_employee POSTHOOK: type: DESCTABLE -# col_name data_type comment - emp_id int employee id emp_country string two char iso code emp_state string free text 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 305963a..1ba7dde 100644 --- ql/src/test/results/clientpositive/exim_06_one_part.q.out +++ ql/src/test/results/clientpositive/exim_06_one_part.q.out @@ -82,8 +82,6 @@ PREHOOK: query: describe extended exim_employee PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended exim_employee POSTHOOK: type: DESCTABLE -# col_name data_type comment - emp_id int employee id emp_country string two char iso code emp_state string free text 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 514363d..e677702 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,8 +114,6 @@ PREHOOK: query: describe extended exim_employee PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended exim_employee POSTHOOK: type: DESCTABLE -# col_name data_type comment - emp_id int employee id emp_country string iso code emp_state string free-form text 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 1e1d677..1506edd 100644 --- ql/src/test/results/clientpositive/exim_08_nonpart_rename.q.out +++ ql/src/test/results/clientpositive/exim_08_nonpart_rename.q.out @@ -65,8 +65,6 @@ PREHOOK: query: describe extended exim_imported_dept PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended exim_imported_dept POSTHOOK: type: DESCTABLE -# col_name data_type comment - dep_id int department id #### A masked pattern was here #### 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 1460e3e..b4ea0e3 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,8 +120,6 @@ PREHOOK: query: describe extended exim_employee PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended exim_employee POSTHOOK: type: DESCTABLE -# col_name data_type comment - emp_id int employee id emp_country string two char iso code emp_state string free text 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 4b82efd..5f755a5 100644 --- ql/src/test/results/clientpositive/exim_10_external_managed.q.out +++ ql/src/test/results/clientpositive/exim_10_external_managed.q.out @@ -51,8 +51,6 @@ PREHOOK: query: describe extended exim_department PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended exim_department POSTHOOK: type: DESCTABLE -# col_name data_type comment - dep_id int department id #### A masked pattern was here #### 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 7c73c96..c2baa82 100644 --- ql/src/test/results/clientpositive/exim_11_managed_external.q.out +++ ql/src/test/results/clientpositive/exim_11_managed_external.q.out @@ -47,8 +47,6 @@ PREHOOK: query: describe extended exim_department PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended exim_department POSTHOOK: type: DESCTABLE -# col_name data_type comment - dep_id int department id #### A masked pattern was here #### 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 2bd523d..1668448 100644 --- ql/src/test/results/clientpositive/exim_12_external_location.q.out +++ ql/src/test/results/clientpositive/exim_12_external_location.q.out @@ -50,8 +50,6 @@ PREHOOK: query: describe extended exim_department PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended exim_department POSTHOOK: type: DESCTABLE -# col_name data_type comment - dep_id int department id #### A masked pattern was here #### 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 99f160f..2f6bcfe 100644 --- ql/src/test/results/clientpositive/exim_13_managed_location.q.out +++ ql/src/test/results/clientpositive/exim_13_managed_location.q.out @@ -50,8 +50,6 @@ PREHOOK: query: describe extended exim_department PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended exim_department POSTHOOK: type: DESCTABLE -# col_name data_type comment - dep_id int department id #### A masked pattern was here #### 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 5b22dfa..c185325 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,8 +62,6 @@ PREHOOK: query: describe extended exim_department PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended exim_department POSTHOOK: type: DESCTABLE -# col_name data_type comment - dep_id int department id #### A masked pattern was here #### 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 144c2e6..a895bb9 100644 --- ql/src/test/results/clientpositive/exim_15_external_part.q.out +++ ql/src/test/results/clientpositive/exim_15_external_part.q.out @@ -125,8 +125,6 @@ PREHOOK: query: describe extended exim_employee PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended exim_employee POSTHOOK: type: DESCTABLE -# col_name data_type comment - emp_id int employee id emp_country string two char iso code emp_state string free text 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 b108949..ffcc606 100644 --- ql/src/test/results/clientpositive/exim_18_part_external.q.out +++ ql/src/test/results/clientpositive/exim_18_part_external.q.out @@ -90,8 +90,6 @@ PREHOOK: query: describe extended exim_employee PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended exim_employee POSTHOOK: type: DESCTABLE -# col_name data_type comment - emp_id int employee id emp_country string two char iso code emp_state string free text 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 82735ae..49033c4 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,8 +72,6 @@ PREHOOK: query: describe extended exim_employee PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended exim_employee POSTHOOK: type: DESCTABLE -# col_name data_type comment - emp_id int employee id emp_country string two char iso code emp_state string free text 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 e0062e5..d78aa0d 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,8 +93,6 @@ PREHOOK: query: describe extended exim_employee PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended exim_employee POSTHOOK: type: DESCTABLE -# col_name data_type comment - emp_id int employee id emp_country string two char iso code emp_state string free text 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 096be60..846f9dc 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,8 +93,6 @@ PREHOOK: query: describe extended exim_employee PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended exim_employee POSTHOOK: type: DESCTABLE -# col_name data_type comment - emp_id int employee id emp_country string two char iso code emp_state string free text diff --git ql/src/test/results/clientpositive/fileformat_sequencefile.q.out ql/src/test/results/clientpositive/fileformat_sequencefile.q.out index cc86db4..382e55e 100644 --- ql/src/test/results/clientpositive/fileformat_sequencefile.q.out +++ ql/src/test/results/clientpositive/fileformat_sequencefile.q.out @@ -40,8 +40,6 @@ PREHOOK: query: DESCRIBE EXTENDED dest1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED dest1 POSTHOOK: type: DESCTABLE -# col_name data_type comment - key int None value string None diff --git ql/src/test/results/clientpositive/fileformat_text.q.out ql/src/test/results/clientpositive/fileformat_text.q.out index 0cafd62..9805b01 100644 --- ql/src/test/results/clientpositive/fileformat_text.q.out +++ ql/src/test/results/clientpositive/fileformat_text.q.out @@ -40,8 +40,6 @@ PREHOOK: query: DESCRIBE EXTENDED dest1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED dest1 POSTHOOK: type: DESCTABLE -# col_name data_type comment - key int None value string None diff --git ql/src/test/results/clientpositive/index_creation.q.out ql/src/test/results/clientpositive/index_creation.q.out index ad2d121..bddaa35 100644 --- ql/src/test/results/clientpositive/index_creation.q.out +++ ql/src/test/results/clientpositive/index_creation.q.out @@ -43,8 +43,6 @@ PREHOOK: query: desc extended default__src_src_index_2__ PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended default__src_src_index_2__ POSTHOOK: type: DESCTABLE -# col_name data_type comment - key string default _bucketname string _offsets array @@ -59,8 +57,6 @@ PREHOOK: query: desc extended src_idx_src_index_3 PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended src_idx_src_index_3 POSTHOOK: type: DESCTABLE -# col_name data_type comment - key string default _bucketname string _offsets array @@ -75,8 +71,6 @@ PREHOOK: query: desc extended default__src_src_index_4__ PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended default__src_src_index_4__ POSTHOOK: type: DESCTABLE -# col_name data_type comment - key string default _bucketname string _offsets array @@ -91,8 +85,6 @@ PREHOOK: query: desc extended default__src_src_index_5__ PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended default__src_src_index_5__ POSTHOOK: type: DESCTABLE -# col_name data_type comment - key string default _bucketname string _offsets array @@ -107,8 +99,6 @@ PREHOOK: query: desc extended default__src_src_index_6__ PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended default__src_src_index_6__ POSTHOOK: type: DESCTABLE -# col_name data_type comment - key string default _bucketname string _offsets array @@ -123,8 +113,6 @@ PREHOOK: query: desc extended src_idx_src_index_7 PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended src_idx_src_index_7 POSTHOOK: type: DESCTABLE -# col_name data_type comment - key string default _bucketname string _offsets array @@ -139,8 +127,6 @@ PREHOOK: query: desc extended default__src_src_index_8__ PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended default__src_src_index_8__ POSTHOOK: type: DESCTABLE -# col_name data_type comment - key string default _bucketname string _offsets array @@ -155,8 +141,6 @@ PREHOOK: query: desc extended default__src_src_index_9__ PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended default__src_src_index_9__ POSTHOOK: type: DESCTABLE -# col_name data_type comment - key string default _bucketname string _offsets array diff --git ql/src/test/results/clientpositive/inoutdriver.q.out ql/src/test/results/clientpositive/inoutdriver.q.out index d3a8f98..dbfd7d8 100644 --- ql/src/test/results/clientpositive/inoutdriver.q.out +++ ql/src/test/results/clientpositive/inoutdriver.q.out @@ -7,8 +7,6 @@ PREHOOK: query: desc extended test PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended test POSTHOOK: type: DESCTABLE -# 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 2a11967..4ccf0c3 100644 --- ql/src/test/results/clientpositive/input1.q.out +++ ql/src/test/results/clientpositive/input1.q.out @@ -31,7 +31,5 @@ PREHOOK: query: DESCRIBE TEST1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE TEST1 POSTHOOK: type: DESCTABLE -# 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 436119a..55c00cd 100644 --- ql/src/test/results/clientpositive/input10.q.out +++ ql/src/test/results/clientpositive/input10.q.out @@ -31,8 +31,6 @@ PREHOOK: query: DESCRIBE TEST10 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE TEST10 POSTHOOK: type: DESCTABLE -# col_name data_type comment - key int None value string None ds string None diff --git ql/src/test/results/clientpositive/input15.q.out ql/src/test/results/clientpositive/input15.q.out index 0564184..152e595 100644 --- ql/src/test/results/clientpositive/input15.q.out +++ ql/src/test/results/clientpositive/input15.q.out @@ -33,7 +33,5 @@ PREHOOK: query: DESCRIBE TEST15 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE TEST15 POSTHOOK: type: DESCTABLE -# 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 ac51d21..e99d405 100644 --- ql/src/test/results/clientpositive/input2.q.out +++ ql/src/test/results/clientpositive/input2.q.out @@ -7,16 +7,12 @@ PREHOOK: query: DESCRIBE TEST2a PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE TEST2a POSTHOOK: type: DESCTABLE -# 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 -# 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 @@ -28,8 +24,6 @@ PREHOOK: query: DESCRIBE TEST2b PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE TEST2b POSTHOOK: type: DESCTABLE -# col_name data_type comment - a array None b double None c map None diff --git ql/src/test/results/clientpositive/input3.q.out ql/src/test/results/clientpositive/input3.q.out index 79cf771..be091ea 100644 --- ql/src/test/results/clientpositive/input3.q.out +++ ql/src/test/results/clientpositive/input3.q.out @@ -7,8 +7,6 @@ PREHOOK: query: DESCRIBE TEST3a PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE TEST3a POSTHOOK: type: DESCTABLE -# 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 @@ -20,8 +18,6 @@ PREHOOK: query: DESCRIBE TEST3b PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE TEST3b POSTHOOK: type: DESCTABLE -# col_name data_type comment - a array None b double None c map None @@ -72,8 +68,6 @@ PREHOOK: query: DESCRIBE TEST3b PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE TEST3b POSTHOOK: type: DESCTABLE -# col_name data_type comment - a array None b double None c map None @@ -112,8 +106,6 @@ PREHOOK: query: DESCRIBE TEST3c PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE TEST3c POSTHOOK: type: DESCTABLE -# col_name data_type comment - a array None b double None c map None @@ -165,8 +157,6 @@ PREHOOK: query: DESCRIBE EXTENDED TEST3c PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED TEST3c POSTHOOK: type: DESCTABLE -# col_name data_type comment - r1 int None r2 double None diff --git ql/src/test/results/clientpositive/input_part10.q.out ql/src/test/results/clientpositive/input_part10.q.out index f972ca5..69333d7 100644 --- ql/src/test/results/clientpositive/input_part10.q.out +++ ql/src/test/results/clientpositive/input_part10.q.out @@ -107,8 +107,6 @@ 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 [] -# col_name data_type comment - a string None b string None ds string None diff --git ql/src/test/results/clientpositive/inputddl2.q.out ql/src/test/results/clientpositive/inputddl2.q.out index 200c600..c3936f1 100644 --- ql/src/test/results/clientpositive/inputddl2.q.out +++ ql/src/test/results/clientpositive/inputddl2.q.out @@ -33,8 +33,6 @@ PREHOOK: query: DESCRIBE INPUTDDL2 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE INPUTDDL2 POSTHOOK: type: DESCTABLE -# col_name data_type comment - key int None value string None ds string None diff --git ql/src/test/results/clientpositive/inputddl3.q.out ql/src/test/results/clientpositive/inputddl3.q.out index 4b47a46..ae2f500 100644 --- ql/src/test/results/clientpositive/inputddl3.q.out +++ ql/src/test/results/clientpositive/inputddl3.q.out @@ -33,7 +33,5 @@ PREHOOK: query: DESCRIBE INPUTDDL3 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE INPUTDDL3 POSTHOOK: type: DESCTABLE -# 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 3785444..550e6ab 100644 --- ql/src/test/results/clientpositive/inputddl4.q.out +++ ql/src/test/results/clientpositive/inputddl4.q.out @@ -23,8 +23,6 @@ PREHOOK: query: DESCRIBE INPUTDDL4 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE INPUTDDL4 POSTHOOK: type: DESCTABLE -# col_name data_type comment - viewtime string None userid int None page_url string None @@ -44,8 +42,6 @@ PREHOOK: query: DESCRIBE EXTENDED INPUTDDL4 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED INPUTDDL4 POSTHOOK: type: DESCTABLE -# col_name data_type comment - viewtime string None userid int None page_url string None diff --git ql/src/test/results/clientpositive/inputddl5.q.out ql/src/test/results/clientpositive/inputddl5.q.out index 99a7bfe..8093347 100644 --- ql/src/test/results/clientpositive/inputddl5.q.out +++ ql/src/test/results/clientpositive/inputddl5.q.out @@ -17,8 +17,6 @@ PREHOOK: query: DESCRIBE INPUTDDL5 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE INPUTDDL5 POSTHOOK: type: DESCTABLE -# col_name data_type comment - name string None PREHOOK: query: SELECT INPUTDDL5.name from INPUTDDL5 PREHOOK: type: QUERY diff --git ql/src/test/results/clientpositive/inputddl6.q.out ql/src/test/results/clientpositive/inputddl6.q.out index 52b8f0a..f81c985 100644 --- ql/src/test/results/clientpositive/inputddl6.q.out +++ ql/src/test/results/clientpositive/inputddl6.q.out @@ -27,8 +27,6 @@ PREHOOK: query: DESCRIBE EXTENDED INPUTDDL6 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED INPUTDDL6 POSTHOOK: type: DESCTABLE -# col_name data_type comment - key string None value string None ds string None @@ -43,8 +41,6 @@ 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 -# col_name data_type comment - key string None value string None ds string None diff --git ql/src/test/results/clientpositive/inputddl7.q.out ql/src/test/results/clientpositive/inputddl7.q.out index d8e3215..2afb7df 100644 --- ql/src/test/results/clientpositive/inputddl7.q.out +++ ql/src/test/results/clientpositive/inputddl7.q.out @@ -96,8 +96,6 @@ PREHOOK: query: DESCRIBE EXTENDED T1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED T1 POSTHOOK: type: DESCTABLE -# col_name data_type comment - name string None #### A masked pattern was here #### @@ -105,8 +103,6 @@ PREHOOK: query: DESCRIBE EXTENDED T2 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED T2 POSTHOOK: type: DESCTABLE -# col_name data_type comment - name string None #### A masked pattern was here #### @@ -114,8 +110,6 @@ 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 -# col_name data_type comment - name string None ds string None @@ -129,8 +123,6 @@ 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 -# col_name data_type comment - name string None ds string None diff --git ql/src/test/results/clientpositive/inputddl8.q.out ql/src/test/results/clientpositive/inputddl8.q.out index 9fc52de..78d41a1 100644 --- ql/src/test/results/clientpositive/inputddl8.q.out +++ ql/src/test/results/clientpositive/inputddl8.q.out @@ -19,8 +19,6 @@ PREHOOK: query: DESCRIBE EXTENDED INPUTDDL8 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED INPUTDDL8 POSTHOOK: type: DESCTABLE -# col_name data_type comment - aint int from deserializer astring string from deserializer lint array from deserializer diff --git ql/src/test/results/clientpositive/join_thrift.q.out ql/src/test/results/clientpositive/join_thrift.q.out index d3545e7..dc60935 100644 --- ql/src/test/results/clientpositive/join_thrift.q.out +++ ql/src/test/results/clientpositive/join_thrift.q.out @@ -2,8 +2,6 @@ PREHOOK: query: DESCRIBE src_thrift PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE src_thrift POSTHOOK: type: DESCTABLE -# col_name data_type comment - aint int from deserializer astring string from deserializer lint array from deserializer diff --git ql/src/test/results/clientpositive/load_dyn_part1.q.out ql/src/test/results/clientpositive/load_dyn_part1.q.out index 1a4cebe..90c2a3e 100644 --- ql/src/test/results/clientpositive/load_dyn_part1.q.out +++ ql/src/test/results/clientpositive/load_dyn_part1.q.out @@ -20,8 +20,6 @@ PREHOOK: query: describe extended nzhang_part1 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended nzhang_part1 POSTHOOK: type: DESCTABLE -# col_name data_type comment - key string default value string default ds string None diff --git ql/src/test/results/clientpositive/load_dyn_part10.q.out ql/src/test/results/clientpositive/load_dyn_part10.q.out index 799ffeb..a4d64e1 100644 --- ql/src/test/results/clientpositive/load_dyn_part10.q.out +++ ql/src/test/results/clientpositive/load_dyn_part10.q.out @@ -15,8 +15,6 @@ PREHOOK: query: describe extended nzhang_part10 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended nzhang_part10 POSTHOOK: type: DESCTABLE -# col_name data_type comment - key string default value string default ds string None diff --git ql/src/test/results/clientpositive/load_dyn_part11.q.out ql/src/test/results/clientpositive/load_dyn_part11.q.out index a2aa4e4..883ee61 100644 --- ql/src/test/results/clientpositive/load_dyn_part11.q.out +++ ql/src/test/results/clientpositive/load_dyn_part11.q.out @@ -15,8 +15,6 @@ PREHOOK: query: describe extended nzhang_part PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended nzhang_part POSTHOOK: type: DESCTABLE -# col_name data_type comment - key string default value string default ds string None diff --git ql/src/test/results/clientpositive/load_dyn_part12.q.out ql/src/test/results/clientpositive/load_dyn_part12.q.out index 4811214..04a2b0b 100644 --- ql/src/test/results/clientpositive/load_dyn_part12.q.out +++ ql/src/test/results/clientpositive/load_dyn_part12.q.out @@ -15,8 +15,6 @@ PREHOOK: query: describe extended nzhang_part12 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended nzhang_part12 POSTHOOK: type: DESCTABLE -# col_name data_type comment - key string default value string default ds string None diff --git ql/src/test/results/clientpositive/load_dyn_part13.q.out ql/src/test/results/clientpositive/load_dyn_part13.q.out index bf51e89..9422774 100644 --- ql/src/test/results/clientpositive/load_dyn_part13.q.out +++ ql/src/test/results/clientpositive/load_dyn_part13.q.out @@ -15,8 +15,6 @@ PREHOOK: query: describe extended nzhang_part13 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended nzhang_part13 POSTHOOK: type: DESCTABLE -# col_name data_type comment - key string default value string default ds string None diff --git ql/src/test/results/clientpositive/load_dyn_part14.q.out ql/src/test/results/clientpositive/load_dyn_part14.q.out index 23d8010..43b09f0 100644 --- ql/src/test/results/clientpositive/load_dyn_part14.q.out +++ ql/src/test/results/clientpositive/load_dyn_part14.q.out @@ -15,8 +15,6 @@ PREHOOK: query: describe extended nzhang_part14 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended nzhang_part14 POSTHOOK: type: DESCTABLE -# col_name data_type comment - key string None value string None diff --git ql/src/test/results/clientpositive/load_dyn_part2.q.out ql/src/test/results/clientpositive/load_dyn_part2.q.out index d6a8905..9da05a3 100644 --- ql/src/test/results/clientpositive/load_dyn_part2.q.out +++ ql/src/test/results/clientpositive/load_dyn_part2.q.out @@ -11,8 +11,6 @@ PREHOOK: query: describe extended nzhang_part_bucket PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended nzhang_part_bucket POSTHOOK: type: DESCTABLE -# col_name data_type comment - key string None value string None ds string None diff --git ql/src/test/results/clientpositive/load_dyn_part3.q.out ql/src/test/results/clientpositive/load_dyn_part3.q.out index ac34b90..ae93de2 100644 --- ql/src/test/results/clientpositive/load_dyn_part3.q.out +++ ql/src/test/results/clientpositive/load_dyn_part3.q.out @@ -15,8 +15,6 @@ PREHOOK: query: describe extended nzhang_part3 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended nzhang_part3 POSTHOOK: type: DESCTABLE -# col_name data_type comment - key string default value string default ds string None diff --git ql/src/test/results/clientpositive/load_dyn_part4.q.out ql/src/test/results/clientpositive/load_dyn_part4.q.out index cd571b0..107ed8e 100644 --- ql/src/test/results/clientpositive/load_dyn_part4.q.out +++ ql/src/test/results/clientpositive/load_dyn_part4.q.out @@ -15,8 +15,6 @@ PREHOOK: query: describe extended nzhang_part4 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended nzhang_part4 POSTHOOK: type: DESCTABLE -# col_name data_type comment - key string default value string default ds string None diff --git ql/src/test/results/clientpositive/load_dyn_part5.q.out ql/src/test/results/clientpositive/load_dyn_part5.q.out index 7b3bc94..7341e46 100644 --- ql/src/test/results/clientpositive/load_dyn_part5.q.out +++ ql/src/test/results/clientpositive/load_dyn_part5.q.out @@ -7,8 +7,6 @@ PREHOOK: query: describe extended nzhang_part5 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended nzhang_part5 POSTHOOK: type: DESCTABLE -# col_name data_type comment - key string None value string None diff --git ql/src/test/results/clientpositive/load_dyn_part6.q.out ql/src/test/results/clientpositive/load_dyn_part6.q.out index 876c2e1..e23b366 100644 --- ql/src/test/results/clientpositive/load_dyn_part6.q.out +++ ql/src/test/results/clientpositive/load_dyn_part6.q.out @@ -15,8 +15,6 @@ PREHOOK: query: describe extended nzhang_part6 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended nzhang_part6 POSTHOOK: type: DESCTABLE -# col_name data_type comment - key string default value string default ds string None diff --git ql/src/test/results/clientpositive/load_dyn_part7.q.out ql/src/test/results/clientpositive/load_dyn_part7.q.out index f615dc2..5c274c5 100644 --- ql/src/test/results/clientpositive/load_dyn_part7.q.out +++ ql/src/test/results/clientpositive/load_dyn_part7.q.out @@ -15,8 +15,6 @@ PREHOOK: query: describe extended nzhang_part7 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended nzhang_part7 POSTHOOK: type: DESCTABLE -# col_name data_type comment - key string default value string default ds string None diff --git ql/src/test/results/clientpositive/load_dyn_part8.q.out ql/src/test/results/clientpositive/load_dyn_part8.q.out index 1e71e59..8b1e627 100644 --- ql/src/test/results/clientpositive/load_dyn_part8.q.out +++ ql/src/test/results/clientpositive/load_dyn_part8.q.out @@ -15,8 +15,6 @@ PREHOOK: query: describe extended nzhang_part8 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended nzhang_part8 POSTHOOK: type: DESCTABLE -# col_name data_type comment - key string default value string default ds string None diff --git ql/src/test/results/clientpositive/load_dyn_part9.q.out ql/src/test/results/clientpositive/load_dyn_part9.q.out index 9c24bc2..af013be 100644 --- ql/src/test/results/clientpositive/load_dyn_part9.q.out +++ ql/src/test/results/clientpositive/load_dyn_part9.q.out @@ -15,8 +15,6 @@ PREHOOK: query: describe extended nzhang_part9 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended nzhang_part9 POSTHOOK: type: DESCTABLE -# col_name data_type comment - key string default value string default ds string None diff --git ql/src/test/results/clientpositive/load_fs.q.out ql/src/test/results/clientpositive/load_fs.q.out index 7d85e4b..bcacdf3 100644 --- ql/src/test/results/clientpositive/load_fs.q.out +++ ql/src/test/results/clientpositive/load_fs.q.out @@ -47,8 +47,6 @@ PREHOOK: query: desc extended load_overwrite PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended load_overwrite POSTHOOK: type: DESCTABLE -# col_name data_type comment - key string None value string None @@ -89,8 +87,6 @@ PREHOOK: query: desc extended load_overwrite2 PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended load_overwrite2 POSTHOOK: type: DESCTABLE -# col_name data_type comment - key string None value string None diff --git ql/src/test/results/clientpositive/multi_sahooks.q.out ql/src/test/results/clientpositive/multi_sahooks.q.out index 3e2cd39..6dc8e2b 100644 --- ql/src/test/results/clientpositive/multi_sahooks.q.out +++ ql/src/test/results/clientpositive/multi_sahooks.q.out @@ -13,8 +13,6 @@ PREHOOK: query: desc extended tbl_sahook PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl_sahook POSTHOOK: type: DESCTABLE -# col_name data_type comment - c string None #### A masked pattern was here #### @@ -41,8 +39,6 @@ PREHOOK: query: desc extended tbl_sahooks PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl_sahooks POSTHOOK: type: DESCTABLE -# col_name data_type comment - c string None #### A masked pattern was here #### @@ -69,8 +65,6 @@ PREHOOK: query: desc extended tbl_sahooks PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl_sahooks POSTHOOK: type: DESCTABLE -# col_name data_type comment - c string None #### A masked pattern was here #### @@ -99,8 +93,6 @@ PREHOOK: query: desc extended tbl_sahooks PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl_sahooks POSTHOOK: type: DESCTABLE -# col_name data_type comment - c string None #### A masked pattern was here #### diff --git ql/src/test/results/clientpositive/partition_schema1.q.out ql/src/test/results/clientpositive/partition_schema1.q.out index 03f366b..6d9b7ca 100644 --- ql/src/test/results/clientpositive/partition_schema1.q.out +++ ql/src/test/results/clientpositive/partition_schema1.q.out @@ -19,8 +19,6 @@ 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), ] -# col_name data_type comment - key string None value string None dt string None @@ -45,8 +43,6 @@ 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), ] -# col_name data_type comment - key string None value string None x string None @@ -62,8 +58,6 @@ 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), ] -# col_name data_type comment - key string None value string None dt string None diff --git ql/src/test/results/clientpositive/protectmode.q.out ql/src/test/results/clientpositive/protectmode.q.out index 410049b..1db2949 100644 --- ql/src/test/results/clientpositive/protectmode.q.out +++ ql/src/test/results/clientpositive/protectmode.q.out @@ -43,8 +43,6 @@ PREHOOK: query: desc extended tbl1 PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl1 POSTHOOK: type: DESCTABLE -# col_name data_type comment - col string None #### A masked pattern was here #### @@ -60,8 +58,6 @@ PREHOOK: query: desc extended tbl1 PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl1 POSTHOOK: type: DESCTABLE -# col_name data_type comment - col string None #### A masked pattern was here #### @@ -146,8 +142,6 @@ PREHOOK: query: desc extended tbl2 partition (p='p1') PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl2 partition (p='p1') POSTHOOK: type: DESCTABLE -# col_name data_type comment - col string None p string None @@ -169,8 +163,6 @@ PREHOOK: query: desc extended tbl2 PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl2 POSTHOOK: type: DESCTABLE -# col_name data_type comment - col string None p string None @@ -192,8 +184,6 @@ PREHOOK: query: desc extended tbl2 PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl2 POSTHOOK: type: DESCTABLE -# col_name data_type comment - col string None p string None @@ -223,8 +213,6 @@ PREHOOK: query: desc extended tbl2 PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl2 POSTHOOK: type: DESCTABLE -# col_name data_type comment - col string None p string None @@ -246,8 +234,6 @@ PREHOOK: query: desc extended tbl2 PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl2 POSTHOOK: type: DESCTABLE -# col_name data_type comment - col string None p string None @@ -290,8 +276,6 @@ PREHOOK: query: desc extended tbl2 partition (p='p1') PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl2 partition (p='p1') POSTHOOK: type: DESCTABLE -# col_name data_type comment - col string None p string None diff --git ql/src/test/results/clientpositive/protectmode2.q.out ql/src/test/results/clientpositive/protectmode2.q.out index 5b0b6db..a0d2472 100644 --- ql/src/test/results/clientpositive/protectmode2.q.out +++ ql/src/test/results/clientpositive/protectmode2.q.out @@ -19,8 +19,6 @@ PREHOOK: query: desc extended tbl1 PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl1 POSTHOOK: type: DESCTABLE -# col_name data_type comment - col string None #### A masked pattern was here #### @@ -36,8 +34,6 @@ PREHOOK: query: desc extended tbl1 PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl1 POSTHOOK: type: DESCTABLE -# col_name data_type comment - col string None #### A masked pattern was here #### @@ -53,8 +49,6 @@ PREHOOK: query: desc extended tbl1 PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl1 POSTHOOK: type: DESCTABLE -# col_name data_type comment - col string None #### A masked pattern was here #### diff --git ql/src/test/results/clientpositive/rcfile_bigdata.q.out ql/src/test/results/clientpositive/rcfile_bigdata.q.out index 08a62a0..13d8d5a 100644 --- ql/src/test/results/clientpositive/rcfile_bigdata.q.out +++ ql/src/test/results/clientpositive/rcfile_bigdata.q.out @@ -31,8 +31,6 @@ 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), ] -# col_name data_type comment - key string None value string None PREHOOK: query: select count(columnTable_Bigdata.key) from columnTable_Bigdata diff --git ql/src/test/results/clientpositive/rcfile_columnar.q.out ql/src/test/results/clientpositive/rcfile_columnar.q.out index 7e67bb8..9c51b22 100644 --- ql/src/test/results/clientpositive/rcfile_columnar.q.out +++ ql/src/test/results/clientpositive/rcfile_columnar.q.out @@ -31,8 +31,6 @@ 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), ] -# col_name data_type comment - key string None value string None PREHOOK: query: SELECT columnTable.* FROM columnTable ORDER BY key ASC, value ASC diff --git ql/src/test/results/clientpositive/rcfile_default_format.q.out ql/src/test/results/clientpositive/rcfile_default_format.q.out index 78f06e8..8c73955 100644 --- ql/src/test/results/clientpositive/rcfile_default_format.q.out +++ ql/src/test/results/clientpositive/rcfile_default_format.q.out @@ -7,8 +7,6 @@ PREHOOK: query: DESCRIBE EXTENDED rcfile_default_format PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED rcfile_default_format POSTHOOK: type: DESCTABLE -# col_name data_type comment - key string None #### A masked pattern was here #### @@ -23,8 +21,6 @@ PREHOOK: query: DESCRIBE EXTENDED rcfile_default_format_ctas PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED rcfile_default_format_ctas POSTHOOK: type: DESCTABLE -# col_name data_type comment - key string None value string None @@ -48,8 +44,6 @@ 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), ] -# col_name data_type comment - key string None #### A masked pattern was here #### @@ -66,8 +60,6 @@ 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), ] -# col_name data_type comment - key string None value string None diff --git ql/src/test/results/clientpositive/rename_column.q.out ql/src/test/results/clientpositive/rename_column.q.out index f77ba41..34b70eb 100644 --- ql/src/test/results/clientpositive/rename_column.q.out +++ ql/src/test/results/clientpositive/rename_column.q.out @@ -7,8 +7,6 @@ PREHOOK: query: DESCRIBE kv_rename_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE kv_rename_test POSTHOOK: type: DESCTABLE -# col_name data_type comment - a int None b int None c int None @@ -24,8 +22,6 @@ PREHOOK: query: DESCRIBE kv_rename_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE kv_rename_test POSTHOOK: type: DESCTABLE -# col_name data_type comment - a string None b int None c int None @@ -41,8 +37,6 @@ PREHOOK: query: DESCRIBE kv_rename_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE kv_rename_test POSTHOOK: type: DESCTABLE -# col_name data_type comment - a1 int None b int None c int None @@ -58,8 +52,6 @@ PREHOOK: query: DESCRIBE kv_rename_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE kv_rename_test POSTHOOK: type: DESCTABLE -# col_name data_type comment - a2 int None b int None c int None @@ -75,8 +67,6 @@ PREHOOK: query: DESCRIBE kv_rename_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE kv_rename_test POSTHOOK: type: DESCTABLE -# col_name data_type comment - b int None a int None c int None @@ -92,8 +82,6 @@ PREHOOK: query: DESCRIBE kv_rename_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE kv_rename_test POSTHOOK: type: DESCTABLE -# col_name data_type comment - b int None a1 int test comment1 c int None @@ -109,8 +97,6 @@ PREHOOK: query: DESCRIBE kv_rename_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE kv_rename_test POSTHOOK: type: DESCTABLE -# col_name data_type comment - a2 int test comment2 b int None c int None @@ -126,8 +112,6 @@ PREHOOK: query: DESCRIBE kv_rename_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE kv_rename_test POSTHOOK: type: DESCTABLE -# col_name data_type comment - b int None a int test comment2 c int None @@ -170,8 +154,6 @@ PREHOOK: query: DESCRIBE kv_rename_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE kv_rename_test POSTHOOK: type: DESCTABLE -# col_name data_type comment - a int None b int None c int None @@ -187,8 +169,6 @@ PREHOOK: query: DESCRIBE kv_rename_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE kv_rename_test POSTHOOK: type: DESCTABLE -# col_name data_type comment - a string None b int None c int None @@ -204,8 +184,6 @@ PREHOOK: query: DESCRIBE kv_rename_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE kv_rename_test POSTHOOK: type: DESCTABLE -# col_name data_type comment - a1 int None b int None c int None @@ -221,8 +199,6 @@ PREHOOK: query: DESCRIBE kv_rename_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE kv_rename_test POSTHOOK: type: DESCTABLE -# col_name data_type comment - a2 int None b int None c int None @@ -238,8 +214,6 @@ PREHOOK: query: DESCRIBE kv_rename_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE kv_rename_test POSTHOOK: type: DESCTABLE -# col_name data_type comment - b int None a int None c int None @@ -255,8 +229,6 @@ PREHOOK: query: DESCRIBE kv_rename_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE kv_rename_test POSTHOOK: type: DESCTABLE -# col_name data_type comment - b int None a1 int test comment1 c int None @@ -272,8 +244,6 @@ PREHOOK: query: DESCRIBE kv_rename_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE kv_rename_test POSTHOOK: type: DESCTABLE -# col_name data_type comment - a2 int test comment2 b int None c int None @@ -289,8 +259,6 @@ PREHOOK: query: DESCRIBE kv_rename_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE kv_rename_test POSTHOOK: type: DESCTABLE -# col_name data_type comment - b int None a int test comment2 c int None diff --git ql/src/test/results/clientpositive/serde_reported_schema.q.out ql/src/test/results/clientpositive/serde_reported_schema.q.out index 5dd81b4..8588f62 100644 --- ql/src/test/results/clientpositive/serde_reported_schema.q.out +++ ql/src/test/results/clientpositive/serde_reported_schema.q.out @@ -17,8 +17,6 @@ PREHOOK: query: describe int_string PREHOOK: type: DESCTABLE POSTHOOK: query: describe int_string POSTHOOK: type: DESCTABLE -# col_name data_type comment - myint int from deserializer mystring string from deserializer underscore_int int from deserializer @@ -39,8 +37,6 @@ PREHOOK: query: describe int_string partition (b='part1') PREHOOK: type: DESCTABLE POSTHOOK: query: describe int_string partition (b='part1') POSTHOOK: type: DESCTABLE -# col_name data_type comment - myint int from deserializer mystring string from deserializer underscore_int int from deserializer diff --git ql/src/test/results/clientpositive/show_columns.q.out ql/src/test/results/clientpositive/show_columns.q.out index 10bd3ce..e9753be 100644 --- ql/src/test/results/clientpositive/show_columns.q.out +++ ql/src/test/results/clientpositive/show_columns.q.out @@ -32,8 +32,6 @@ PREHOOK: Input: default@shcol_test POSTHOOK: query: SHOW COLUMNS from shcol_test POSTHOOK: type: SHOWCOLUMNS POSTHOOK: Input: default@shcol_test -# col_name - key value ds @@ -64,8 +62,6 @@ PREHOOK: Input: test_db@foo POSTHOOK: query: SHOW COLUMNS from foo POSTHOOK: type: SHOWCOLUMNS POSTHOOK: Input: test_db@foo -# col_name - a PREHOOK: query: SHOW COLUMNS in foo PREHOOK: type: SHOWCOLUMNS @@ -73,8 +69,6 @@ PREHOOK: Input: test_db@foo POSTHOOK: query: SHOW COLUMNS in foo POSTHOOK: type: SHOWCOLUMNS POSTHOOK: Input: test_db@foo -# col_name - a PREHOOK: query: -- SHOW COLUMNS from a database with a name that requires escaping CREATE DATABASE `database` @@ -97,8 +91,6 @@ PREHOOK: Input: database@foo POSTHOOK: query: SHOW COLUMNS from foo POSTHOOK: type: SHOWCOLUMNS POSTHOOK: Input: database@foo -# col_name - a PREHOOK: query: use default PREHOOK: type: SWITCHDATABASE @@ -110,8 +102,6 @@ PREHOOK: Input: test_db@foo POSTHOOK: query: SHOW COLUMNS from test_db.foo POSTHOOK: type: SHOWCOLUMNS POSTHOOK: Input: test_db@foo -# col_name - a PREHOOK: query: SHOW COLUMNS from foo from test_db PREHOOK: type: SHOWCOLUMNS @@ -119,6 +109,4 @@ PREHOOK: Input: test_db@foo POSTHOOK: query: SHOW COLUMNS from foo from test_db POSTHOOK: type: SHOWCOLUMNS POSTHOOK: Input: test_db@foo -# col_name - a diff --git ql/src/test/results/clientpositive/stats0.q.out ql/src/test/results/clientpositive/stats0.q.out index 77c5087..1ac7f18 100644 --- ql/src/test/results/clientpositive/stats0.q.out +++ ql/src/test/results/clientpositive/stats0.q.out @@ -152,8 +152,6 @@ 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), ] -# col_name data_type comment - key string None value string None @@ -1277,8 +1275,6 @@ 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), ] -# col_name data_type comment - key string None value string None ds string None @@ -1297,8 +1293,6 @@ 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), ] -# col_name data_type comment - key string None value string None ds string None @@ -1655,8 +1649,6 @@ 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), ] -# col_name data_type comment - key string None value string None @@ -2854,8 +2846,6 @@ 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), ] -# col_name data_type comment - key string None value string None ds string None @@ -2878,8 +2868,6 @@ 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), ] -# col_name data_type comment - key string None value string None ds string None diff --git ql/src/test/results/clientpositive/tablename_with_select.q.out ql/src/test/results/clientpositive/tablename_with_select.q.out index 3a34ba1..89b37a9 100644 --- ql/src/test/results/clientpositive/tablename_with_select.q.out +++ ql/src/test/results/clientpositive/tablename_with_select.q.out @@ -7,8 +7,6 @@ PREHOOK: query: DESCRIBE tmp_select PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE tmp_select POSTHOOK: type: DESCTABLE -# col_name data_type comment - a int None b string None PREHOOK: query: INSERT OVERWRITE TABLE tmp_select SELECT key, value FROM src diff --git ql/src/test/results/clientpositive/updateAccessTime.q.out ql/src/test/results/clientpositive/updateAccessTime.q.out index c1570c4..c800703 100644 --- ql/src/test/results/clientpositive/updateAccessTime.q.out +++ ql/src/test/results/clientpositive/updateAccessTime.q.out @@ -13,8 +13,6 @@ PREHOOK: query: desc extended tstsrc PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tstsrc POSTHOOK: type: DESCTABLE -# col_name data_type comment - key string None value string None @@ -32,8 +30,6 @@ PREHOOK: query: desc extended tstsrc PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tstsrc POSTHOOK: type: DESCTABLE -# col_name data_type comment - key string None value string None @@ -94,8 +90,6 @@ 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), ] -# col_name data_type comment - key string default value string default ds string None @@ -120,8 +114,6 @@ 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), ] -# col_name data_type comment - key string default value string default ds string None @@ -146,8 +138,6 @@ 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), ] -# col_name data_type comment - key string default value string default ds string None @@ -191,8 +181,6 @@ 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), ] -# col_name data_type comment - key string default value string default ds string None @@ -217,8 +205,6 @@ 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), ] -# col_name data_type comment - key string default value string default ds string None @@ -243,8 +229,6 @@ 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), ] -# col_name data_type comment - key string default value string default ds string None