hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From na...@apache.org
Subject svn commit: r1418405 [1/4] - in /hive/trunk: contrib/src/test/results/clientpositive/ hbase-handler/src/test/results/positive/ hwi/src/test/org/apache/hadoop/hive/hwi/ jdbc/src/test/org/apache/hadoop/hive/jdbc/ ql/src/java/org/apache/hadoop/hive/ql/exe...
Date Fri, 07 Dec 2012 17:23:00 GMT
Author: namit
Date: Fri Dec  7 17:22:32 2012
New Revision: 1418405

URL: http://svn.apache.org/viewvc?rev=1418405&view=rev
Log:
HIVE-3140 Comment indenting is broken for "describe" in CLI
(Zhenxiao Luo via namit)


Added:
    hive/trunk/ql/src/test/queries/clientpositive/describe_comment_indent.q
    hive/trunk/ql/src/test/results/clientpositive/describe_comment_indent.q.out
Modified:
    hive/trunk/contrib/src/test/results/clientpositive/fileformat_base64.q.out
    hive/trunk/contrib/src/test/results/clientpositive/serde_s3.q.out
    hive/trunk/hbase-handler/src/test/results/positive/hbase_queries.q.out
    hive/trunk/hwi/src/test/org/apache/hadoop/hive/hwi/TestHWISessionManager.java
    hive/trunk/jdbc/src/test/org/apache/hadoop/hive/jdbc/TestJdbcDriver.java
    hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java
    hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/MetaDataFormatUtils.java
    hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/TextMetaDataFormatter.java
    hive/trunk/ql/src/test/results/clientnegative/desc_failure2.q.out
    hive/trunk/ql/src/test/results/clientnegative/drop_partition_filter_failure2.q.out
    hive/trunk/ql/src/test/results/clientnegative/protectmode_part_no_drop.q.out
    hive/trunk/ql/src/test/results/clientnegative/protectmode_tbl2.q.out
    hive/trunk/ql/src/test/results/clientnegative/protectmode_tbl3.q.out
    hive/trunk/ql/src/test/results/clientnegative/protectmode_tbl4.q.out
    hive/trunk/ql/src/test/results/clientnegative/protectmode_tbl5.q.out
    hive/trunk/ql/src/test/results/clientnegative/protectmode_tbl_no_drop.q.out
    hive/trunk/ql/src/test/results/clientnegative/set_hiveconf_validation0.q.out
    hive/trunk/ql/src/test/results/clientnegative/set_hiveconf_validation1.q.out
    hive/trunk/ql/src/test/results/clientpositive/alter1.q.out
    hive/trunk/ql/src/test/results/clientpositive/alter2.q.out
    hive/trunk/ql/src/test/results/clientpositive/alter3.q.out
    hive/trunk/ql/src/test/results/clientpositive/alter4.q.out
    hive/trunk/ql/src/test/results/clientpositive/alter5.q.out
    hive/trunk/ql/src/test/results/clientpositive/alter_index.q.out
    hive/trunk/ql/src/test/results/clientpositive/alter_merge_2.q.out
    hive/trunk/ql/src/test/results/clientpositive/alter_merge_stats.q.out
    hive/trunk/ql/src/test/results/clientpositive/alter_partition_format_loc.q.out
    hive/trunk/ql/src/test/results/clientpositive/alter_table_serde.q.out
    hive/trunk/ql/src/test/results/clientpositive/alter_view_rename.q.out
    hive/trunk/ql/src/test/results/clientpositive/archive_corrupt.q.out
    hive/trunk/ql/src/test/results/clientpositive/authorization_7.q.out
    hive/trunk/ql/src/test/results/clientpositive/autogen_colalias.q.out
    hive/trunk/ql/src/test/results/clientpositive/avro_change_schema.q.out
    hive/trunk/ql/src/test/results/clientpositive/avro_evolved_schemas.q.out
    hive/trunk/ql/src/test/results/clientpositive/avro_joins.q.out
    hive/trunk/ql/src/test/results/clientpositive/avro_sanity_test.q.out
    hive/trunk/ql/src/test/results/clientpositive/avro_schema_error_message.q.out
    hive/trunk/ql/src/test/results/clientpositive/avro_schema_literal.q.out
    hive/trunk/ql/src/test/results/clientpositive/ba_table1.q.out
    hive/trunk/ql/src/test/results/clientpositive/ba_table2.q.out
    hive/trunk/ql/src/test/results/clientpositive/ba_table_union.q.out
    hive/trunk/ql/src/test/results/clientpositive/binary_table_bincolserde.q.out
    hive/trunk/ql/src/test/results/clientpositive/binary_table_colserde.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucket_groupby.q.out
    hive/trunk/ql/src/test/results/clientpositive/columnarserde_create_shortcut.q.out
    hive/trunk/ql/src/test/results/clientpositive/combine3.q.out
    hive/trunk/ql/src/test/results/clientpositive/convert_enum_to_string.q.out
    hive/trunk/ql/src/test/results/clientpositive/create_1.q.out
    hive/trunk/ql/src/test/results/clientpositive/create_default_prop.q.out
    hive/trunk/ql/src/test/results/clientpositive/create_escape.q.out
    hive/trunk/ql/src/test/results/clientpositive/create_insert_outputformat.q.out
    hive/trunk/ql/src/test/results/clientpositive/create_like_view.q.out
    hive/trunk/ql/src/test/results/clientpositive/create_nested_type.q.out
    hive/trunk/ql/src/test/results/clientpositive/create_view.q.out
    hive/trunk/ql/src/test/results/clientpositive/create_view_partitioned.q.out
    hive/trunk/ql/src/test/results/clientpositive/database.q.out
    hive/trunk/ql/src/test/results/clientpositive/ddltime.q.out
    hive/trunk/ql/src/test/results/clientpositive/describe_syntax.q.out
    hive/trunk/ql/src/test/results/clientpositive/describe_table.q.out
    hive/trunk/ql/src/test/results/clientpositive/describe_xpath.q.out
    hive/trunk/ql/src/test/results/clientpositive/drop_partitions_filter.q.out
    hive/trunk/ql/src/test/results/clientpositive/drop_partitions_filter2.q.out
    hive/trunk/ql/src/test/results/clientpositive/drop_partitions_filter3.q.out
    hive/trunk/ql/src/test/results/clientpositive/exim_00_nonpart_empty.q.out
    hive/trunk/ql/src/test/results/clientpositive/exim_01_nonpart.q.out
    hive/trunk/ql/src/test/results/clientpositive/exim_02_00_part_empty.q.out
    hive/trunk/ql/src/test/results/clientpositive/exim_02_part.q.out
    hive/trunk/ql/src/test/results/clientpositive/exim_03_nonpart_over_compat.q.out
    hive/trunk/ql/src/test/results/clientpositive/exim_04_all_part.q.out
    hive/trunk/ql/src/test/results/clientpositive/exim_04_evolved_parts.q.out
    hive/trunk/ql/src/test/results/clientpositive/exim_05_some_part.q.out
    hive/trunk/ql/src/test/results/clientpositive/exim_06_one_part.q.out
    hive/trunk/ql/src/test/results/clientpositive/exim_07_all_part_over_nonoverlap.q.out
    hive/trunk/ql/src/test/results/clientpositive/exim_08_nonpart_rename.q.out
    hive/trunk/ql/src/test/results/clientpositive/exim_09_part_spec_nonoverlap.q.out
    hive/trunk/ql/src/test/results/clientpositive/exim_10_external_managed.q.out
    hive/trunk/ql/src/test/results/clientpositive/exim_11_managed_external.q.out
    hive/trunk/ql/src/test/results/clientpositive/exim_12_external_location.q.out
    hive/trunk/ql/src/test/results/clientpositive/exim_13_managed_location.q.out
    hive/trunk/ql/src/test/results/clientpositive/exim_14_managed_location_over_existing.q.out
    hive/trunk/ql/src/test/results/clientpositive/exim_15_external_part.q.out
    hive/trunk/ql/src/test/results/clientpositive/exim_18_part_external.q.out
    hive/trunk/ql/src/test/results/clientpositive/exim_19_00_part_external_location.q.out
    hive/trunk/ql/src/test/results/clientpositive/exim_19_part_external_location.q.out
    hive/trunk/ql/src/test/results/clientpositive/exim_20_part_managed_location.q.out
    hive/trunk/ql/src/test/results/clientpositive/fileformat_sequencefile.q.out
    hive/trunk/ql/src/test/results/clientpositive/fileformat_text.q.out
    hive/trunk/ql/src/test/results/clientpositive/index_creation.q.out
    hive/trunk/ql/src/test/results/clientpositive/inoutdriver.q.out
    hive/trunk/ql/src/test/results/clientpositive/input1.q.out
    hive/trunk/ql/src/test/results/clientpositive/input10.q.out
    hive/trunk/ql/src/test/results/clientpositive/input15.q.out
    hive/trunk/ql/src/test/results/clientpositive/input2.q.out
    hive/trunk/ql/src/test/results/clientpositive/input3.q.out
    hive/trunk/ql/src/test/results/clientpositive/input_part10.q.out
    hive/trunk/ql/src/test/results/clientpositive/inputddl2.q.out
    hive/trunk/ql/src/test/results/clientpositive/inputddl3.q.out
    hive/trunk/ql/src/test/results/clientpositive/inputddl4.q.out
    hive/trunk/ql/src/test/results/clientpositive/inputddl5.q.out
    hive/trunk/ql/src/test/results/clientpositive/inputddl6.q.out
    hive/trunk/ql/src/test/results/clientpositive/inputddl7.q.out
    hive/trunk/ql/src/test/results/clientpositive/inputddl8.q.out
    hive/trunk/ql/src/test/results/clientpositive/join_thrift.q.out
    hive/trunk/ql/src/test/results/clientpositive/load_dyn_part1.q.out
    hive/trunk/ql/src/test/results/clientpositive/load_dyn_part10.q.out
    hive/trunk/ql/src/test/results/clientpositive/load_dyn_part11.q.out
    hive/trunk/ql/src/test/results/clientpositive/load_dyn_part12.q.out
    hive/trunk/ql/src/test/results/clientpositive/load_dyn_part13.q.out
    hive/trunk/ql/src/test/results/clientpositive/load_dyn_part14.q.out
    hive/trunk/ql/src/test/results/clientpositive/load_dyn_part2.q.out
    hive/trunk/ql/src/test/results/clientpositive/load_dyn_part3.q.out
    hive/trunk/ql/src/test/results/clientpositive/load_dyn_part4.q.out
    hive/trunk/ql/src/test/results/clientpositive/load_dyn_part5.q.out
    hive/trunk/ql/src/test/results/clientpositive/load_dyn_part6.q.out
    hive/trunk/ql/src/test/results/clientpositive/load_dyn_part7.q.out
    hive/trunk/ql/src/test/results/clientpositive/load_dyn_part8.q.out
    hive/trunk/ql/src/test/results/clientpositive/load_dyn_part9.q.out
    hive/trunk/ql/src/test/results/clientpositive/load_fs.q.out
    hive/trunk/ql/src/test/results/clientpositive/multi_sahooks.q.out
    hive/trunk/ql/src/test/results/clientpositive/partition_schema1.q.out
    hive/trunk/ql/src/test/results/clientpositive/protectmode.q.out
    hive/trunk/ql/src/test/results/clientpositive/protectmode2.q.out
    hive/trunk/ql/src/test/results/clientpositive/rcfile_bigdata.q.out
    hive/trunk/ql/src/test/results/clientpositive/rcfile_columnar.q.out
    hive/trunk/ql/src/test/results/clientpositive/rcfile_default_format.q.out
    hive/trunk/ql/src/test/results/clientpositive/rename_column.q.out
    hive/trunk/ql/src/test/results/clientpositive/serde_reported_schema.q.out
    hive/trunk/ql/src/test/results/clientpositive/show_columns.q.out
    hive/trunk/ql/src/test/results/clientpositive/split_sample.q.out
    hive/trunk/ql/src/test/results/clientpositive/stats0.q.out
    hive/trunk/ql/src/test/results/clientpositive/tablename_with_select.q.out
    hive/trunk/ql/src/test/results/clientpositive/updateAccessTime.q.out

