You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2013/04/16 20:47:15 UTC
svn commit: r1468553 [1/3] - in /hive/branches/branch-0.11:
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/ jdbc/src/test/org/apache/h...
Author: hashutosh
Date: Tue Apr 16 18:47:12 2013
New Revision: 1468553
URL: http://svn.apache.org/r1468553
Log:
HIVE-4191 : describe table output always prints as if formatted keyword is specified (Thejas Nair via Ashutosh Chauhan)
Modified:
hive/branches/branch-0.11/contrib/src/test/results/clientpositive/fileformat_base64.q.out
hive/branches/branch-0.11/contrib/src/test/results/clientpositive/serde_s3.q.out
hive/branches/branch-0.11/hbase-handler/src/test/results/positive/hbase_queries.q.out
hive/branches/branch-0.11/hwi/src/test/org/apache/hadoop/hive/hwi/TestHWISessionManager.java
hive/branches/branch-0.11/jdbc/src/test/org/apache/hadoop/hive/jdbc/TestJdbcDriver.java
hive/branches/branch-0.11/jdbc/src/test/org/apache/hive/jdbc/TestJdbcDriver2.java
hive/branches/branch-0.11/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java
hive/branches/branch-0.11/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/MetaDataFormatUtils.java
hive/branches/branch-0.11/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/TextMetaDataFormatter.java
hive/branches/branch-0.11/ql/src/test/results/clientnegative/alter_partition_coltype_2columns.q.out
hive/branches/branch-0.11/ql/src/test/results/clientnegative/alter_partition_coltype_invalidcolname.q.out
hive/branches/branch-0.11/ql/src/test/results/clientnegative/alter_partition_coltype_invalidtype.q.out
hive/branches/branch-0.11/ql/src/test/results/clientnegative/desc_failure2.q.out
hive/branches/branch-0.11/ql/src/test/results/clientnegative/drop_partition_filter_failure2.q.out
hive/branches/branch-0.11/ql/src/test/results/clientnegative/protectmode_part_no_drop.q.out
hive/branches/branch-0.11/ql/src/test/results/clientnegative/protectmode_tbl2.q.out
hive/branches/branch-0.11/ql/src/test/results/clientnegative/protectmode_tbl3.q.out
hive/branches/branch-0.11/ql/src/test/results/clientnegative/protectmode_tbl4.q.out
hive/branches/branch-0.11/ql/src/test/results/clientnegative/protectmode_tbl5.q.out
hive/branches/branch-0.11/ql/src/test/results/clientnegative/protectmode_tbl_no_drop.q.out
hive/branches/branch-0.11/ql/src/test/results/clientnegative/set_hiveconf_validation0.q.out
hive/branches/branch-0.11/ql/src/test/results/clientnegative/set_hiveconf_validation1.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter1.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter2.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter3.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter4.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter5.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter_index.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter_merge_2.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter_merge_stats.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter_partition_coltype.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter_partition_format_loc.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter_table_serde.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter_view_rename.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/authorization_7.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/autogen_colalias.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/avro_change_schema.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/avro_evolved_schemas.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/avro_joins.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/avro_sanity_test.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/avro_schema_error_message.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/avro_schema_literal.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/ba_table1.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/ba_table2.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/ba_table_union.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/binary_table_bincolserde.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/binary_table_colserde.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/bucket_groupby.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/columnarserde_create_shortcut.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/combine3.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/convert_enum_to_string.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/create_1.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/create_default_prop.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/create_escape.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/create_insert_outputformat.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/create_like_view.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/create_nested_type.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/create_view.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/create_view_partitioned.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/database.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/ddltime.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/describe_comment_indent.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/describe_syntax.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/describe_table.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/describe_xpath.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/drop_partitions_filter.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/drop_partitions_filter2.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/drop_partitions_filter3.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/drop_partitions_ignore_protection.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/exim_00_nonpart_empty.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/exim_01_nonpart.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/exim_02_00_part_empty.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/exim_02_part.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/exim_03_nonpart_over_compat.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/exim_04_all_part.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/exim_04_evolved_parts.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/exim_05_some_part.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/exim_06_one_part.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/exim_07_all_part_over_nonoverlap.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/exim_08_nonpart_rename.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/exim_09_part_spec_nonoverlap.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/exim_10_external_managed.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/exim_11_managed_external.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/exim_12_external_location.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/exim_13_managed_location.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/exim_14_managed_location_over_existing.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/exim_15_external_part.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/exim_18_part_external.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/exim_19_00_part_external_location.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/exim_19_part_external_location.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/exim_20_part_managed_location.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/fileformat_sequencefile.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/fileformat_text.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/index_creation.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/inoutdriver.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/input1.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/input10.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/input15.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/input2.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/input3.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/input_part10.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/inputddl2.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/inputddl3.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/inputddl4.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/inputddl5.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/inputddl6.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/inputddl7.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/inputddl8.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/join_thrift.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/load_dyn_part1.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/load_dyn_part10.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/load_dyn_part11.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/load_dyn_part12.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/load_dyn_part13.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/load_dyn_part14.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/load_dyn_part2.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/load_dyn_part3.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/load_dyn_part4.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/load_dyn_part5.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/load_dyn_part6.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/load_dyn_part7.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/load_dyn_part8.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/load_dyn_part9.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/load_fs.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/multi_sahooks.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/partition_schema1.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/protectmode.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/protectmode2.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/rcfile_bigdata.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/rcfile_columnar.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/rcfile_default_format.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/rename_column.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/serde_reported_schema.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/show_columns.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/stats0.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/tablename_with_select.q.out
hive/branches/branch-0.11/ql/src/test/results/clientpositive/updateAccessTime.q.out
Modified: hive/branches/branch-0.11/contrib/src/test/results/clientpositive/fileformat_base64.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/contrib/src/test/results/clientpositive/fileformat_base64.q.out?rev=1468553&r1=1468552&r2=1468553&view=diff
==============================================================================
--- hive/branches/branch-0.11/contrib/src/test/results/clientpositive/fileformat_base64.q.out (original)
+++ hive/branches/branch-0.11/contrib/src/test/results/clientpositive/fileformat_base64.q.out Tue Apr 16 18:47:12 2013
@@ -44,8 +44,6 @@ PREHOOK: query: DESCRIBE EXTENDED base64
PREHOOK: type: DESCTABLE
POSTHOOK: query: DESCRIBE EXTENDED base64_test
POSTHOOK: type: DESCTABLE
-# col_name data_type comment
-
key int None
value string None
Modified: hive/branches/branch-0.11/contrib/src/test/results/clientpositive/serde_s3.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/contrib/src/test/results/clientpositive/serde_s3.q.out?rev=1468553&r1=1468552&r2=1468553&view=diff
==============================================================================
--- hive/branches/branch-0.11/contrib/src/test/results/clientpositive/serde_s3.q.out (original)
+++ hive/branches/branch-0.11/contrib/src/test/results/clientpositive/serde_s3.q.out Tue Apr 16 18:47:12 2013
@@ -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
Modified: hive/branches/branch-0.11/hbase-handler/src/test/results/positive/hbase_queries.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/hbase-handler/src/test/results/positive/hbase_queries.q.out?rev=1468553&r1=1468552&r2=1468553&view=diff
==============================================================================
--- hive/branches/branch-0.11/hbase-handler/src/test/results/positive/hbase_queries.q.out (original)
+++ hive/branches/branch-0.11/hbase-handler/src/test/results/positive/hbase_queries.q.out Tue Apr 16 18:47:12 2013
@@ -17,8 +17,6 @@ PREHOOK: query: DESCRIBE EXTENDED hbase_
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
Modified: hive/branches/branch-0.11/hwi/src/test/org/apache/hadoop/hive/hwi/TestHWISessionManager.java
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/hwi/src/test/org/apache/hadoop/hive/hwi/TestHWISessionManager.java?rev=1468553&r1=1468552&r2=1468553&view=diff
==============================================================================
--- hive/branches/branch-0.11/hwi/src/test/org/apache/hadoop/hive/hwi/TestHWISessionManager.java (original)
+++ hive/branches/branch-0.11/hwi/src/test/org/apache/hadoop/hive/hwi/TestHWISessionManager.java Tue Apr 16 18:47:12 2013
@@ -121,15 +121,10 @@ public class TestHWISessionManager exten
ArrayList<ArrayList<String>> 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"));
Modified: hive/branches/branch-0.11/jdbc/src/test/org/apache/hadoop/hive/jdbc/TestJdbcDriver.java
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/jdbc/src/test/org/apache/hadoop/hive/jdbc/TestJdbcDriver.java?rev=1468553&r1=1468552&r2=1468553&view=diff
==============================================================================
--- hive/branches/branch-0.11/jdbc/src/test/org/apache/hadoop/hive/jdbc/TestJdbcDriver.java (original)
+++ hive/branches/branch-0.11/jdbc/src/test/org/apache/hadoop/hive/jdbc/TestJdbcDriver.java Tue Apr 16 18:47:12 2013
@@ -766,17 +766,6 @@ public class TestJdbcDriver extends Test
assertNotNull("Statement is null", stmt);
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(true, res.getString(1).contains("col_name"));
- assertEquals(true, res.getString(2).contains("data_type"));
- assertEquals(true, res.getString(3).contains("comment"));
- res.next();
res.next();
assertEquals(true, res.getString(1).contains("under_col"));
assertEquals(true, res.getString(2).contains("int"));
Modified: hive/branches/branch-0.11/jdbc/src/test/org/apache/hive/jdbc/TestJdbcDriver2.java
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/jdbc/src/test/org/apache/hive/jdbc/TestJdbcDriver2.java?rev=1468553&r1=1468552&r2=1468553&view=diff
==============================================================================
--- hive/branches/branch-0.11/jdbc/src/test/org/apache/hive/jdbc/TestJdbcDriver2.java (original)
+++ hive/branches/branch-0.11/jdbc/src/test/org/apache/hive/jdbc/TestJdbcDriver2.java Tue Apr 16 18:47:12 2013
@@ -817,9 +817,6 @@ public class TestJdbcDriver2 extends Tes
ResultSet res = stmt.executeQuery("describe " + tableName);
- res.next(); // skip header 1
- res.next(); // skip header 2
-
res.next();
assertEquals("Column name 'under_col' not found", "under_col", res.getString(1).trim());
assertEquals("Column type 'under_col' for column under_col not found", "int", res
Modified: hive/branches/branch-0.11/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java?rev=1468553&r1=1468552&r2=1468553&view=diff
==============================================================================
--- hive/branches/branch-0.11/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java (original)
+++ hive/branches/branch-0.11/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java Tue Apr 16 18:47:12 2013
@@ -109,10 +109,10 @@ import org.apache.hadoop.hive.ql.parse.B
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 class DDLTask extends Task<DDLWor
List<FieldSchema> 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) {
Modified: hive/branches/branch-0.11/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/MetaDataFormatUtils.java
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/MetaDataFormatUtils.java?rev=1468553&r1=1468552&r2=1468553&view=diff
==============================================================================
--- hive/branches/branch-0.11/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/MetaDataFormatUtils.java (original)
+++ hive/branches/branch-0.11/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/MetaDataFormatUtils.java Tue Apr 16 18:47:12 2013
@@ -62,16 +62,22 @@ public final class MetaDataFormatUtils {
columnInformation.append(LINE_DELIM);
}
- public static String getAllColumnsInformation(List<FieldSchema> cols) {
+ public static String getAllColumnsInformation(List<FieldSchema> 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<FieldSchema> cols, List<FieldSchema> partCols) {
+ public static String getAllColumnsInformation(List<FieldSchema> cols, List<FieldSchema> partCols,
+ boolean printHeader) {
StringBuilder columnInformation = new StringBuilder(DEFAULT_STRINGBUILDER_SIZE);
- formatColumnsHeader(columnInformation);
+ if(printHeader){
+ formatColumnsHeader(columnInformation);
+ }
formatAllFields(columnInformation, cols);
if ((partCols != null) && (!partCols.isEmpty())) {
Modified: hive/branches/branch-0.11/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/TextMetaDataFormatter.java
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/TextMetaDataFormatter.java?rev=1468553&r1=1468552&r2=1468553&view=diff
==============================================================================
--- hive/branches/branch-0.11/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/TextMetaDataFormatter.java (original)
+++ hive/branches/branch-0.11/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/TextMetaDataFormatter.java Tue Apr 16 18:47:12 2013
@@ -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 class TextMetaDataFormatter imple
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 class TextMetaDataFormatter imple
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());
Modified: hive/branches/branch-0.11/ql/src/test/results/clientnegative/alter_partition_coltype_2columns.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/ql/src/test/results/clientnegative/alter_partition_coltype_2columns.q.out?rev=1468553&r1=1468552&r2=1468553&view=diff
==============================================================================
--- hive/branches/branch-0.11/ql/src/test/results/clientnegative/alter_partition_coltype_2columns.q.out (original)
+++ hive/branches/branch-0.11/ql/src/test/results/clientnegative/alter_partition_coltype_2columns.q.out Tue Apr 16 18:47:12 2013
@@ -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
Modified: hive/branches/branch-0.11/ql/src/test/results/clientnegative/alter_partition_coltype_invalidcolname.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/ql/src/test/results/clientnegative/alter_partition_coltype_invalidcolname.q.out?rev=1468553&r1=1468552&r2=1468553&view=diff
==============================================================================
--- hive/branches/branch-0.11/ql/src/test/results/clientnegative/alter_partition_coltype_invalidcolname.q.out (original)
+++ hive/branches/branch-0.11/ql/src/test/results/clientnegative/alter_partition_coltype_invalidcolname.q.out Tue Apr 16 18:47:12 2013
@@ -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
Modified: hive/branches/branch-0.11/ql/src/test/results/clientnegative/alter_partition_coltype_invalidtype.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/ql/src/test/results/clientnegative/alter_partition_coltype_invalidtype.q.out?rev=1468553&r1=1468552&r2=1468553&view=diff
==============================================================================
--- hive/branches/branch-0.11/ql/src/test/results/clientnegative/alter_partition_coltype_invalidtype.q.out (original)
+++ hive/branches/branch-0.11/ql/src/test/results/clientnegative/alter_partition_coltype_invalidtype.q.out Tue Apr 16 18:47:12 2013
@@ -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
Modified: hive/branches/branch-0.11/ql/src/test/results/clientnegative/desc_failure2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/ql/src/test/results/clientnegative/desc_failure2.q.out?rev=1468553&r1=1468552&r2=1468553&view=diff
==============================================================================
--- hive/branches/branch-0.11/ql/src/test/results/clientnegative/desc_failure2.q.out (original)
+++ hive/branches/branch-0.11/ql/src/test/results/clientnegative/desc_failure2.q.out Tue Apr 16 18:47:12 2013
@@ -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
Modified: hive/branches/branch-0.11/ql/src/test/results/clientnegative/drop_partition_filter_failure2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/ql/src/test/results/clientnegative/drop_partition_filter_failure2.q.out?rev=1468553&r1=1468552&r2=1468553&view=diff
==============================================================================
--- hive/branches/branch-0.11/ql/src/test/results/clientnegative/drop_partition_filter_failure2.q.out (original)
+++ hive/branches/branch-0.11/ql/src/test/results/clientnegative/drop_partition_filter_failure2.q.out Tue Apr 16 18:47:12 2013
@@ -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
Modified: hive/branches/branch-0.11/ql/src/test/results/clientnegative/protectmode_part_no_drop.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/ql/src/test/results/clientnegative/protectmode_part_no_drop.q.out?rev=1468553&r1=1468552&r2=1468553&view=diff
==============================================================================
--- hive/branches/branch-0.11/ql/src/test/results/clientnegative/protectmode_part_no_drop.q.out (original)
+++ hive/branches/branch-0.11/ql/src/test/results/clientnegative/protectmode_part_no_drop.q.out Tue Apr 16 18:47:12 2013
@@ -31,8 +31,6 @@ PREHOOK: query: desc extended tbl_protec
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
Modified: hive/branches/branch-0.11/ql/src/test/results/clientnegative/protectmode_tbl2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/ql/src/test/results/clientnegative/protectmode_tbl2.q.out?rev=1468553&r1=1468552&r2=1468553&view=diff
==============================================================================
--- hive/branches/branch-0.11/ql/src/test/results/clientnegative/protectmode_tbl2.q.out (original)
+++ hive/branches/branch-0.11/ql/src/test/results/clientnegative/protectmode_tbl2.q.out Tue Apr 16 18:47:12 2013
@@ -46,8 +46,6 @@ PREHOOK: query: desc extended tbl_protec
PREHOOK: type: DESCTABLE
POSTHOOK: query: desc extended tbl_protectmode2
POSTHOOK: type: DESCTABLE
-# col_name data_type comment
-
col string None
p string None
Modified: hive/branches/branch-0.11/ql/src/test/results/clientnegative/protectmode_tbl3.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/ql/src/test/results/clientnegative/protectmode_tbl3.q.out?rev=1468553&r1=1468552&r2=1468553&view=diff
==============================================================================
--- hive/branches/branch-0.11/ql/src/test/results/clientnegative/protectmode_tbl3.q.out (original)
+++ hive/branches/branch-0.11/ql/src/test/results/clientnegative/protectmode_tbl3.q.out Tue Apr 16 18:47:12 2013
@@ -31,8 +31,6 @@ PREHOOK: query: desc extended tbl_protec
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 ####
Modified: hive/branches/branch-0.11/ql/src/test/results/clientnegative/protectmode_tbl4.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/ql/src/test/results/clientnegative/protectmode_tbl4.q.out?rev=1468553&r1=1468552&r2=1468553&view=diff
==============================================================================
--- hive/branches/branch-0.11/ql/src/test/results/clientnegative/protectmode_tbl4.q.out (original)
+++ hive/branches/branch-0.11/ql/src/test/results/clientnegative/protectmode_tbl4.q.out Tue Apr 16 18:47:12 2013
@@ -55,8 +55,6 @@ PREHOOK: query: desc extended tbl_protec
PREHOOK: type: DESCTABLE
POSTHOOK: query: desc extended tbl_protectmode_tbl4
POSTHOOK: type: DESCTABLE
-# col_name data_type comment
-
col string None
p string None
Modified: hive/branches/branch-0.11/ql/src/test/results/clientnegative/protectmode_tbl5.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/ql/src/test/results/clientnegative/protectmode_tbl5.q.out?rev=1468553&r1=1468552&r2=1468553&view=diff
==============================================================================
--- hive/branches/branch-0.11/ql/src/test/results/clientnegative/protectmode_tbl5.q.out (original)
+++ hive/branches/branch-0.11/ql/src/test/results/clientnegative/protectmode_tbl5.q.out Tue Apr 16 18:47:12 2013
@@ -55,8 +55,6 @@ PREHOOK: query: desc extended tbl_protec
PREHOOK: type: DESCTABLE
POSTHOOK: query: desc extended tbl_protectmode_tbl5
POSTHOOK: type: DESCTABLE
-# col_name data_type comment
-
col string None
p string None
Modified: hive/branches/branch-0.11/ql/src/test/results/clientnegative/protectmode_tbl_no_drop.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/ql/src/test/results/clientnegative/protectmode_tbl_no_drop.q.out?rev=1468553&r1=1468552&r2=1468553&view=diff
==============================================================================
--- hive/branches/branch-0.11/ql/src/test/results/clientnegative/protectmode_tbl_no_drop.q.out (original)
+++ hive/branches/branch-0.11/ql/src/test/results/clientnegative/protectmode_tbl_no_drop.q.out Tue Apr 16 18:47:12 2013
@@ -31,8 +31,6 @@ PREHOOK: query: desc extended tbl_protec
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 ####
Modified: hive/branches/branch-0.11/ql/src/test/results/clientnegative/set_hiveconf_validation0.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/ql/src/test/results/clientnegative/set_hiveconf_validation0.q.out?rev=1468553&r1=1468552&r2=1468553&view=diff
==============================================================================
--- hive/branches/branch-0.11/ql/src/test/results/clientnegative/set_hiveconf_validation0.q.out (original)
+++ hive/branches/branch-0.11/ql/src/test/results/clientnegative/set_hiveconf_validation0.q.out Tue Apr 16 18:47:12 2013
@@ -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.
Modified: hive/branches/branch-0.11/ql/src/test/results/clientnegative/set_hiveconf_validation1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/ql/src/test/results/clientnegative/set_hiveconf_validation1.q.out?rev=1468553&r1=1468552&r2=1468553&view=diff
==============================================================================
--- hive/branches/branch-0.11/ql/src/test/results/clientnegative/set_hiveconf_validation1.q.out (original)
+++ hive/branches/branch-0.11/ql/src/test/results/clientnegative/set_hiveconf_validation1.q.out Tue Apr 16 18:47:12 2013
@@ -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.
Modified: hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter1.q.out?rev=1468553&r1=1468552&r2=1468553&view=diff
==============================================================================
--- hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter1.q.out (original)
+++ hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter1.q.out Tue Apr 16 18:47:12 2013
@@ -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
Modified: hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter2.q.out?rev=1468553&r1=1468552&r2=1468553&view=diff
==============================================================================
--- hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter2.q.out (original)
+++ hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter2.q.out Tue Apr 16 18:47:12 2013
@@ -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
Modified: hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter3.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter3.q.out?rev=1468553&r1=1468552&r2=1468553&view=diff
==============================================================================
--- hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter3.q.out (original)
+++ hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter3.q.out Tue Apr 16 18:47:12 2013
@@ -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 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), ]
-# 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(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), ]
-# col_name data_type comment
-
col1 string None
pcol1 string None
pcol2 string None
Modified: hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter4.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter4.q.out?rev=1468553&r1=1468552&r2=1468553&view=diff
==============================================================================
--- hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter4.q.out (original)
+++ hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter4.q.out Tue Apr 16 18:47:12 2013
@@ -7,8 +7,6 @@ PREHOOK: query: DESCRIBE EXTENDED set_bu
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_bu
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_bu
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_bu
PREHOOK: type: DESCTABLE
POSTHOOK: query: DESCRIBE EXTENDED set_bucketing_test
POSTHOOK: type: DESCTABLE
-# col_name data_type comment
-
key int None
value string None
Modified: hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter5.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter5.q.out?rev=1468553&r1=1468552&r2=1468553&view=diff
==============================================================================
--- hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter5.q.out (original)
+++ hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter5.q.out Tue Apr 16 18:47:12 2013
@@ -41,8 +41,6 @@ PREHOOK: query: describe extended alter5
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 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), ]
-# col_name data_type comment
-
col1 string None
dt string None
Modified: hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter_index.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter_index.q.out?rev=1468553&r1=1468552&r2=1468553&view=diff
==============================================================================
--- hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter_index.q.out (original)
+++ hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter_index.q.out Tue Apr 16 18:47:12 2013
@@ -11,8 +11,6 @@ PREHOOK: query: desc extended default__s
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<bigint>
@@ -26,8 +24,6 @@ PREHOOK: query: desc extended default__s
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<bigint>
Modified: hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter_merge_2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter_merge_2.q.out?rev=1468553&r1=1468552&r2=1468553&view=diff
==============================================================================
--- hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter_merge_2.q.out (original)
+++ hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter_merge_2.q.out Tue Apr 16 18:47:12 2013
@@ -14,8 +14,6 @@ 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
-# col_name data_type comment
-
key int None
value string None
ds string None
Modified: hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter_merge_stats.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter_merge_stats.q.out?rev=1468553&r1=1468552&r2=1468553&view=diff
==============================================================================
--- hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter_merge_stats.q.out (original)
+++ hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter_merge_stats.q.out Tue Apr 16 18:47:12 2013
@@ -42,8 +42,6 @@ PREHOOK: query: desc extended src_rc_mer
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_mer
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_mer
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_mer
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_mer
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_mer
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
Modified: hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter_partition_coltype.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter_partition_coltype.q.out?rev=1468553&r1=1468552&r2=1468553&view=diff
==============================================================================
--- hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter_partition_coltype.q.out (original)
+++ hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter_partition_coltype.q.out Tue Apr 16 18:47:12 2013
@@ -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 PARTITI
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 PARTITI
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 PARTITI
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 PARTITI
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
Modified: hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter_partition_format_loc.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter_partition_format_loc.q.out?rev=1468553&r1=1468552&r2=1468553&view=diff
==============================================================================
--- hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter_partition_format_loc.q.out (original)
+++ hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter_partition_format_loc.q.out Tue Apr 16 18:47:12 2013
@@ -7,8 +7,6 @@ PREHOOK: query: desc extended alter_part
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_part
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_part
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_part
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_part
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_part
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_part
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_part
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_part
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
Modified: hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter_table_serde.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter_table_serde.q.out?rev=1468553&r1=1468552&r2=1468553&view=diff
==============================================================================
--- hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter_table_serde.q.out (original)
+++ hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter_table_serde.q.out Tue Apr 16 18:47:12 2013
@@ -9,8 +9,6 @@ PREHOOK: query: describe extended test_t
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_t
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_t
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_t
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_t
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_t
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_t
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_t
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
Modified: hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter_view_rename.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter_view_rename.q.out?rev=1468553&r1=1468552&r2=1468553&view=diff
==============================================================================
--- hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter_view_rename.q.out (original)
+++ hive/branches/branch-0.11/ql/src/test/results/clientpositive/alter_view_rename.q.out Tue Apr 16 18:47:12 2013
@@ -12,8 +12,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
@@ -32,8 +30,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
Modified: hive/branches/branch-0.11/ql/src/test/results/clientpositive/authorization_7.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/ql/src/test/results/clientpositive/authorization_7.q.out?rev=1468553&r1=1468552&r2=1468553&view=diff
==============================================================================
--- hive/branches/branch-0.11/ql/src/test/results/clientpositive/authorization_7.q.out (original)
+++ hive/branches/branch-0.11/ql/src/test/results/clientpositive/authorization_7.q.out Tue Apr 16 18:47:12 2013
@@ -11,8 +11,6 @@ PREHOOK: query: DESCRIBE src_authorizati
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_authorizati
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
Modified: hive/branches/branch-0.11/ql/src/test/results/clientpositive/autogen_colalias.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/ql/src/test/results/clientpositive/autogen_colalias.q.out?rev=1468553&r1=1468552&r2=1468553&view=diff
==============================================================================
--- hive/branches/branch-0.11/ql/src/test/results/clientpositive/autogen_colalias.q.out (original)
+++ hive/branches/branch-0.11/ql/src/test/results/clientpositive/autogen_colalias.q.out Tue Apr 16 18:47:12 2013
@@ -19,8 +19,6 @@ PREHOOK: query: describe dest_grouped_ol
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_ol
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_ne
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_ne
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
Modified: hive/branches/branch-0.11/ql/src/test/results/clientpositive/avro_change_schema.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/ql/src/test/results/clientpositive/avro_change_schema.q.out?rev=1468553&r1=1468552&r2=1468553&view=diff
==============================================================================
--- hive/branches/branch-0.11/ql/src/test/results/clientpositive/avro_change_schema.q.out (original)
+++ hive/branches/branch-0.11/ql/src/test/results/clientpositive/avro_change_schema.q.out Tue Apr 16 18:47:12 2013
@@ -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
Modified: hive/branches/branch-0.11/ql/src/test/results/clientpositive/avro_evolved_schemas.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/ql/src/test/results/clientpositive/avro_evolved_schemas.q.out?rev=1468553&r1=1468552&r2=1468553&view=diff
==============================================================================
--- hive/branches/branch-0.11/ql/src/test/results/clientpositive/avro_evolved_schemas.q.out (original)
+++ hive/branches/branch-0.11/ql/src/test/results/clientpositive/avro_evolved_schemas.q.out Tue Apr 16 18:47:12 2013
@@ -75,8 +75,6 @@ PREHOOK: query: DESCRIBE doctors_with_ne
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
Modified: hive/branches/branch-0.11/ql/src/test/results/clientpositive/avro_joins.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/ql/src/test/results/clientpositive/avro_joins.q.out?rev=1468553&r1=1468552&r2=1468553&view=diff
==============================================================================
--- hive/branches/branch-0.11/ql/src/test/results/clientpositive/avro_joins.q.out (original)
+++ hive/branches/branch-0.11/ql/src/test/results/clientpositive/avro_joins.q.out Tue Apr 16 18:47:12 2013
@@ -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
Modified: hive/branches/branch-0.11/ql/src/test/results/clientpositive/avro_sanity_test.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/ql/src/test/results/clientpositive/avro_sanity_test.q.out?rev=1468553&r1=1468552&r2=1468553&view=diff
==============================================================================
--- hive/branches/branch-0.11/ql/src/test/results/clientpositive/avro_sanity_test.q.out (original)
+++ hive/branches/branch-0.11/ql/src/test/results/clientpositive/avro_sanity_test.q.out Tue Apr 16 18:47:12 2013
@@ -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
Modified: hive/branches/branch-0.11/ql/src/test/results/clientpositive/avro_schema_error_message.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/ql/src/test/results/clientpositive/avro_schema_error_message.q.out?rev=1468553&r1=1468552&r2=1468553&view=diff
==============================================================================
--- hive/branches/branch-0.11/ql/src/test/results/clientpositive/avro_schema_error_message.q.out (original)
+++ hive/branches/branch-0.11/ql/src/test/results/clientpositive/avro_schema_error_message.q.out Tue Apr 16 18:47:12 2013
@@ -21,8 +21,6 @@ PREHOOK: query: DESCRIBE avro_with_no_sc
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