Modified: hive/trunk/contrib/src/test/results/clientpositive/fileformat_base64.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/contrib/src/test/results/clientpositive/fileformat_base64.q.out?rev=1418405&r1=1418404&r2=1418405&view=diff
==============================================================================
--- hive/trunk/contrib/src/test/results/clientpositive/fileformat_base64.q.out (original)
+++ hive/trunk/contrib/src/test/results/clientpositive/fileformat_base64.q.out Fri Dec  7 17:22:32 2012
@@ -44,8 +44,10 @@ PREHOOK: query: DESCRIBE EXTENDED base64
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE EXTENDED base64_test
 POSTHOOK: type: DESCTABLE
-key	int	
-value	string	
+# col_name            	data_type           	comment             
+	 	 
+key                 	int                 	None                
+value               	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: FROM src

Modified: hive/trunk/contrib/src/test/results/clientpositive/serde_s3.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/contrib/src/test/results/clientpositive/serde_s3.q.out?rev=1418405&r1=1418404&r2=1418405&view=diff
==============================================================================
--- hive/trunk/contrib/src/test/results/clientpositive/serde_s3.q.out (original)
+++ hive/trunk/contrib/src/test/results/clientpositive/serde_s3.q.out Fri Dec  7 17:22:32 2012
@@ -15,23 +15,25 @@ PREHOOK: query: DESCRIBE s3log
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE s3log
 POSTHOOK: type: DESCTABLE
+# col_name            	data_type           	comment             
+	 	 
 #### A masked pattern was here ####
-bucketname	string	from deserializer
-rdatetime	string	from deserializer
-rip	string	from deserializer
-requester	string	from deserializer
-requestid	string	from deserializer
-operation	string	from deserializer
-rkey	string	from deserializer
-requesturi	string	from deserializer
-httpstatus	int	from deserializer
-errorcode	string	from deserializer
-bytessent	int	from deserializer
-objsize	int	from deserializer
-totaltime	int	from deserializer
-turnaroundtime	int	from deserializer
-referer	string	from deserializer
-useragent	string	from deserializer
+bucketname          	string              	from deserializer   
+rdatetime           	string              	from deserializer   
+rip                 	string              	from deserializer   
+requester           	string              	from deserializer   
+requestid           	string              	from deserializer   
+operation           	string              	from deserializer   
+rkey                	string              	from deserializer   
+requesturi          	string              	from deserializer   
+httpstatus          	int                 	from deserializer   
+errorcode           	string              	from deserializer   
+bytessent           	int                 	from deserializer   
+objsize             	int                 	from deserializer   
+totaltime           	int                 	from deserializer   
+turnaroundtime      	int                 	from deserializer   
+referer             	string              	from deserializer   
+useragent           	string              	from deserializer   
 PREHOOK: query: LOAD DATA LOCAL INPATH '../contrib/data/files/s3.log' INTO TABLE s3log
 PREHOOK: type: LOAD
 PREHOOK: Output: default@s3log

Modified: hive/trunk/hbase-handler/src/test/results/positive/hbase_queries.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/hbase-handler/src/test/results/positive/hbase_queries.q.out?rev=1418405&r1=1418404&r2=1418405&view=diff
==============================================================================
--- hive/trunk/hbase-handler/src/test/results/positive/hbase_queries.q.out (original)
+++ hive/trunk/hbase-handler/src/test/results/positive/hbase_queries.q.out Fri Dec  7 17:22:32 2012
@@ -17,8 +17,10 @@ PREHOOK: query: DESCRIBE EXTENDED hbase_
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE EXTENDED hbase_table_1
 POSTHOOK: type: DESCTABLE
-key	int	from deserializer
-value	string	from deserializer
+# col_name            	data_type           	comment             
+	 	 
+key                 	int                 	from deserializer   
+value               	string              	from deserializer   
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: select * from hbase_table_1

Modified: hive/trunk/hwi/src/test/org/apache/hadoop/hive/hwi/TestHWISessionManager.java
URL: http://svn.apache.org/viewvc/hive/trunk/hwi/src/test/org/apache/hadoop/hive/hwi/TestHWISessionManager.java?rev=1418405&r1=1418404&r2=1418405&view=diff
==============================================================================
--- hive/trunk/hwi/src/test/org/apache/hadoop/hive/hwi/TestHWISessionManager.java (original)
+++ hive/trunk/hwi/src/test/org/apache/hadoop/hive/hwi/TestHWISessionManager.java Fri Dec  7 17:22:32 2012
@@ -121,10 +121,15 @@ public class TestHWISessionManager exten
 
     ArrayList<ArrayList<String>> searchBlockRes = searchItem.getResultBucket();
 
-    String resLine = searchBlockRes.get(0).get(0);
+    // "describe [table_name]" result format
+    // first line should be format name:
+    // "# col_name             data_type               comment"
+    // second line is empty
+    // the following lines contain the values
+    String resLine = searchBlockRes.get(0).get(2);
     assertEquals(true, resLine.contains("key"));
     assertEquals(true, resLine.contains("int"));
-    String resLine2 = searchBlockRes.get(0).get(1);
+    String resLine2 = searchBlockRes.get(0).get(3);
     assertEquals(true, resLine2.contains("value"));
     assertEquals(true, resLine2.contains("string"));
 

Modified: hive/trunk/jdbc/src/test/org/apache/hadoop/hive/jdbc/TestJdbcDriver.java
URL: http://svn.apache.org/viewvc/hive/trunk/jdbc/src/test/org/apache/hadoop/hive/jdbc/TestJdbcDriver.java?rev=1418405&r1=1418404&r2=1418405&view=diff
==============================================================================
--- hive/trunk/jdbc/src/test/org/apache/hadoop/hive/jdbc/TestJdbcDriver.java (original)
+++ hive/trunk/jdbc/src/test/org/apache/hadoop/hive/jdbc/TestJdbcDriver.java Fri Dec  7 17:22:32 2012
@@ -764,17 +764,23 @@ public class TestJdbcDriver extends Test
 
     ResultSet res = stmt.executeQuery("describe " + tableName);
 
+    // "describe [table_name]" result format
+    // first line should be format name:
+    // "# col_name             data_type               comment"
+    // second line is empty
+    // the following lines contain the values
     res.next();
-    assertEquals("Column name 'under_col' not found", "under_col", res.getString(1));
-    assertEquals("Column type 'under_col' for column under_col not found", "int", res
-        .getString(2));
+    assertEquals(true, res.getString(1).contains("col_name"));
+    assertEquals(true, res.getString(2).contains("data_type"));
+    assertEquals(true, res.getString(3).contains("comment"));
     res.next();
-    assertEquals("Column name 'value' not found", "value", res.getString(1));
-    assertEquals("Column type 'string' for column key not found", "string", res
-        .getString(2));
-
+    res.next();
+    assertEquals(true, res.getString(1).contains("under_col"));
+    assertEquals(true, res.getString(2).contains("int"));
+    res.next();
+    assertEquals(true, res.getString(1).contains("value"));
+    assertEquals(true, res.getString(2).contains("string"));
     assertFalse("More results found than expected", res.next());
-
   }
 
   public void testDatabaseMetaData() throws SQLException {

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java?rev=1418405&r1=1418404&r2=1418405&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java Fri Dec  7 17:22:32 2012
@@ -2267,7 +2267,7 @@ public class DDLTask extends Task<DDLWor
 
       List<FieldSchema> cols = table.getCols();
       cols.addAll(table.getPartCols());
-      outStream.writeBytes(MetaDataFormatUtils.displayColsUnformatted(cols));
+      outStream.writeBytes(MetaDataFormatUtils.getAllColumnsInformation(cols));
       ((FSDataOutputStream) outStream).close();
       outStream = null;
     } catch (IOException e) {

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/MetaDataFormatUtils.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/MetaDataFormatUtils.java?rev=1418405&r1=1418404&r2=1418405&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/MetaDataFormatUtils.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/MetaDataFormatUtils.java Fri Dec  7 17:22:32 2012
@@ -129,22 +129,6 @@ public final class MetaDataFormatUtils {
     return indexInfo.toString();
 }
 
-  /*
-    Displaying columns unformatted for backward compatibility.
-   */
-  public static String displayColsUnformatted(List<FieldSchema> cols) {
-    StringBuilder colBuffer = new StringBuilder(DEFAULT_STRINGBUILDER_SIZE);
-    for (FieldSchema col : cols) {
-      colBuffer.append(col.getName());
-      colBuffer.append(FIELD_DELIM);
-      colBuffer.append(col.getType());
-      colBuffer.append(FIELD_DELIM);
-      colBuffer.append(col.getComment() == null ? "" : col.getComment());
-      colBuffer.append(LINE_DELIM);
-    }
-    return colBuffer.toString();
-  }
-
   public static String getPartitionInformation(Partition part) {
     StringBuilder tableInfo = new StringBuilder(DEFAULT_STRINGBUILDER_SIZE);
 
@@ -309,11 +293,23 @@ public final class MetaDataFormatUtils {
     tableInfo.append(String.format("%-" + ALIGNMENT + "s", value)).append(LINE_DELIM);
   }
 
-  private static void formatOutput(String col1, String col2, String col3,
+  private static void formatOutput(String colName, String colType, String colComment,
                                    StringBuilder tableInfo) {
-    tableInfo.append(String.format("%-" + ALIGNMENT + "s", col1)).append(FIELD_DELIM);
-    tableInfo.append(String.format("%-" + ALIGNMENT + "s", col2)).append(FIELD_DELIM);
-    tableInfo.append(String.format("%-" + ALIGNMENT + "s", col3)).append(LINE_DELIM);
+    tableInfo.append(String.format("%-" + ALIGNMENT + "s", colName)).append(FIELD_DELIM);
+    tableInfo.append(String.format("%-" + ALIGNMENT + "s", colType)).append(FIELD_DELIM);
+
+    // comment indent processing for multi-line comments
+    // comments should be indented the same amount on each line
+    // if the first line comment starts indented by k,
+    // the following line comments should also be indented by k
+    String[] commentSegments = colComment.split("\n|\r|\r\n");
+    tableInfo.append(String.format("%-" + ALIGNMENT + "s", commentSegments[0])).append(LINE_DELIM);
+    int colNameLength = ALIGNMENT > colName.length() ? ALIGNMENT : colName.length();
+    int colTypeLength = ALIGNMENT > colType.length() ? ALIGNMENT : colType.length();
+    for (int i = 1; i < commentSegments.length; i++) {
+      tableInfo.append(String.format("%" + colNameLength + "s" + FIELD_DELIM + "%"
+        + colTypeLength + "s" + FIELD_DELIM + "%s", "", "", commentSegments[i])).append(LINE_DELIM);
+    }
   }
 
   public static String[] getColumnsHeader() {

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/TextMetaDataFormatter.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/TextMetaDataFormatter.java?rev=1418405&r1=1418404&r2=1418405&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/TextMetaDataFormatter.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/TextMetaDataFormatter.java Fri Dec  7 17:22:32 2012
@@ -125,60 +125,50 @@ public class TextMetaDataFormatter imple
                               String colPath, String tableName,
                               Table tbl, Partition part, List<FieldSchema> cols,
                               boolean isFormatted, boolean isExt)
-         throws HiveException
-   {
-       try {
-         if (colPath.equals(tableName)) {
-           if (!isFormatted) {
-             outStream.writeBytes(MetaDataFormatUtils.displayColsUnformatted(cols));
-           } else {
-             outStream.writeBytes(
-               MetaDataFormatUtils.getAllColumnsInformation(cols,
-                 tbl.isPartitioned() ? tbl.getPartCols() : null));
-           }
-         } else {
-           if (isFormatted) {
-             outStream.writeBytes(MetaDataFormatUtils.getAllColumnsInformation(cols));
-           } else {
-             outStream.writeBytes(MetaDataFormatUtils.displayColsUnformatted(cols));
-           }
-         }
-
-         if (tableName.equals(colPath)) {
-
-           if (isFormatted) {
-             if (part != null) {
-               outStream.writeBytes(MetaDataFormatUtils.getPartitionInformation(part));
-             } else {
-               outStream.writeBytes(MetaDataFormatUtils.getTableInformation(tbl));
-             }
-           }
-
-           // if extended desc table then show the complete details of the table
-           if (isExt) {
-             // add empty line
-             outStream.write(terminator);
-             if (part != null) {
-               // show partition information
-               outStream.writeBytes("Detailed Partition Information");
-               outStream.write(separator);
-               outStream.writeBytes(part.getTPartition().toString());
-               outStream.write(separator);
-               // comment column is empty
-               outStream.write(terminator);
-             } else {
-               // show table information
-               outStream.writeBytes("Detailed Table Information");
-               outStream.write(separator);
-               outStream.writeBytes(tbl.getTTable().toString());
-               outStream.write(separator);
-               outStream.write(terminator);
-             }
-           }
-         }
-       } catch (IOException e) {
-           throw new HiveException(e);
-       }
+         throws HiveException {
+        try {
+          if (colPath.equals(tableName)) {
+            outStream.writeBytes(
+              MetaDataFormatUtils.getAllColumnsInformation(
+                cols, tbl.isPartitioned() ? tbl.getPartCols() : null));
+          } else {
+            outStream.writeBytes(MetaDataFormatUtils.getAllColumnsInformation(cols));
+          }
+
+          if (tableName.equals(colPath)) {
+            if (isFormatted) {
+              if (part != null) {
+                outStream.writeBytes(MetaDataFormatUtils.getPartitionInformation(part));
+              } else {
+                outStream.writeBytes(MetaDataFormatUtils.getTableInformation(tbl));
+              }
+            }
+
+          // if extended desc table then show the complete details of the table
+            if (isExt) {
+              // add empty line
+              outStream.write(terminator);
+              if (part != null) {
+                // show partition information
+                outStream.writeBytes("Detailed Partition Information");
+                outStream.write(separator);
+                outStream.writeBytes(part.getTPartition().toString());
+                outStream.write(separator);
+                // comment column is empty
+                outStream.write(terminator);
+              } else {
+                // show table information
+                outStream.writeBytes("Detailed Table Information");
+                outStream.write(separator);
+                outStream.writeBytes(tbl.getTTable().toString());
+                outStream.write(separator);
+                outStream.write(terminator);
+              }
+            }
+          }
+        } catch (IOException e) {
+          throw new HiveException(e);
+        }
     }
 
     public void showTableStatus(DataOutputStream outStream,

Added: hive/trunk/ql/src/test/queries/clientpositive/describe_comment_indent.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/describe_comment_indent.q?rev=1418405&view=auto
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/describe_comment_indent.q (added)
+++ hive/trunk/ql/src/test/queries/clientpositive/describe_comment_indent.q Fri Dec  7 17:22:32 2012
@@ -0,0 +1,14 @@
+-- test comment indent processing for multi-line comments
+
+CREATE TABLE test_table(
+    col1 INT COMMENT 'col1 one line comment',
+    col2 STRING COMMENT 'col2
+two lines comment',
+    col3 STRING COMMENT 'col3
+three lines
+comment') 
+COMMENT 'table comment
+two lines';
+
+DESCRIBE test_table;
+DESCRIBE FORMATTED test_table;

Modified: hive/trunk/ql/src/test/results/clientnegative/desc_failure2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientnegative/desc_failure2.q.out?rev=1418405&r1=1418404&r2=1418405&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientnegative/desc_failure2.q.out (original)
+++ hive/trunk/ql/src/test/results/clientnegative/desc_failure2.q.out Fri Dec  7 17:22:32 2012
@@ -2,8 +2,16 @@ PREHOOK: query: DESC srcpart
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESC srcpart
 POSTHOOK: type: DESCTABLE
-key	string	default
-value	string	default
-ds	string	
-hr	string	
+# col_name            	data_type           	comment             
+	 	 
+key                 	string              	default             
+value               	string              	default             
+ds                  	string              	None                
+hr                  	string              	None                
+	 	 
+# Partition Information	 	 
+# col_name            	data_type           	comment             
+	 	 
+ds                  	string              	None                
+hr                  	string              	None                
 FAILED: SemanticException [Error 10006]: Partition not found {ds=2012-04-08, hr=15}

Modified: hive/trunk/ql/src/test/results/clientnegative/drop_partition_filter_failure2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientnegative/drop_partition_filter_failure2.q.out?rev=1418405&r1=1418404&r2=1418405&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientnegative/drop_partition_filter_failure2.q.out (original)
+++ hive/trunk/ql/src/test/results/clientnegative/drop_partition_filter_failure2.q.out Fri Dec  7 17:22:32 2012
@@ -7,10 +7,18 @@ PREHOOK: query: describe ptestfilter
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe ptestfilter
 POSTHOOK: type: DESCTABLE
-a	string	
-b	int	
-c	string	
-d	int	
+# col_name            	data_type           	comment             
+	 	 
+a                   	string              	None                
+b                   	int                 	None                
+c                   	string              	None                
+d                   	int                 	None                
+	 	 
+# Partition Information	 	 
+# col_name            	data_type           	comment             
+	 	 
+c                   	string              	None                
+d                   	int                 	None                
 PREHOOK: query: alter table ptestfilter add partition (c='US', d=1)
 PREHOOK: type: ALTERTABLE_ADDPARTS
 PREHOOK: Input: default@ptestfilter

Modified: hive/trunk/ql/src/test/results/clientnegative/protectmode_part_no_drop.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientnegative/protectmode_part_no_drop.q.out?rev=1418405&r1=1418404&r2=1418405&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientnegative/protectmode_part_no_drop.q.out (original)
+++ hive/trunk/ql/src/test/results/clientnegative/protectmode_part_no_drop.q.out Fri Dec  7 17:22:32 2012
@@ -31,9 +31,16 @@ PREHOOK: query: desc extended tbl_protec
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: desc extended tbl_protectmode_no_drop partition (p='p1')
 POSTHOOK: type: DESCTABLE
-c1	string	
-c2	string	
-p	string	
+# col_name            	data_type           	comment             
+	 	 
+c1                  	string              	None                
+c2                  	string              	None                
+p                   	string              	None                
+	 	 
+# Partition Information	 	 
+# col_name            	data_type           	comment             
+	 	 
+p                   	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: alter table tbl_protectmode_no_drop drop partition (p='p1')

Modified: hive/trunk/ql/src/test/results/clientnegative/protectmode_tbl2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientnegative/protectmode_tbl2.q.out?rev=1418405&r1=1418404&r2=1418405&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientnegative/protectmode_tbl2.q.out (original)
+++ hive/trunk/ql/src/test/results/clientnegative/protectmode_tbl2.q.out Fri Dec  7 17:22:32 2012
@@ -46,8 +46,15 @@ PREHOOK: query: desc extended tbl_protec
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: desc extended tbl_protectmode2
 POSTHOOK: type: DESCTABLE
-col	string	
-p	string	
+# col_name            	data_type           	comment             
+	 	 
+col                 	string              	None                
+p                   	string              	None                
+	 	 
+# Partition Information	 	 
+# col_name            	data_type           	comment             
+	 	 
+p                   	string              	None                
 	 	 
 #### A masked pattern was here ####
 FAILED: SemanticException [Error 10113]: Query against an offline table or partition Table tbl_protectmode2

Modified: hive/trunk/ql/src/test/results/clientnegative/protectmode_tbl3.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientnegative/protectmode_tbl3.q.out?rev=1418405&r1=1418404&r2=1418405&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientnegative/protectmode_tbl3.q.out (original)
+++ hive/trunk/ql/src/test/results/clientnegative/protectmode_tbl3.q.out Fri Dec  7 17:22:32 2012
@@ -31,7 +31,9 @@ PREHOOK: query: desc extended tbl_protec
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: desc extended tbl_protectmode_4
 POSTHOOK: type: DESCTABLE
-col	string	
+# col_name            	data_type           	comment             
+	 	 
+col                 	string              	None                
 	 	 
 #### A masked pattern was here ####
 FAILED: SemanticException [Error 10113]: Query against an offline table or partition Table tbl_protectmode_4

Modified: hive/trunk/ql/src/test/results/clientnegative/protectmode_tbl4.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientnegative/protectmode_tbl4.q.out?rev=1418405&r1=1418404&r2=1418405&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientnegative/protectmode_tbl4.q.out (original)
+++ hive/trunk/ql/src/test/results/clientnegative/protectmode_tbl4.q.out Fri Dec  7 17:22:32 2012
@@ -55,8 +55,15 @@ PREHOOK: query: desc extended tbl_protec
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: desc extended tbl_protectmode_tbl4
 POSTHOOK: type: DESCTABLE
-col	string	
-p	string	
+# col_name            	data_type           	comment             
+	 	 
+col                 	string              	None                
+p                   	string              	None                
+	 	 
+# Partition Information	 	 
+# col_name            	data_type           	comment             
+	 	 
+p                   	string              	None                
 	 	 
 #### A masked pattern was here ####
 FAILED: SemanticException [Error 10113]: Query against an offline table or partition Table tbl_protectmode_tbl4

Modified: hive/trunk/ql/src/test/results/clientnegative/protectmode_tbl5.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientnegative/protectmode_tbl5.q.out?rev=1418405&r1=1418404&r2=1418405&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientnegative/protectmode_tbl5.q.out (original)
+++ hive/trunk/ql/src/test/results/clientnegative/protectmode_tbl5.q.out Fri Dec  7 17:22:32 2012
@@ -55,8 +55,15 @@ PREHOOK: query: desc extended tbl_protec
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: desc extended tbl_protectmode_tbl5
 POSTHOOK: type: DESCTABLE
-col	string	
-p	string	
+# col_name            	data_type           	comment             
+	 	 
+col                 	string              	None                
+p                   	string              	None                
+	 	 
+# Partition Information	 	 
+# col_name            	data_type           	comment             
+	 	 
+p                   	string              	None                
 	 	 
 #### A masked pattern was here ####
 FAILED: SemanticException [Error 10113]: Query against an offline table or partition Table tbl_protectmode_tbl5

Modified: hive/trunk/ql/src/test/results/clientnegative/protectmode_tbl_no_drop.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientnegative/protectmode_tbl_no_drop.q.out?rev=1418405&r1=1418404&r2=1418405&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientnegative/protectmode_tbl_no_drop.q.out (original)
+++ hive/trunk/ql/src/test/results/clientnegative/protectmode_tbl_no_drop.q.out Fri Dec  7 17:22:32 2012
@@ -31,7 +31,9 @@ PREHOOK: query: desc extended tbl_protec
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: desc extended tbl_protectmode__no_drop
 POSTHOOK: type: DESCTABLE
-col	string	
+# col_name            	data_type           	comment             
+	 	 
+col                 	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: drop table tbl_protectmode__no_drop

Modified: hive/trunk/ql/src/test/results/clientnegative/set_hiveconf_validation0.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientnegative/set_hiveconf_validation0.q.out?rev=1418405&r1=1418404&r2=1418405&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientnegative/set_hiveconf_validation0.q.out (original)
+++ hive/trunk/ql/src/test/results/clientnegative/set_hiveconf_validation0.q.out Fri Dec  7 17:22:32 2012
@@ -4,6 +4,8 @@ PREHOOK: type: DESCTABLE
 POSTHOOK: query: -- should fail: hive.join.cache.size accepts int type
 desc src
 POSTHOOK: type: DESCTABLE
-key	string	default
-value	string	default
+# col_name            	data_type           	comment             
+	 	 
+key                 	string              	default             
+value               	string              	default             
 Query returned non-zero code: 1, cause: 'SET hive.join.cache.size=test' FAILED because hive.join.cache.size expects an INT value.

Modified: hive/trunk/ql/src/test/results/clientnegative/set_hiveconf_validation1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientnegative/set_hiveconf_validation1.q.out?rev=1418405&r1=1418404&r2=1418405&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientnegative/set_hiveconf_validation1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientnegative/set_hiveconf_validation1.q.out Fri Dec  7 17:22:32 2012
@@ -4,6 +4,8 @@ PREHOOK: type: DESCTABLE
 POSTHOOK: query: -- should fail: hive.map.aggr.hash.min.reduction accepts float type
 desc src
 POSTHOOK: type: DESCTABLE
-key	string	default
-value	string	default
+# col_name            	data_type           	comment             
+	 	 
+key                 	string              	default             
+value               	string              	default             
 Query returned non-zero code: 1, cause: 'SET hive.map.aggr.hash.min.reduction=false' FAILED because hive.map.aggr.hash.min.reduction expects an FLOAT value.

Modified: hive/trunk/ql/src/test/results/clientpositive/alter1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/alter1.q.out?rev=1418405&r1=1418404&r2=1418405&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/alter1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/alter1.q.out Fri Dec  7 17:22:32 2012
@@ -7,8 +7,10 @@ PREHOOK: query: describe extended alter1
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe extended alter1
 POSTHOOK: type: DESCTABLE
-a	int	
-b	int	
+# col_name            	data_type           	comment             
+	 	 
+a                   	int                 	None                
+b                   	int                 	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: alter table alter1 set tblproperties ('a'='1', 'c'='3')
@@ -23,8 +25,10 @@ PREHOOK: query: describe extended alter1
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe extended alter1
 POSTHOOK: type: DESCTABLE
-a	int	
-b	int	
+# col_name            	data_type           	comment             
+	 	 
+a                   	int                 	None                
+b                   	int                 	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: alter table alter1 set tblproperties ('a'='1', 'c'='4', 'd'='3')
@@ -39,8 +43,10 @@ PREHOOK: query: describe extended alter1
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe extended alter1
 POSTHOOK: type: DESCTABLE
-a	int	
-b	int	
+# col_name            	data_type           	comment             
+	 	 
+a                   	int                 	None                
+b                   	int                 	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: alter table alter1 set tblproperties ('EXTERNAL'='TRUE')
@@ -55,8 +61,10 @@ PREHOOK: query: describe extended alter1
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe extended alter1
 POSTHOOK: type: DESCTABLE
-a	int	
-b	int	
+# col_name            	data_type           	comment             
+	 	 
+a                   	int                 	None                
+b                   	int                 	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: alter table alter1 set tblproperties ('EXTERNAL'='FALSE')
@@ -71,8 +79,10 @@ PREHOOK: query: describe extended alter1
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe extended alter1
 POSTHOOK: type: DESCTABLE
-a	int	
-b	int	
+# col_name            	data_type           	comment             
+	 	 
+a                   	int                 	None                
+b                   	int                 	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: alter table alter1 set serdeproperties('s1'='9')
@@ -87,8 +97,10 @@ PREHOOK: query: describe extended alter1
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe extended alter1
 POSTHOOK: type: DESCTABLE
-a	int	
-b	int	
+# col_name            	data_type           	comment             
+	 	 
+a                   	int                 	None                
+b                   	int                 	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: alter table alter1 set serdeproperties('s1'='10', 's2' ='20')
@@ -103,8 +115,10 @@ PREHOOK: query: describe extended alter1
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe extended alter1
 POSTHOOK: type: DESCTABLE
-a	int	
-b	int	
+# col_name            	data_type           	comment             
+	 	 
+a                   	int                 	None                
+b                   	int                 	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: alter table alter1 set serde 'org.apache.hadoop.hive.serde2.TestSerDe' with serdeproperties('s1'='9')
@@ -119,8 +133,10 @@ PREHOOK: query: describe extended alter1
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe extended alter1
 POSTHOOK: type: DESCTABLE
-a	string	from deserializer
-b	string	from deserializer
+# col_name            	data_type           	comment             
+	 	 
+a                   	string              	from deserializer   
+b                   	string              	from deserializer   
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: alter table alter1 set serde 'org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe'
@@ -135,8 +151,10 @@ PREHOOK: query: describe extended alter1
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe extended alter1
 POSTHOOK: type: DESCTABLE
-a	string	from deserializer
-b	string	from deserializer
+# col_name            	data_type           	comment             
+	 	 
+a                   	string              	from deserializer   
+b                   	string              	from deserializer   
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: alter table alter1 replace columns (a int, b int, c string)
@@ -151,9 +169,11 @@ PREHOOK: query: describe alter1
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe alter1
 POSTHOOK: type: DESCTABLE
-a	int	
-b	int	
-c	string	
+# col_name            	data_type           	comment             
+	 	 
+a                   	int                 	None                
+b                   	int                 	None                
+c                   	string              	None                
 PREHOOK: query: -- Cleanup
 DROP TABLE alter1
 PREHOOK: type: DROPTABLE
@@ -201,8 +221,10 @@ PREHOOK: query: DESCRIBE EXTENDED alter1
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE EXTENDED alter1
 POSTHOOK: type: DESCTABLE
-a	int	
-b	int	
+# col_name            	data_type           	comment             
+	 	 
+a                   	int                 	None                
+b                   	int                 	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: ALTER TABLE alter1 SET TBLPROPERTIES ('a'='1', 'c'='3')
@@ -217,8 +239,10 @@ PREHOOK: query: DESCRIBE EXTENDED alter1
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE EXTENDED alter1
 POSTHOOK: type: DESCTABLE
-a	int	
-b	int	
+# col_name            	data_type           	comment             
+	 	 
+a                   	int                 	None                
+b                   	int                 	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: ALTER TABLE alter1 SET TBLPROPERTIES ('a'='1', 'c'='4', 'd'='3')
@@ -233,8 +257,10 @@ PREHOOK: query: DESCRIBE EXTENDED alter1
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE EXTENDED alter1
 POSTHOOK: type: DESCTABLE
-a	int	
-b	int	
+# col_name            	data_type           	comment             
+	 	 
+a                   	int                 	None                
+b                   	int                 	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: ALTER TABLE alter1 SET TBLPROPERTIES ('EXTERNAL'='TRUE')
@@ -249,8 +275,10 @@ PREHOOK: query: DESCRIBE EXTENDED alter1
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE EXTENDED alter1
 POSTHOOK: type: DESCTABLE
-a	int	
-b	int	
+# col_name            	data_type           	comment             
+	 	 
+a                   	int                 	None                
+b                   	int                 	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: ALTER TABLE alter1 SET TBLPROPERTIES ('EXTERNAL'='FALSE')
@@ -265,8 +293,10 @@ PREHOOK: query: DESCRIBE EXTENDED alter1
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE EXTENDED alter1
 POSTHOOK: type: DESCTABLE
-a	int	
-b	int	
+# col_name            	data_type           	comment             
+	 	 
+a                   	int                 	None                
+b                   	int                 	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: ALTER TABLE alter1 SET SERDEPROPERTIES('s1'='9')
@@ -281,8 +311,10 @@ PREHOOK: query: DESCRIBE EXTENDED alter1
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE EXTENDED alter1
 POSTHOOK: type: DESCTABLE
-a	int	
-b	int	
+# col_name            	data_type           	comment             
+	 	 
+a                   	int                 	None                
+b                   	int                 	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: ALTER TABLE alter1 SET SERDEPROPERTIES('s1'='10', 's2' ='20')
@@ -297,8 +329,10 @@ PREHOOK: query: DESCRIBE EXTENDED alter1
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE EXTENDED alter1
 POSTHOOK: type: DESCTABLE
-a	int	
-b	int	
+# col_name            	data_type           	comment             
+	 	 
+a                   	int                 	None                
+b                   	int                 	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: ALTER TABLE alter1 SET SERDE 'org.apache.hadoop.hive.serde2.TestSerDe' WITH SERDEPROPERTIES ('s1'='9')
@@ -313,8 +347,10 @@ PREHOOK: query: DESCRIBE EXTENDED alter1
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE EXTENDED alter1
 POSTHOOK: type: DESCTABLE
-a	string	from deserializer
-b	string	from deserializer
+# col_name            	data_type           	comment             
+	 	 
+a                   	string              	from deserializer   
+b                   	string              	from deserializer   
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: ALTER TABLE alter1 SET SERDE 'org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe'
@@ -329,8 +365,10 @@ PREHOOK: query: DESCRIBE EXTENDED alter1
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE EXTENDED alter1
 POSTHOOK: type: DESCTABLE
-a	string	from deserializer
-b	string	from deserializer
+# col_name            	data_type           	comment             
+	 	 
+a                   	string              	from deserializer   
+b                   	string              	from deserializer   
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: ALTER TABLE alter1 REPLACE COLUMNS (a int, b int, c string)
@@ -345,9 +383,11 @@ PREHOOK: query: DESCRIBE alter1
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE alter1
 POSTHOOK: type: DESCTABLE
-a	int	
-b	int	
-c	string	
+# col_name            	data_type           	comment             
+	 	 
+a                   	int                 	None                
+b                   	int                 	None                
+c                   	string              	None                
 PREHOOK: query: DROP TABLE alter1
 PREHOOK: type: DROPTABLE
 PREHOOK: Input: alter1_db@alter1

Modified: hive/trunk/ql/src/test/results/clientpositive/alter2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/alter2.q.out?rev=1418405&r1=1418404&r2=1418405&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/alter2.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/alter2.q.out Fri Dec  7 17:22:32 2012
@@ -7,9 +7,16 @@ PREHOOK: query: describe extended alter2
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe extended alter2
 POSTHOOK: type: DESCTABLE
-a	int	
-b	int	
-insertdate	string	
+# col_name            	data_type           	comment             
+	 	 
+a                   	int                 	None                
+b                   	int                 	None                
+insertdate          	string              	None                
+	 	 
+# Partition Information	 	 
+# col_name            	data_type           	comment             
+	 	 
+insertdate          	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: show partitions alter2
@@ -27,9 +34,16 @@ PREHOOK: query: describe extended alter2
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe extended alter2
 POSTHOOK: type: DESCTABLE
-a	int	
-b	int	
-insertdate	string	
+# col_name            	data_type           	comment             
+	 	 
+a                   	int                 	None                
+b                   	int                 	None                
+insertdate          	string              	None                
+	 	 
+# Partition Information	 	 
+# col_name            	data_type           	comment             
+	 	 
+insertdate          	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: show partitions alter2
@@ -48,9 +62,16 @@ PREHOOK: query: describe extended alter2
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe extended alter2
 POSTHOOK: type: DESCTABLE
-a	int	
-b	int	
-insertdate	string	
+# col_name            	data_type           	comment             
+	 	 
+a                   	int                 	None                
+b                   	int                 	None                
+insertdate          	string              	None                
+	 	 
+# Partition Information	 	 
+# col_name            	data_type           	comment             
+	 	 
+insertdate          	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: show partitions alter2
@@ -76,9 +97,16 @@ PREHOOK: query: describe extended alter2
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe extended alter2
 POSTHOOK: type: DESCTABLE
-a	int	
-b	int	
-insertdate	string	
+# col_name            	data_type           	comment             
+	 	 
+a                   	int                 	None                
+b                   	int                 	None                
+insertdate          	string              	None                
+	 	 
+# Partition Information	 	 
+# col_name            	data_type           	comment             
+	 	 
+insertdate          	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: show partitions alter2
@@ -96,9 +124,16 @@ PREHOOK: query: describe extended alter2
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe extended alter2
 POSTHOOK: type: DESCTABLE
-a	int	
-b	int	
-insertdate	string	
+# col_name            	data_type           	comment             
+	 	 
+a                   	int                 	None                
+b                   	int                 	None                
+insertdate          	string              	None                
+	 	 
+# Partition Information	 	 
+# col_name            	data_type           	comment             
+	 	 
+insertdate          	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: show partitions alter2
@@ -117,9 +152,16 @@ PREHOOK: query: describe extended alter2
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe extended alter2
 POSTHOOK: type: DESCTABLE
-a	int	
-b	int	
-insertdate	string	
+# col_name            	data_type           	comment             
+	 	 
+a                   	int                 	None                
+b                   	int                 	None                
+insertdate          	string              	None                
+	 	 
+# Partition Information	 	 
+# col_name            	data_type           	comment             
+	 	 
+insertdate          	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: show partitions alter2
@@ -175,9 +217,16 @@ PREHOOK: query: DESCRIBE EXTENDED alter2
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE EXTENDED alter2
 POSTHOOK: type: DESCTABLE
-a	int	
-b	int	
-insertdate	string	
+# col_name            	data_type           	comment             
+	 	 
+a                   	int                 	None                
+b                   	int                 	None                
+insertdate          	string              	None                
+	 	 
+# Partition Information	 	 
+# col_name            	data_type           	comment             
+	 	 
+insertdate          	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: SHOW PARTITIONS alter2
@@ -195,9 +244,16 @@ PREHOOK: query: DESCRIBE EXTENDED alter2
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE EXTENDED alter2
 POSTHOOK: type: DESCTABLE
-a	int	
-b	int	
-insertdate	string	
+# col_name            	data_type           	comment             
+	 	 
+a                   	int                 	None                
+b                   	int                 	None                
+insertdate          	string              	None                
+	 	 
+# Partition Information	 	 
+# col_name            	data_type           	comment             
+	 	 
+insertdate          	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: SHOW PARTITIONS alter2
@@ -216,9 +272,16 @@ PREHOOK: query: DESCRIBE EXTENDED alter2
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE EXTENDED alter2
 POSTHOOK: type: DESCTABLE
-a	int	
-b	int	
-insertdate	string	
+# col_name            	data_type           	comment             
+	 	 
+a                   	int                 	None                
+b                   	int                 	None                
+insertdate          	string              	None                
+	 	 
+# Partition Information	 	 
+# col_name            	data_type           	comment             
+	 	 
+insertdate          	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: SHOW PARTITIONS alter2
@@ -244,9 +307,16 @@ PREHOOK: query: DESCRIBE EXTENDED alter2
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE EXTENDED alter2
 POSTHOOK: type: DESCTABLE
-a	int	
-b	int	
-insertdate	string	
+# col_name            	data_type           	comment             
+	 	 
+a                   	int                 	None                
+b                   	int                 	None                
+insertdate          	string              	None                
+	 	 
+# Partition Information	 	 
+# col_name            	data_type           	comment             
+	 	 
+insertdate          	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: SHOW PARTITIONS alter2
@@ -264,9 +334,16 @@ PREHOOK: query: DESCRIBE EXTENDED alter2
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE EXTENDED alter2
 POSTHOOK: type: DESCTABLE
-a	int	
-b	int	
-insertdate	string	
+# col_name            	data_type           	comment             
+	 	 
+a                   	int                 	None                
+b                   	int                 	None                
+insertdate          	string              	None                
+	 	 
+# Partition Information	 	 
+# col_name            	data_type           	comment             
+	 	 
+insertdate          	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: SHOW PARTITIONS alter2
@@ -285,9 +362,16 @@ PREHOOK: query: DESCRIBE EXTENDED alter2
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE EXTENDED alter2
 POSTHOOK: type: DESCTABLE
-a	int	
-b	int	
-insertdate	string	
+# col_name            	data_type           	comment             
+	 	 
+a                   	int                 	None                
+b                   	int                 	None                
+insertdate          	string              	None                
+	 	 
+# Partition Information	 	 
+# col_name            	data_type           	comment             
+	 	 
+insertdate          	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: SHOW PARTITIONS alter2

Modified: hive/trunk/ql/src/test/results/clientpositive/alter3.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/alter3.q.out?rev=1418405&r1=1418404&r2=1418405&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/alter3.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/alter3.q.out Fri Dec  7 17:22:32 2012
@@ -58,9 +58,17 @@ PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe extended alter3_renamed
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Lineage: alter3 PARTITION(pcol1=test_part:,pcol2=test_part:).col1 SIMPLE [(alter3_src)alter3_src.FieldSchema(name:col1, type:string, comment:null), ]
-col1	string	
-pcol1	string	
-pcol2	string	
+# col_name            	data_type           	comment             
+	 	 
+col1                	string              	None                
+pcol1               	string              	None                
+pcol2               	string              	None                
+	 	 
+# Partition Information	 	 
+# col_name            	data_type           	comment             
+	 	 
+pcol1               	string              	None                
+pcol2               	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: describe extended alter3_renamed partition (pCol1='test_part:', pcol2='test_part:')
@@ -68,9 +76,17 @@ PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe extended alter3_renamed partition (pCol1='test_part:', pcol2='test_part:')
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Lineage: alter3 PARTITION(pcol1=test_part:,pcol2=test_part:).col1 SIMPLE [(alter3_src)alter3_src.FieldSchema(name:col1, type:string, comment:null), ]
-col1	string	
-pcol1	string	
-pcol2	string	
+# col_name            	data_type           	comment             
+	 	 
+col1                	string              	None                
+pcol1               	string              	None                
+pcol2               	string              	None                
+	 	 
+# Partition Information	 	 
+# col_name            	data_type           	comment             
+	 	 
+pcol1               	string              	None                
+pcol2               	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: select * from alter3_renamed where pcol1='test_part:' and pcol2='test_part:'
@@ -119,9 +135,17 @@ POSTHOOK: query: describe extended alter
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Lineage: alter3 PARTITION(pcol1=test_part:,pcol2=test_part:).col1 SIMPLE [(alter3_src)alter3_src.FieldSchema(name:col1, type:string, comment:null), ]
 POSTHOOK: Lineage: alter3_like PARTITION(pcol1=test_part:,pcol2=test_part:).col1 SIMPLE [(alter3_src)alter3_src.FieldSchema(name:col1, type:string, comment:null), ]
-col1	string	
-pcol1	string	
-pcol2	string	
+# col_name            	data_type           	comment             
+	 	 
+col1                	string              	None                
+pcol1               	string              	None                
+pcol2               	string              	None                
+	 	 
+# Partition Information	 	 
+# col_name            	data_type           	comment             
+	 	 
+pcol1               	string              	None                
+pcol2               	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: -- Cleanup
@@ -268,9 +292,17 @@ POSTHOOK: type: DESCTABLE
 POSTHOOK: Lineage: alter3 PARTITION(pcol1=test_part:,pcol2=test_part:).col1 SIMPLE [(alter3_src)alter3_src.FieldSchema(name:col1, type:string, comment:null), ]
 POSTHOOK: Lineage: alter3 PARTITION(pcol1=test_part:,pcol2=test_part:).col1 SIMPLE [(alter3_src)alter3_src.FieldSchema(name:col1, type:string, comment:null), ]
 POSTHOOK: Lineage: alter3_like PARTITION(pcol1=test_part:,pcol2=test_part:).col1 SIMPLE [(alter3_src)alter3_src.FieldSchema(name:col1, type:string, comment:null), ]
-col1	string	
-pcol1	string	
-pcol2	string	
+# col_name            	data_type           	comment             
+	 	 
+col1                	string              	None                
+pcol1               	string              	None                
+pcol2               	string              	None                
+	 	 
+# Partition Information	 	 
+# col_name            	data_type           	comment             
+	 	 
+pcol1               	string              	None                
+pcol2               	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: DESCRIBE EXTENDED alter3_renamed PARTITION (pCol1='test_part:', pcol2='test_part:')
@@ -280,9 +312,17 @@ POSTHOOK: type: DESCTABLE
 POSTHOOK: Lineage: alter3 PARTITION(pcol1=test_part:,pcol2=test_part:).col1 SIMPLE [(alter3_src)alter3_src.FieldSchema(name:col1, type:string, comment:null), ]
 POSTHOOK: Lineage: alter3 PARTITION(pcol1=test_part:,pcol2=test_part:).col1 SIMPLE [(alter3_src)alter3_src.FieldSchema(name:col1, type:string, comment:null), ]
 POSTHOOK: Lineage: alter3_like PARTITION(pcol1=test_part:,pcol2=test_part:).col1 SIMPLE [(alter3_src)alter3_src.FieldSchema(name:col1, type:string, comment:null), ]
-col1	string	
-pcol1	string	
-pcol2	string	
+# col_name            	data_type           	comment             
+	 	 
+col1                	string              	None                
+pcol1               	string              	None                
+pcol2               	string              	None                
+	 	 
+# Partition Information	 	 
+# col_name            	data_type           	comment             
+	 	 
+pcol1               	string              	None                
+pcol2               	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: SELECT * FROM alter3_renamed WHERE pcol1='test_part:' AND pcol2='test_part:'
@@ -339,8 +379,16 @@ POSTHOOK: Lineage: alter3 PARTITION(pcol
 POSTHOOK: Lineage: alter3 PARTITION(pcol1=test_part:,pcol2=test_part:).col1 SIMPLE [(alter3_src)alter3_src.FieldSchema(name:col1, type:string, comment:null), ]
 POSTHOOK: Lineage: alter3_like PARTITION(pcol1=test_part:,pcol2=test_part:).col1 SIMPLE [(alter3_src)alter3_src.FieldSchema(name:col1, type:string, comment:null), ]
 POSTHOOK: Lineage: alter3_like PARTITION(pcol1=test_part:,pcol2=test_part:).col1 SIMPLE [(alter3_src)alter3_src.FieldSchema(name:col1, type:string, comment:null), ]
-col1	string	
-pcol1	string	
-pcol2	string	
+# col_name            	data_type           	comment             
+	 	 
+col1                	string              	None                
+pcol1               	string              	None                
+pcol2               	string              	None                
+	 	 
+# Partition Information	 	 
+# col_name            	data_type           	comment             
+	 	 
+pcol1               	string              	None                
+pcol2               	string              	None                
 	 	 
 #### A masked pattern was here ####

Modified: hive/trunk/ql/src/test/results/clientpositive/alter4.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/alter4.q.out?rev=1418405&r1=1418404&r2=1418405&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/alter4.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/alter4.q.out Fri Dec  7 17:22:32 2012
@@ -7,8 +7,10 @@ PREHOOK: query: DESCRIBE EXTENDED set_bu
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE EXTENDED set_bucketing_test
 POSTHOOK: type: DESCTABLE
-key	int	
-value	string	
+# col_name            	data_type           	comment             
+	 	 
+key                 	int                 	None                
+value               	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: ALTER TABLE set_bucketing_test NOT CLUSTERED
@@ -23,8 +25,10 @@ PREHOOK: query: DESCRIBE EXTENDED set_bu
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE EXTENDED set_bucketing_test
 POSTHOOK: type: DESCTABLE
-key	int	
-value	string	
+# col_name            	data_type           	comment             
+	 	 
+key                 	int                 	None                
+value               	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: -- Cleanup
@@ -74,8 +78,10 @@ PREHOOK: query: DESCRIBE EXTENDED set_bu
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE EXTENDED set_bucketing_test
 POSTHOOK: type: DESCTABLE
-key	int	
-value	string	
+# col_name            	data_type           	comment             
+	 	 
+key                 	int                 	None                
+value               	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: ALTER TABLE set_bucketing_test NOT CLUSTERED
@@ -90,8 +96,10 @@ PREHOOK: query: DESCRIBE EXTENDED set_bu
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: DESCRIBE EXTENDED set_bucketing_test
 POSTHOOK: type: DESCTABLE
-key	int	
-value	string	
+# col_name            	data_type           	comment             
+	 	 
+key                 	int                 	None                
+value               	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: DROP TABLE set_bucketing_test

Modified: hive/trunk/ql/src/test/results/clientpositive/alter5.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/alter5.q.out?rev=1418405&r1=1418404&r2=1418405&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/alter5.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/alter5.q.out Fri Dec  7 17:22:32 2012
@@ -41,8 +41,15 @@ PREHOOK: query: describe extended alter5
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe extended alter5 partition (dt='a')
 POSTHOOK: type: DESCTABLE
-col1	string	
-dt	string	
+# col_name            	data_type           	comment             
+	 	 
+col1                	string              	None                
+dt                  	string              	None                
+	 	 
+# Partition Information	 	 
+# col_name            	data_type           	comment             
+	 	 
+dt                  	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: insert overwrite table alter5 partition (dt='a') select col1 from alter5_src
@@ -74,8 +81,15 @@ PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe extended alter5 partition (dt='a')
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Lineage: alter5 PARTITION(dt=a).col1 SIMPLE [(alter5_src)alter5_src.FieldSchema(name:col1, type:string, comment:null), ]
-col1	string	
-dt	string	
+# col_name            	data_type           	comment             
+	 	 
+col1                	string              	None                
+dt                  	string              	None                
+	 	 
+# Partition Information	 	 
+# col_name            	data_type           	comment             
+	 	 
+dt                  	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: -- Cleanup
@@ -162,8 +176,15 @@ PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe extended alter5 partition (dt='a')
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Lineage: alter5 PARTITION(dt=a).col1 SIMPLE [(alter5_src)alter5_src.FieldSchema(name:col1, type:string, comment:null), ]
-col1	string	
-dt	string	
+# col_name            	data_type           	comment             
+	 	 
+col1                	string              	None                
+dt                  	string              	None                
+	 	 
+# Partition Information	 	 
+# col_name            	data_type           	comment             
+	 	 
+dt                  	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: insert overwrite table alter5 partition (dt='a') select col1 from alter5_src
@@ -198,7 +219,14 @@ POSTHOOK: query: describe extended alter
 POSTHOOK: type: DESCTABLE
 POSTHOOK: Lineage: alter5 PARTITION(dt=a).col1 SIMPLE [(alter5_src)alter5_src.FieldSchema(name:col1, type:string, comment:null), ]
 POSTHOOK: Lineage: alter5 PARTITION(dt=a).col1 SIMPLE [(alter5_src)alter5_src.FieldSchema(name:col1, type:string, comment:null), ]
-col1	string	
-dt	string	
+# col_name            	data_type           	comment             
+	 	 
+col1                	string              	None                
+dt                  	string              	None                
+	 	 
+# Partition Information	 	 
+# col_name            	data_type           	comment             
+	 	 
+dt                  	string              	None                
 	 	 
 #### A masked pattern was here ####

Modified: hive/trunk/ql/src/test/results/clientpositive/alter_index.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/alter_index.q.out?rev=1418405&r1=1418404&r2=1418405&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/alter_index.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/alter_index.q.out Fri Dec  7 17:22:32 2012
@@ -11,9 +11,11 @@ PREHOOK: query: desc extended default__s
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: desc extended default__src_src_index_8__
 POSTHOOK: type: DESCTABLE
-key	string	default
-_bucketname	string	
-_offsets	array<bigint>	
+# col_name            	data_type           	comment             
+	 	 
+key                 	string              	default             
+_bucketname         	string              	                    
+_offsets            	array<bigint>       	                    
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: alter index src_index_8 on src set IDXPROPERTIES ("prop1"="val1_new", "prop3"="val3")
@@ -24,9 +26,11 @@ PREHOOK: query: desc extended default__s
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: desc extended default__src_src_index_8__
 POSTHOOK: type: DESCTABLE
-key	string	default
-_bucketname	string	
-_offsets	array<bigint>	
+# col_name            	data_type           	comment             
+	 	 
+key                 	string              	default             
+_bucketname         	string              	                    
+_offsets            	array<bigint>       	                    
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: drop index src_index_8 on src

Modified: hive/trunk/ql/src/test/results/clientpositive/alter_merge_2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/alter_merge_2.q.out?rev=1418405&r1=1418404&r2=1418405&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/alter_merge_2.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/alter_merge_2.q.out Fri Dec  7 17:22:32 2012
@@ -14,10 +14,18 @@ PREHOOK: query: desc extended src_rc_mer
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: desc extended src_rc_merge_test_part partition (ds='2012-01-03', ts='2012-01-03+14:46:31')
 POSTHOOK: type: DESCTABLE
-key	int	
-value	string	
-ds	string	
-ts	string	
+# col_name            	data_type           	comment             
+	 	 
+key                 	int                 	None                
+value               	string              	None                
+ds                  	string              	None                
+ts                  	string              	None                
+	 	 
+# Partition Information	 	 
+# col_name            	data_type           	comment             
+	 	 
+ds                  	string              	None                
+ts                  	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: load data local inpath '../data/files/smbbucket_1.rc' into table src_rc_merge_test_part partition (ds='2012-01-03', ts='2012-01-03+14:46:31')

Modified: hive/trunk/ql/src/test/results/clientpositive/alter_merge_stats.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/alter_merge_stats.q.out?rev=1418405&r1=1418404&r2=1418405&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/alter_merge_stats.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/alter_merge_stats.q.out Fri Dec  7 17:22:32 2012
@@ -42,8 +42,10 @@ PREHOOK: query: desc extended src_rc_mer
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: desc extended src_rc_merge_test_stat
 POSTHOOK: type: DESCTABLE
-key	int	
-value	string	
+# col_name            	data_type           	comment             
+	 	 
+key                 	int                 	None                
+value               	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: analyze table src_rc_merge_test_stat compute statistics
@@ -58,8 +60,10 @@ PREHOOK: query: desc extended src_rc_mer
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: desc extended src_rc_merge_test_stat
 POSTHOOK: type: DESCTABLE
-key	int	
-value	string	
+# col_name            	data_type           	comment             
+	 	 
+key                 	int                 	None                
+value               	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: alter table src_rc_merge_test_stat concatenate
@@ -91,8 +95,10 @@ PREHOOK: query: desc extended src_rc_mer
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: desc extended src_rc_merge_test_stat
 POSTHOOK: type: DESCTABLE
-key	int	
-value	string	
+# col_name            	data_type           	comment             
+	 	 
+key                 	int                 	None                
+value               	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: create table src_rc_merge_test_part_stat(key int, value string) partitioned by (ds string) stored as rcfile
@@ -146,9 +152,16 @@ PREHOOK: query: desc extended src_rc_mer
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: desc extended src_rc_merge_test_part_stat
 POSTHOOK: type: DESCTABLE
-key	int	
-value	string	
-ds	string	
+# col_name            	data_type           	comment             
+	 	 
+key                 	int                 	None                
+value               	string              	None                
+ds                  	string              	None                
+	 	 
+# Partition Information	 	 
+# col_name            	data_type           	comment             
+	 	 
+ds                  	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: analyze table src_rc_merge_test_part_stat partition(ds='2011') compute statistics
@@ -165,9 +178,16 @@ PREHOOK: query: desc extended src_rc_mer
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: desc extended src_rc_merge_test_part_stat
 POSTHOOK: type: DESCTABLE
-key	int	
-value	string	
-ds	string	
+# col_name            	data_type           	comment             
+	 	 
+key                 	int                 	None                
+value               	string              	None                
+ds                  	string              	None                
+	 	 
+# Partition Information	 	 
+# col_name            	data_type           	comment             
+	 	 
+ds                  	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: alter table src_rc_merge_test_part_stat partition (ds='2011') concatenate
@@ -199,9 +219,16 @@ PREHOOK: query: desc extended src_rc_mer
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: desc extended src_rc_merge_test_part_stat
 POSTHOOK: type: DESCTABLE
-key	int	
-value	string	
-ds	string	
+# col_name            	data_type           	comment             
+	 	 
+key                 	int                 	None                
+value               	string              	None                
+ds                  	string              	None                
+	 	 
+# Partition Information	 	 
+# col_name            	data_type           	comment             
+	 	 
+ds                  	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: drop table src_rc_merge_test_stat

Modified: hive/trunk/ql/src/test/results/clientpositive/alter_partition_format_loc.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/alter_partition_format_loc.q.out?rev=1418405&r1=1418404&r2=1418405&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/alter_partition_format_loc.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/alter_partition_format_loc.q.out Fri Dec  7 17:22:32 2012
@@ -7,8 +7,10 @@ PREHOOK: query: desc extended alter_part
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: desc extended alter_partition_format_test
 POSTHOOK: type: DESCTABLE
-key	int	
-value	string	
+# col_name            	data_type           	comment             
+	 	 
+key                 	int                 	None                
+value               	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: alter table alter_partition_format_test set fileformat rcfile
@@ -23,8 +25,10 @@ PREHOOK: query: desc extended alter_part
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: desc extended alter_partition_format_test
 POSTHOOK: type: DESCTABLE
-key	int	
-value	string	
+# col_name            	data_type           	comment             
+	 	 
+key                 	int                 	None                
+value               	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: type: ALTERTABLE_LOCATION
@@ -38,8 +42,10 @@ PREHOOK: query: desc extended alter_part
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: desc extended alter_partition_format_test
 POSTHOOK: type: DESCTABLE
-key	int	
-value	string	
+# col_name            	data_type           	comment             
+	 	 
+key                 	int                 	None                
+value               	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: drop table alter_partition_format_test
@@ -68,9 +74,16 @@ PREHOOK: query: desc extended alter_part
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: desc extended alter_partition_format_test partition(ds='2010')
 POSTHOOK: type: DESCTABLE
-key	int	
-value	string	
-ds	string	
+# col_name            	data_type           	comment             
+	 	 
+key                 	int                 	None                
+value               	string              	None                
+ds                  	string              	None                
+	 	 
+# Partition Information	 	 
+# col_name            	data_type           	comment             
+	 	 
+ds                  	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: alter table alter_partition_format_test partition(ds='2010') set fileformat rcfile
@@ -86,9 +99,16 @@ PREHOOK: query: desc extended alter_part
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: desc extended alter_partition_format_test partition(ds='2010')
 POSTHOOK: type: DESCTABLE
-key	int	
-value	string	
-ds	string	
+# col_name            	data_type           	comment             
+	 	 
+key                 	int                 	None                
+value               	string              	None                
+ds                  	string              	None                
+	 	 
+# Partition Information	 	 
+# col_name            	data_type           	comment             
+	 	 
+ds                  	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: type: ALTERPARTITION_LOCATION
@@ -103,18 +123,32 @@ PREHOOK: query: desc extended alter_part
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: desc extended alter_partition_format_test partition(ds='2010')
 POSTHOOK: type: DESCTABLE
-key	int	
-value	string	
-ds	string	
+# col_name            	data_type           	comment             
+	 	 
+key                 	int                 	None                
+value               	string              	None                
+ds                  	string              	None                
+	 	 
+# Partition Information	 	 
+# col_name            	data_type           	comment             
+	 	 
+ds                  	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: desc extended alter_partition_format_test
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: desc extended alter_partition_format_test
 POSTHOOK: type: DESCTABLE
-key	int	
-value	string	
-ds	string	
+# col_name            	data_type           	comment             
+	 	 
+key                 	int                 	None                
+value               	string              	None                
+ds                  	string              	None                
+	 	 
+# Partition Information	 	 
+# col_name            	data_type           	comment             
+	 	 
+ds                  	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: alter table alter_partition_format_test set fileformat rcfile
@@ -129,9 +163,16 @@ PREHOOK: query: desc extended alter_part
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: desc extended alter_partition_format_test
 POSTHOOK: type: DESCTABLE
-key	int	
-value	string	
-ds	string	
+# col_name            	data_type           	comment             
+	 	 
+key                 	int                 	None                
+value               	string              	None                
+ds                  	string              	None                
+	 	 
+# Partition Information	 	 
+# col_name            	data_type           	comment             
+	 	 
+ds                  	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: type: ALTERTABLE_LOCATION
@@ -145,9 +186,16 @@ PREHOOK: query: desc extended alter_part
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: desc extended alter_partition_format_test
 POSTHOOK: type: DESCTABLE
-key	int	
-value	string	
-ds	string	
+# col_name            	data_type           	comment             
+	 	 
+key                 	int                 	None                
+value               	string              	None                
+ds                  	string              	None                
+	 	 
+# Partition Information	 	 
+# col_name            	data_type           	comment             
+	 	 
+ds                  	string              	None                
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: drop table alter_partition_format_test



Mime
View raw message