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 2014/03/21 05:15:27 UTC
svn commit: r1579876 [1/16] - in /hive/trunk:
common/src/java/org/apache/hadoop/hive/conf/
contrib/src/test/results/clientpositive/
hbase-handler/src/test/results/positive/
itests/test-serde/src/main/java/org/apache/hadoop/hive/serde2/
metastore/src/ja...
Author: hashutosh
Date: Fri Mar 21 04:15:18 2014
New Revision: 1579876
URL: http://svn.apache.org/r1579876
Log:
HIVE-6681 : Describe table sometimes shows from deserializer for column comments (Ashutosh Chauhan via Gunther Hagleitner)
Modified:
hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
hive/trunk/contrib/src/test/results/clientpositive/fileformat_base64.q.out
hive/trunk/hbase-handler/src/test/results/positive/hbase_stats.q.out
hive/trunk/hbase-handler/src/test/results/positive/hbase_stats2.q.out
hive/trunk/hbase-handler/src/test/results/positive/hbase_stats3.q.out
hive/trunk/hbase-handler/src/test/results/positive/hbase_stats_empty_partition.q.out
hive/trunk/itests/test-serde/src/main/java/org/apache/hadoop/hive/serde2/TestSerDe.java
hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreUtils.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/Partition.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/Table.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/parse/SemanticAnalyzer.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/TaskCompiler.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/CreateTableDesc.java
hive/trunk/ql/src/test/results/clientnegative/alter_partition_coltype_2columns.q.out
hive/trunk/ql/src/test/results/clientnegative/alter_partition_coltype_invalidcolname.q.out
hive/trunk/ql/src/test/results/clientnegative/alter_partition_coltype_invalidtype.q.out
hive/trunk/ql/src/test/results/clientnegative/alter_view_as_select_with_partition.q.out
hive/trunk/ql/src/test/results/clientnegative/desc_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/stats_partialscan_autogether.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_merge_2.q.out
hive/trunk/ql/src/test/results/clientpositive/alter_merge_stats.q.out
hive/trunk/ql/src/test/results/clientpositive/alter_numbuckets_partitioned_table.q.out
hive/trunk/ql/src/test/results/clientpositive/alter_numbuckets_partitioned_table2.q.out
hive/trunk/ql/src/test/results/clientpositive/alter_partition_clusterby_sortby.q.out
hive/trunk/ql/src/test/results/clientpositive/alter_partition_coltype.q.out
hive/trunk/ql/src/test/results/clientpositive/alter_partition_format_loc.q.out
hive/trunk/ql/src/test/results/clientpositive/alter_skewed_table.q.out
hive/trunk/ql/src/test/results/clientpositive/alter_table_not_sorted.q.out
hive/trunk/ql/src/test/results/clientpositive/alter_table_serde.q.out
hive/trunk/ql/src/test/results/clientpositive/alter_table_serde2.q.out
hive/trunk/ql/src/test/results/clientpositive/alter_view_as_select.q.out
hive/trunk/ql/src/test/results/clientpositive/alter_view_rename.q.out
hive/trunk/ql/src/test/results/clientpositive/annotate_stats_filter.q.out
hive/trunk/ql/src/test/results/clientpositive/annotate_stats_groupby.q.out
hive/trunk/ql/src/test/results/clientpositive/annotate_stats_join.q.out
hive/trunk/ql/src/test/results/clientpositive/annotate_stats_part.q.out
hive/trunk/ql/src/test/results/clientpositive/annotate_stats_select.q.out
hive/trunk/ql/src/test/results/clientpositive/annotate_stats_table.q.out
hive/trunk/ql/src/test/results/clientpositive/annotate_stats_union.q.out
hive/trunk/ql/src/test/results/clientpositive/authorization_7.q.out
hive/trunk/ql/src/test/results/clientpositive/authorization_8.q.out
hive/trunk/ql/src/test/results/clientpositive/auto_join_reordering_values.q.out
hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_1.q.out
hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_11.q.out
hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_12.q.out
hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_2.q.out
hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_3.q.out
hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_4.q.out
hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_5.q.out
hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_7.q.out
hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_8.q.out
hive/trunk/ql/src/test/results/clientpositive/autogen_colalias.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_output_format.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/bucket1.q.out
hive/trunk/ql/src/test/results/clientpositive/bucket2.q.out
hive/trunk/ql/src/test/results/clientpositive/bucket3.q.out
hive/trunk/ql/src/test/results/clientpositive/bucket4.q.out
hive/trunk/ql/src/test/results/clientpositive/bucket5.q.out
hive/trunk/ql/src/test/results/clientpositive/bucket_groupby.q.out
hive/trunk/ql/src/test/results/clientpositive/bucket_map_join_1.q.out
hive/trunk/ql/src/test/results/clientpositive/bucket_map_join_2.q.out
hive/trunk/ql/src/test/results/clientpositive/bucketcontext_1.q.out
hive/trunk/ql/src/test/results/clientpositive/bucketcontext_2.q.out
hive/trunk/ql/src/test/results/clientpositive/bucketcontext_3.q.out
hive/trunk/ql/src/test/results/clientpositive/bucketcontext_4.q.out
hive/trunk/ql/src/test/results/clientpositive/bucketcontext_5.q.out
hive/trunk/ql/src/test/results/clientpositive/bucketcontext_6.q.out
hive/trunk/ql/src/test/results/clientpositive/bucketcontext_7.q.out
hive/trunk/ql/src/test/results/clientpositive/bucketcontext_8.q.out
hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin1.q.out
hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin10.q.out
hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin11.q.out
hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin12.q.out
hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin13.q.out
hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin2.q.out
hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin3.q.out
hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin4.q.out
hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin5.q.out
hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin7.q.out
hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin8.q.out
hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin9.q.out
hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin_negative.q.out
hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin_negative2.q.out
hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin_negative3.q.out
hive/trunk/ql/src/test/results/clientpositive/char_nested_types.q.out
hive/trunk/ql/src/test/results/clientpositive/char_serde.q.out
hive/trunk/ql/src/test/results/clientpositive/columnarserde_create_shortcut.q.out
hive/trunk/ql/src/test/results/clientpositive/columnstats_partlvl.q.out
hive/trunk/ql/src/test/results/clientpositive/columnstats_tbllvl.q.out
hive/trunk/ql/src/test/results/clientpositive/combine2_hadoop20.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_alter_list_bucketing_table1.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.q.out
hive/trunk/ql/src/test/results/clientpositive/create_like2.q.out
hive/trunk/ql/src/test/results/clientpositive/create_like_tbl_props.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_or_replace_view.q.out
hive/trunk/ql/src/test/results/clientpositive/create_skewed_table1.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/create_view_translate.q.out
hive/trunk/ql/src/test/results/clientpositive/ctas.q.out
hive/trunk/ql/src/test/results/clientpositive/ctas_colname.q.out
hive/trunk/ql/src/test/results/clientpositive/ctas_hadoop20.q.out
hive/trunk/ql/src/test/results/clientpositive/ctas_uses_database_location.q.out
hive/trunk/ql/src/test/results/clientpositive/custom_input_output_format.q.out
hive/trunk/ql/src/test/results/clientpositive/database.q.out
hive/trunk/ql/src/test/results/clientpositive/database_location.q.out
hive/trunk/ql/src/test/results/clientpositive/date_serde.q.out
hive/trunk/ql/src/test/results/clientpositive/dbtxnmgr_query5.q.out
hive/trunk/ql/src/test/results/clientpositive/ddltime.q.out
hive/trunk/ql/src/test/results/clientpositive/decimal_1.q.out
hive/trunk/ql/src/test/results/clientpositive/decimal_6.q.out
hive/trunk/ql/src/test/results/clientpositive/describe_formatted_view_partitioned.q.out
hive/trunk/ql/src/test/results/clientpositive/describe_pretty.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/disable_merge_for_bucketing.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/drop_partitions_ignore_protection.q.out
hive/trunk/ql/src/test/results/clientpositive/dynamic_partition_skip_default.q.out
hive/trunk/ql/src/test/results/clientpositive/exim_04_evolved_parts.q.out
hive/trunk/ql/src/test/results/clientpositive/exim_hidden_files.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/filter_join_breaktask.q.out
hive/trunk/ql/src/test/results/clientpositive/groupby_map_ppr.q.out
hive/trunk/ql/src/test/results/clientpositive/groupby_map_ppr_multi_distinct.q.out
hive/trunk/ql/src/test/results/clientpositive/groupby_ppr.q.out
hive/trunk/ql/src/test/results/clientpositive/groupby_ppr_multi_distinct.q.out
hive/trunk/ql/src/test/results/clientpositive/groupby_sort_1.q.out
hive/trunk/ql/src/test/results/clientpositive/groupby_sort_6.q.out
hive/trunk/ql/src/test/results/clientpositive/groupby_sort_skew_1.q.out
hive/trunk/ql/src/test/results/clientpositive/import_exported_table.q.out
hive/trunk/ql/src/test/results/clientpositive/infer_bucket_sort.q.out
hive/trunk/ql/src/test/results/clientpositive/infer_bucket_sort_bucketed_table.q.out
hive/trunk/ql/src/test/results/clientpositive/infer_bucket_sort_convert_join.q.out
hive/trunk/ql/src/test/results/clientpositive/infer_bucket_sort_dyn_part.q.out
hive/trunk/ql/src/test/results/clientpositive/infer_bucket_sort_grouping_operators.q.out
hive/trunk/ql/src/test/results/clientpositive/infer_bucket_sort_list_bucket.q.out
hive/trunk/ql/src/test/results/clientpositive/infer_bucket_sort_map_operators.q.out
hive/trunk/ql/src/test/results/clientpositive/infer_bucket_sort_merge.q.out
hive/trunk/ql/src/test/results/clientpositive/infer_bucket_sort_multi_insert.q.out
hive/trunk/ql/src/test/results/clientpositive/infer_bucket_sort_num_buckets.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/input23.q.out
hive/trunk/ql/src/test/results/clientpositive/input3.q.out
hive/trunk/ql/src/test/results/clientpositive/input42.q.out
hive/trunk/ql/src/test/results/clientpositive/input_part1.q.out
hive/trunk/ql/src/test/results/clientpositive/input_part10.q.out
hive/trunk/ql/src/test/results/clientpositive/input_part2.q.out
hive/trunk/ql/src/test/results/clientpositive/input_part7.q.out
hive/trunk/ql/src/test/results/clientpositive/input_part9.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/join17.q.out
hive/trunk/ql/src/test/results/clientpositive/join26.q.out
hive/trunk/ql/src/test/results/clientpositive/join32.q.out
hive/trunk/ql/src/test/results/clientpositive/join32_lessSize.q.out
hive/trunk/ql/src/test/results/clientpositive/join33.q.out
hive/trunk/ql/src/test/results/clientpositive/join34.q.out
hive/trunk/ql/src/test/results/clientpositive/join35.q.out
hive/trunk/ql/src/test/results/clientpositive/join9.q.out
hive/trunk/ql/src/test/results/clientpositive/join_filters_overlap.q.out
hive/trunk/ql/src/test/results/clientpositive/join_map_ppr.q.out
hive/trunk/ql/src/test/results/clientpositive/lb_fs_stats.q.out
hive/trunk/ql/src/test/results/clientpositive/list_bucket_dml_10.q.out
hive/trunk/ql/src/test/results/clientpositive/list_bucket_query_multiskew_1.q.out
hive/trunk/ql/src/test/results/clientpositive/list_bucket_query_multiskew_2.q.out
hive/trunk/ql/src/test/results/clientpositive/list_bucket_query_multiskew_3.q.out
hive/trunk/ql/src/test/results/clientpositive/list_bucket_query_oneskew_1.q.out
hive/trunk/ql/src/test/results/clientpositive/list_bucket_query_oneskew_2.q.out
hive/trunk/ql/src/test/results/clientpositive/list_bucket_query_oneskew_3.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/louter_join_ppr.q.out
hive/trunk/ql/src/test/results/clientpositive/merge3.q.out
hive/trunk/ql/src/test/results/clientpositive/metadataonly1.q.out
hive/trunk/ql/src/test/results/clientpositive/multi_sahooks.q.out
hive/trunk/ql/src/test/results/clientpositive/nested_complex.q.out
hive/trunk/ql/src/test/results/clientpositive/nullformat.q.out
hive/trunk/ql/src/test/results/clientpositive/nullformatCTAS.q.out
hive/trunk/ql/src/test/results/clientpositive/nullformatdir.q.out
hive/trunk/ql/src/test/results/clientpositive/orc_analyze.q.out
hive/trunk/ql/src/test/results/clientpositive/orc_create.q.out
hive/trunk/ql/src/test/results/clientpositive/orc_vectorization_ppd.q.out
hive/trunk/ql/src/test/results/clientpositive/outer_join_ppr.q.out
hive/trunk/ql/src/test/results/clientpositive/parallel_orderby.q.out
hive/trunk/ql/src/test/results/clientpositive/parquet_create.q.out
hive/trunk/ql/src/test/results/clientpositive/parquet_ctas.q.out
hive/trunk/ql/src/test/results/clientpositive/parquet_partitioned.q.out
hive/trunk/ql/src/test/results/clientpositive/part_inherit_tbl_props.q.out
hive/trunk/ql/src/test/results/clientpositive/part_inherit_tbl_props_empty.q.out
hive/trunk/ql/src/test/results/clientpositive/part_inherit_tbl_props_with_star.q.out
hive/trunk/ql/src/test/results/clientpositive/partition_date2.q.out
hive/trunk/ql/src/test/results/clientpositive/partition_schema1.q.out
hive/trunk/ql/src/test/results/clientpositive/pcr.q.out
hive/trunk/ql/src/test/results/clientpositive/ppd_join_filter.q.out
hive/trunk/ql/src/test/results/clientpositive/ppd_union_view.q.out
hive/trunk/ql/src/test/results/clientpositive/ppd_vc.q.out
hive/trunk/ql/src/test/results/clientpositive/ppr_allchildsarenull.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/push_or.q.out
hive/trunk/ql/src/test/results/clientpositive/quotedid_basic.q.out
hive/trunk/ql/src/test/results/clientpositive/quotedid_tblproperty.q.out
hive/trunk/ql/src/test/results/clientpositive/rand_partitionpruner1.q.out
hive/trunk/ql/src/test/results/clientpositive/rand_partitionpruner2.q.out
hive/trunk/ql/src/test/results/clientpositive/rand_partitionpruner3.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/reduce_deduplicate.q.out
hive/trunk/ql/src/test/results/clientpositive/regexp_extract.q.out
hive/trunk/ql/src/test/results/clientpositive/rename_column.q.out
hive/trunk/ql/src/test/results/clientpositive/router_join_ppr.q.out
hive/trunk/ql/src/test/results/clientpositive/sample1.q.out
hive/trunk/ql/src/test/results/clientpositive/sample10.q.out
hive/trunk/ql/src/test/results/clientpositive/sample2.q.out
hive/trunk/ql/src/test/results/clientpositive/sample4.q.out
hive/trunk/ql/src/test/results/clientpositive/sample5.q.out
hive/trunk/ql/src/test/results/clientpositive/sample6.q.out
hive/trunk/ql/src/test/results/clientpositive/sample7.q.out
hive/trunk/ql/src/test/results/clientpositive/sample8.q.out
hive/trunk/ql/src/test/results/clientpositive/sample9.q.out
hive/trunk/ql/src/test/results/clientpositive/serde_reported_schema.q.out
hive/trunk/ql/src/test/results/clientpositive/serde_user_properties.q.out
hive/trunk/ql/src/test/results/clientpositive/smb_mapjoin_11.q.out
hive/trunk/ql/src/test/results/clientpositive/smb_mapjoin_12.q.out
hive/trunk/ql/src/test/results/clientpositive/smb_mapjoin_13.q.out
hive/trunk/ql/src/test/results/clientpositive/smb_mapjoin_15.q.out
hive/trunk/ql/src/test/results/clientpositive/sort_merge_join_desc_5.q.out
hive/trunk/ql/src/test/results/clientpositive/sort_merge_join_desc_6.q.out
hive/trunk/ql/src/test/results/clientpositive/sort_merge_join_desc_7.q.out
hive/trunk/ql/src/test/results/clientpositive/stats0.q.out
hive/trunk/ql/src/test/results/clientpositive/stats1.q.out
hive/trunk/ql/src/test/results/clientpositive/stats10.q.out
hive/trunk/ql/src/test/results/clientpositive/stats11.q.out
hive/trunk/ql/src/test/results/clientpositive/stats12.q.out
hive/trunk/ql/src/test/results/clientpositive/stats13.q.out
hive/trunk/ql/src/test/results/clientpositive/stats14.q.out
hive/trunk/ql/src/test/results/clientpositive/stats15.q.out
hive/trunk/ql/src/test/results/clientpositive/stats16.q.out
hive/trunk/ql/src/test/results/clientpositive/stats18.q.out
hive/trunk/ql/src/test/results/clientpositive/stats19.q.out
hive/trunk/ql/src/test/results/clientpositive/stats2.q.out
hive/trunk/ql/src/test/results/clientpositive/stats20.q.out
hive/trunk/ql/src/test/results/clientpositive/stats3.q.out
hive/trunk/ql/src/test/results/clientpositive/stats4.q.out
hive/trunk/ql/src/test/results/clientpositive/stats5.q.out
hive/trunk/ql/src/test/results/clientpositive/stats6.q.out
hive/trunk/ql/src/test/results/clientpositive/stats7.q.out
hive/trunk/ql/src/test/results/clientpositive/stats8.q.out
hive/trunk/ql/src/test/results/clientpositive/stats9.q.out
hive/trunk/ql/src/test/results/clientpositive/stats_counter.q.out
hive/trunk/ql/src/test/results/clientpositive/stats_counter_partitioned.q.out
hive/trunk/ql/src/test/results/clientpositive/stats_empty_partition.q.out
hive/trunk/ql/src/test/results/clientpositive/stats_invalidation.q.out
hive/trunk/ql/src/test/results/clientpositive/stats_list_bucket.q.out
hive/trunk/ql/src/test/results/clientpositive/stats_noscan_1.q.out
hive/trunk/ql/src/test/results/clientpositive/stats_noscan_2.q.out
hive/trunk/ql/src/test/results/clientpositive/stats_only_null.q.out
hive/trunk/ql/src/test/results/clientpositive/stats_partscan_1.q.out
hive/trunk/ql/src/test/results/clientpositive/stats_partscan_1_23.q.out
hive/trunk/ql/src/test/results/clientpositive/statsfs.q.out
hive/trunk/ql/src/test/results/clientpositive/tablename_with_select.q.out
hive/trunk/ql/src/test/results/clientpositive/transform_ppr1.q.out
hive/trunk/ql/src/test/results/clientpositive/transform_ppr2.q.out
hive/trunk/ql/src/test/results/clientpositive/truncate_column.q.out
hive/trunk/ql/src/test/results/clientpositive/udf_explode.q.out
hive/trunk/ql/src/test/results/clientpositive/udf_reflect2.q.out
hive/trunk/ql/src/test/results/clientpositive/udtf_explode.q.out
hive/trunk/ql/src/test/results/clientpositive/unicode_notation.q.out
hive/trunk/ql/src/test/results/clientpositive/union22.q.out
hive/trunk/ql/src/test/results/clientpositive/union24.q.out
hive/trunk/ql/src/test/results/clientpositive/union_ppr.q.out
hive/trunk/ql/src/test/results/clientpositive/union_remove_1.q.out
hive/trunk/ql/src/test/results/clientpositive/union_remove_10.q.out
hive/trunk/ql/src/test/results/clientpositive/union_remove_11.q.out
hive/trunk/ql/src/test/results/clientpositive/union_remove_12.q.out
hive/trunk/ql/src/test/results/clientpositive/union_remove_13.q.out
hive/trunk/ql/src/test/results/clientpositive/union_remove_14.q.out
hive/trunk/ql/src/test/results/clientpositive/union_remove_15.q.out
hive/trunk/ql/src/test/results/clientpositive/union_remove_16.q.out
hive/trunk/ql/src/test/results/clientpositive/union_remove_17.q.out
hive/trunk/ql/src/test/results/clientpositive/union_remove_18.q.out
hive/trunk/ql/src/test/results/clientpositive/union_remove_19.q.out
hive/trunk/ql/src/test/results/clientpositive/union_remove_2.q.out
hive/trunk/ql/src/test/results/clientpositive/union_remove_20.q.out
hive/trunk/ql/src/test/results/clientpositive/union_remove_21.q.out
hive/trunk/ql/src/test/results/clientpositive/union_remove_22.q.out
hive/trunk/ql/src/test/results/clientpositive/union_remove_23.q.out
hive/trunk/ql/src/test/results/clientpositive/union_remove_24.q.out
hive/trunk/ql/src/test/results/clientpositive/union_remove_3.q.out
hive/trunk/ql/src/test/results/clientpositive/union_remove_4.q.out
hive/trunk/ql/src/test/results/clientpositive/union_remove_5.q.out
hive/trunk/ql/src/test/results/clientpositive/union_remove_7.q.out
hive/trunk/ql/src/test/results/clientpositive/union_remove_8.q.out
hive/trunk/ql/src/test/results/clientpositive/union_remove_9.q.out
hive/trunk/ql/src/test/results/clientpositive/updateAccessTime.q.out
hive/trunk/ql/src/test/results/clientpositive/varchar_nested_types.q.out
hive/trunk/ql/src/test/results/clientpositive/varchar_serde.q.out
hive/trunk/ql/src/test/results/clientpositive/vectorization_part.q.out
hive/trunk/ql/src/test/results/clientpositive/vectorization_part_project.q.out
hive/trunk/ql/src/test/results/clientpositive/vectorized_bucketmapjoin1.q.out
hive/trunk/ql/src/test/results/clientpositive/vectorized_context.q.out
hive/trunk/ql/src/test/results/clientpositive/vectorized_rcfile_columnar.q.out
hive/trunk/ql/src/test/results/clientpositive/vectorized_timestamp_funcs.q.out
hive/trunk/ql/src/test/results/compiler/plan/case_sensitivity.q.xml
hive/trunk/ql/src/test/results/compiler/plan/cast1.q.xml
hive/trunk/ql/src/test/results/compiler/plan/groupby1.q.xml
hive/trunk/ql/src/test/results/compiler/plan/groupby2.q.xml
hive/trunk/ql/src/test/results/compiler/plan/groupby3.q.xml
hive/trunk/ql/src/test/results/compiler/plan/groupby4.q.xml
hive/trunk/ql/src/test/results/compiler/plan/groupby5.q.xml
hive/trunk/ql/src/test/results/compiler/plan/groupby6.q.xml
hive/trunk/ql/src/test/results/compiler/plan/input1.q.xml
hive/trunk/ql/src/test/results/compiler/plan/input2.q.xml
hive/trunk/ql/src/test/results/compiler/plan/input20.q.xml
hive/trunk/ql/src/test/results/compiler/plan/input3.q.xml
hive/trunk/ql/src/test/results/compiler/plan/input4.q.xml
hive/trunk/ql/src/test/results/compiler/plan/input5.q.xml
hive/trunk/ql/src/test/results/compiler/plan/input6.q.xml
hive/trunk/ql/src/test/results/compiler/plan/input7.q.xml
hive/trunk/ql/src/test/results/compiler/plan/input8.q.xml
hive/trunk/ql/src/test/results/compiler/plan/input9.q.xml
hive/trunk/ql/src/test/results/compiler/plan/input_part1.q.xml
hive/trunk/ql/src/test/results/compiler/plan/input_testsequencefile.q.xml
hive/trunk/ql/src/test/results/compiler/plan/input_testxpath.q.xml
hive/trunk/ql/src/test/results/compiler/plan/input_testxpath2.q.xml
hive/trunk/ql/src/test/results/compiler/plan/join1.q.xml
hive/trunk/ql/src/test/results/compiler/plan/join2.q.xml
hive/trunk/ql/src/test/results/compiler/plan/join3.q.xml
hive/trunk/ql/src/test/results/compiler/plan/join4.q.xml
hive/trunk/ql/src/test/results/compiler/plan/join5.q.xml
hive/trunk/ql/src/test/results/compiler/plan/join6.q.xml
hive/trunk/ql/src/test/results/compiler/plan/join7.q.xml
hive/trunk/ql/src/test/results/compiler/plan/join8.q.xml
hive/trunk/ql/src/test/results/compiler/plan/sample1.q.xml
hive/trunk/ql/src/test/results/compiler/plan/sample2.q.xml
hive/trunk/ql/src/test/results/compiler/plan/sample3.q.xml
hive/trunk/ql/src/test/results/compiler/plan/sample4.q.xml
hive/trunk/ql/src/test/results/compiler/plan/sample5.q.xml
hive/trunk/ql/src/test/results/compiler/plan/sample6.q.xml
hive/trunk/ql/src/test/results/compiler/plan/sample7.q.xml
hive/trunk/ql/src/test/results/compiler/plan/subq.q.xml
hive/trunk/ql/src/test/results/compiler/plan/udf1.q.xml
hive/trunk/ql/src/test/results/compiler/plan/udf4.q.xml
hive/trunk/ql/src/test/results/compiler/plan/udf6.q.xml
hive/trunk/ql/src/test/results/compiler/plan/udf_case.q.xml
hive/trunk/ql/src/test/results/compiler/plan/udf_when.q.xml
hive/trunk/ql/src/test/results/compiler/plan/union.q.xml
hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/RegexSerDe.java
hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/SerDeUtils.java
Modified: hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
URL: http://svn.apache.org/viewvc/hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java?rev=1579876&r1=1579875&r2=1579876&view=diff
==============================================================================
--- hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java (original)
+++ hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java Fri Mar 21 04:15:18 2014
@@ -456,6 +456,11 @@ public class HiveConf extends Configurat
HIVEDEFAULTRCFILESERDE("hive.default.rcfile.serde",
"org.apache.hadoop.hive.serde2.columnar.LazyBinaryColumnarSerDe"),
+ SERDESUSINGMETASTOREFORSCHEMA("hive.serdes.using.metastore.for.schema","org.apache.hadoop.hive.ql.io.orc.OrcSerde,"
+ + "org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe,org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe,"
+ + "org.apache.hadoop.hive.serde2.dynamic_type.DynamicSerDe,org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe,"
+ + "org.apache.hadoop.hive.serde2.columnar.LazyBinaryColumnarSerDe,org.apache.hadoop.hive.ql.io.parquet.serde.ParquetHiveSerDe,"
+ + "org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe"),
//Location of Hive run time structured log file
HIVEHISTORYFILELOC("hive.querylog.location", System.getProperty("java.io.tmpdir") + File.separator + System.getProperty("user.name")),
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=1579876&r1=1579875&r2=1579876&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 Mar 21 04:15:18 2014
@@ -39,8 +39,8 @@ PREHOOK: query: DESCRIBE EXTENDED base64
PREHOOK: type: DESCTABLE
POSTHOOK: query: DESCRIBE EXTENDED base64_test
POSTHOOK: type: DESCTABLE
-key int None
-value string None
+key int
+value string
#### A masked pattern was here ####
PREHOOK: query: FROM src
Modified: hive/trunk/hbase-handler/src/test/results/positive/hbase_stats.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/hbase-handler/src/test/results/positive/hbase_stats.q.out?rev=1579876&r1=1579875&r2=1579876&view=diff
==============================================================================
--- hive/trunk/hbase-handler/src/test/results/positive/hbase_stats.q.out (original)
+++ hive/trunk/hbase-handler/src/test/results/positive/hbase_stats.q.out Fri Mar 21 04:15:18 2014
@@ -168,8 +168,8 @@ value string
# Partition Information
# col_name data_type comment
-ds string None
-hr string None
+ds string
+hr string
# Detailed Table Information
Database: default
@@ -211,8 +211,8 @@ value string
# Partition Information
# col_name data_type comment
-ds string None
-hr string None
+ds string
+hr string
# Detailed Partition Information
Partition Value: [2010-04-08, 11]
@@ -259,8 +259,8 @@ value string
# Partition Information
# col_name data_type comment
-ds string None
-hr string None
+ds string
+hr string
# Detailed Partition Information
Partition Value: [2010-04-08, 12]
@@ -335,8 +335,8 @@ value string
# Partition Information
# col_name data_type comment
-ds string None
-hr string None
+ds string
+hr string
# Detailed Table Information
Database: default
Modified: hive/trunk/hbase-handler/src/test/results/positive/hbase_stats2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/hbase-handler/src/test/results/positive/hbase_stats2.q.out?rev=1579876&r1=1579875&r2=1579876&view=diff
==============================================================================
--- hive/trunk/hbase-handler/src/test/results/positive/hbase_stats2.q.out (original)
+++ hive/trunk/hbase-handler/src/test/results/positive/hbase_stats2.q.out Fri Mar 21 04:15:18 2014
@@ -168,8 +168,8 @@ value string
# Partition Information
# col_name data_type comment
-ds string None
-hr string None
+ds string
+hr string
# Detailed Table Information
Database: default
@@ -211,8 +211,8 @@ value string
# Partition Information
# col_name data_type comment
-ds string None
-hr string None
+ds string
+hr string
# Detailed Partition Information
Partition Value: [2010-04-08, 11]
@@ -259,8 +259,8 @@ value string
# Partition Information
# col_name data_type comment
-ds string None
-hr string None
+ds string
+hr string
# Detailed Partition Information
Partition Value: [2010-04-08, 12]
@@ -335,8 +335,8 @@ value string
# Partition Information
# col_name data_type comment
-ds string None
-hr string None
+ds string
+hr string
# Detailed Table Information
Database: default
Modified: hive/trunk/hbase-handler/src/test/results/positive/hbase_stats3.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/hbase-handler/src/test/results/positive/hbase_stats3.q.out?rev=1579876&r1=1579875&r2=1579876&view=diff
==============================================================================
--- hive/trunk/hbase-handler/src/test/results/positive/hbase_stats3.q.out (original)
+++ hive/trunk/hbase-handler/src/test/results/positive/hbase_stats3.q.out Fri Mar 21 04:15:18 2014
@@ -31,8 +31,8 @@ value string
# Partition Information
# col_name data_type comment
-ds string None
-hr string None
+ds string
+hr string
# Detailed Partition Information
Partition Value: [2010-04-08, 13]
@@ -89,8 +89,8 @@ value string
# Partition Information
# col_name data_type comment
-ds string None
-hr string None
+ds string
+hr string
# Detailed Partition Information
Partition Value: [2010-04-08, 13]
@@ -151,8 +151,8 @@ value string
# Partition Information
# col_name data_type comment
-ds string None
-hr string None
+ds string
+hr string
# Detailed Partition Information
Partition Value: [2010-04-08, 13]
@@ -221,8 +221,8 @@ value string
# Partition Information
# col_name data_type comment
-ds string None
-hr string None
+ds string
+hr string
# Detailed Partition Information
Partition Value: [2010-04-08, 13]
@@ -291,8 +291,8 @@ value string
# Partition Information
# col_name data_type comment
-ds string None
-hr string None
+ds string
+hr string
# Detailed Partition Information
Partition Value: [2010-04-08, 13]
@@ -365,8 +365,8 @@ value string
# Partition Information
# col_name data_type comment
-ds string None
-hr string None
+ds string
+hr string
# Detailed Partition Information
Partition Value: [2010-04-08, 13]
Modified: hive/trunk/hbase-handler/src/test/results/positive/hbase_stats_empty_partition.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/hbase-handler/src/test/results/positive/hbase_stats_empty_partition.q.out?rev=1579876&r1=1579875&r2=1579876&view=diff
==============================================================================
--- hive/trunk/hbase-handler/src/test/results/positive/hbase_stats_empty_partition.q.out (original)
+++ hive/trunk/hbase-handler/src/test/results/positive/hbase_stats_empty_partition.q.out Fri Mar 21 04:15:18 2014
@@ -29,13 +29,13 @@ POSTHOOK: Lineage: tmptable PARTITION(pa
POSTHOOK: Lineage: tmptable PARTITION(part=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
# col_name data_type comment
-key string None
-value string None
+key string
+value string
# Partition Information
# col_name data_type comment
-part string None
+part string
# Detailed Partition Information
Partition Value: [1]
Modified: hive/trunk/itests/test-serde/src/main/java/org/apache/hadoop/hive/serde2/TestSerDe.java
URL: http://svn.apache.org/viewvc/hive/trunk/itests/test-serde/src/main/java/org/apache/hadoop/hive/serde2/TestSerDe.java?rev=1579876&r1=1579875&r2=1579876&view=diff
==============================================================================
--- hive/trunk/itests/test-serde/src/main/java/org/apache/hadoop/hive/serde2/TestSerDe.java (original)
+++ hive/trunk/itests/test-serde/src/main/java/org/apache/hadoop/hive/serde2/TestSerDe.java Fri Mar 21 04:15:18 2014
@@ -37,6 +37,9 @@ import org.apache.hadoop.io.BytesWritabl
import org.apache.hadoop.io.Text;
import org.apache.hadoop.io.Writable;
+import com.google.common.base.Splitter;
+import com.google.common.collect.Lists;
+
/**
* TestSerDe.
*
@@ -94,7 +97,7 @@ public class TestSerDe extends AbstractS
} else {
columnNames = Arrays.asList(columnProperty.split(","));
cachedObjectInspector = MetadataListStructObjectInspector
- .getInstance(columnNames);
+ .getInstance(columnNames,Lists.newArrayList(Splitter.on('\0').split(tbl.getProperty("columns.comments"))));
}
LOG.info(getClass().getName() + ": initialized with columnNames: "
+ columnNames);
Modified: hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java?rev=1579876&r1=1579875&r2=1579876&view=diff
==============================================================================
--- hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java (original)
+++ hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java Fri Mar 21 04:15:18 2014
@@ -159,7 +159,6 @@ import org.apache.hadoop.hive.metastore.
import org.apache.hadoop.hive.metastore.txn.TxnHandler;
import org.apache.hadoop.hive.serde2.Deserializer;
import org.apache.hadoop.hive.serde2.SerDeException;
-import org.apache.hadoop.hive.serde2.SerDeUtils;
import org.apache.hadoop.hive.shims.ShimLoader;
import org.apache.hadoop.hive.thrift.HadoopThriftAuthBridge;
import org.apache.hadoop.hive.thrift.TUGIContainingTransport;
@@ -2899,9 +2898,9 @@ public class HiveMetaStore extends Thrif
} catch (NoSuchObjectException e) {
throw new UnknownTableException(e.getMessage());
}
- boolean getColsFromSerDe = SerDeUtils.shouldGetColsFromSerDe(
- tbl.getSd().getSerdeInfo().getSerializationLib());
- if (!getColsFromSerDe) {
+ if (null == tbl.getSd().getSerdeInfo().getSerializationLib() ||
+ hiveConf.getStringCollection(ConfVars.SERDESUSINGMETASTOREFORSCHEMA.varname).contains
+ (tbl.getSd().getSerdeInfo().getSerializationLib())) {
ret = tbl.getSd().getCols();
} else {
try {
Modified: hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreUtils.java
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreUtils.java?rev=1579876&r1=1579875&r2=1579876&view=diff
==============================================================================
--- hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreUtils.java (original)
+++ hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreUtils.java Fri Mar 21 04:15:18 2014
@@ -202,7 +202,7 @@ public class MetaStoreUtils {
}
params.put(StatsSetupConst.COLUMN_STATS_ACCURATE, StatsSetupConst.FALSE);
} else {
- params.remove(StatsSetupConst.STATS_GENERATED_VIA_STATS_TASK);
+ params.remove(StatsSetupConst.STATS_GENERATED_VIA_STATS_TASK);
params.put(StatsSetupConst.COLUMN_STATS_ACCURATE, StatsSetupConst.TRUE);
}
}
@@ -233,7 +233,7 @@ public class MetaStoreUtils {
if(newPart.getParameters().containsKey(StatsSetupConst.STATS_GENERATED_VIA_STATS_TASK)) {
return true;
}
-
+
// requires to calculate stats if new and old have different fast stats
if ((oldPart != null) && (oldPart.getParameters() != null)) {
for (String stat : StatsSetupConst.fastStats) {
@@ -472,14 +472,14 @@ public class MetaStoreUtils {
}
return false;
}
-
+
/*
* At the Metadata level there are no restrictions on Column Names.
*/
public static final boolean validateColumnName(String name) {
return true;
}
-
+
static public String validateTblColumns(List<FieldSchema> cols) {
for (FieldSchema fieldSchema : cols) {
if (!validateColumnName(fieldSchema.getName())) {
@@ -927,14 +927,17 @@ public class MetaStoreUtils {
}
StringBuilder colNameBuf = new StringBuilder();
StringBuilder colTypeBuf = new StringBuilder();
+ StringBuilder colComment = new StringBuilder();
boolean first = true;
for (FieldSchema col : tblsd.getCols()) {
if (!first) {
colNameBuf.append(",");
colTypeBuf.append(":");
+ colComment.append('\0');
}
colNameBuf.append(col.getName());
colTypeBuf.append(col.getType());
+ colComment.append((null != col.getComment()) ? col.getComment() : "");
first = false;
}
String colNames = colNameBuf.toString();
@@ -945,6 +948,7 @@ public class MetaStoreUtils {
schema.setProperty(
org.apache.hadoop.hive.metastore.api.hive_metastoreConstants.META_TABLE_COLUMN_TYPES,
colTypes);
+ schema.setProperty("columns.comments", colComment.toString());
if (sd.getCols() != null) {
schema.setProperty(
org.apache.hadoop.hive.serde.serdeConstants.SERIALIZATION_DDL,
@@ -1150,7 +1154,7 @@ public class MetaStoreUtils {
private static final String FROM_SERIALIZER = "from deserializer";
private static String determineFieldComment(String comment) {
- return (comment == null || comment.isEmpty()) ? FROM_SERIALIZER : comment;
+ return (comment == null) ? FROM_SERIALIZER : comment;
}
/**
@@ -1235,6 +1239,7 @@ public class MetaStoreUtils {
* Filter that filters out hidden files
*/
private static final PathFilter hiddenFileFilter = new PathFilter() {
+ @Override
public boolean accept(Path p) {
String name = p.getName();
return !name.startsWith("_") && !name.startsWith(".");
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=1579876&r1=1579875&r2=1579876&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 Mar 21 04:15:18 2014
@@ -3198,11 +3198,9 @@ public class DDLTask extends Task<DDLWor
cols = (part == null || tbl.getTableType() == TableType.VIRTUAL_VIEW) ?
tbl.getCols() : part.getCols();
- if (!descTbl.isFormatted()) {
- if (tableName.equals(colPath)) {
- cols.addAll(tbl.getPartCols());
- }
- }
+ if (!descTbl.isFormatted()) {
+ cols.addAll(tbl.getPartCols());
+ }
} else {
cols = Hive.getFieldsFromDeserializer(colPath, tbl.getDeserializer());
}
@@ -3504,8 +3502,11 @@ public class DDLTask extends Task<DDLWor
tbl.getTTable().getSd().getSerdeInfo().getParameters().putAll(
alterTbl.getProps());
}
- tbl.setFields(Hive.getFieldsFromDeserializer(tbl.getTableName(), tbl.
- getDeserializer()));
+ if (!conf.getStringCollection(ConfVars.SERDESUSINGMETASTOREFORSCHEMA.varname)
+ .contains(serdeName)) {
+ tbl.setFields(Hive.getFieldsFromDeserializer(tbl.getTableName(), tbl.
+ getDeserializer()));
+ }
}
} else if (alterTbl.getOp() == AlterTableDesc.AlterTableTypes.ADDFILEFORMAT) {
if(part != null) {
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/Partition.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/Partition.java?rev=1579876&r1=1579875&r2=1579876&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/Partition.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/Partition.java Fri Mar 21 04:15:18 2014
@@ -33,6 +33,7 @@ import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hive.common.JavaUtils;
+import org.apache.hadoop.hive.conf.HiveConf.ConfVars;
import org.apache.hadoop.hive.metastore.MetaStoreUtils;
import org.apache.hadoop.hive.metastore.ProtectMode;
import org.apache.hadoop.hive.metastore.Warehouse;
@@ -499,12 +500,12 @@ public class Partition implements Serial
}
public List<FieldSchema> getCols() {
- if (!SerDeUtils.shouldGetColsFromSerDe(
- tPartition.getSd().getSerdeInfo().getSerializationLib())) {
- return tPartition.getSd().getCols();
- }
try {
+ if (Hive.get().getConf().getStringCollection(ConfVars.SERDESUSINGMETASTOREFORSCHEMA.varname)
+ .contains(tPartition.getSd().getSerdeInfo().getSerializationLib())) {
+ return tPartition.getSd().getCols();
+ }
return Hive.getFieldsFromDeserializer(table.getTableName(), getDeserializer());
} catch (HiveException e) {
LOG.error("Unable to get cols from serde: " +
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/Table.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/Table.java?rev=1579876&r1=1579875&r2=1579876&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/Table.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/Table.java Fri Mar 21 04:15:18 2014
@@ -35,6 +35,7 @@ import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hive.common.JavaUtils;
+import org.apache.hadoop.hive.conf.HiveConf.ConfVars;
import org.apache.hadoop.hive.metastore.MetaStoreUtils;
import org.apache.hadoop.hive.metastore.ProtectMode;
import org.apache.hadoop.hive.metastore.TableType;
@@ -610,18 +611,18 @@ public class Table implements Serializab
}
public List<FieldSchema> getCols() {
- boolean getColsFromSerDe = SerDeUtils.shouldGetColsFromSerDe(
- getSerializationLib());
- if (!getColsFromSerDe) {
- return tTable.getSd().getCols();
- } else {
- try {
+
+ try {
+ if (null == getSerializationLib() || Hive.get().getConf().getStringCollection(
+ ConfVars.SERDESUSINGMETASTOREFORSCHEMA.varname).contains(getSerializationLib())) {
+ return tTable.getSd().getCols();
+ } else {
return Hive.getFieldsFromDeserializer(getTableName(), getDeserializer());
- } catch (HiveException e) {
- LOG.error("Unable to get field from serde: " + getSerializationLib(), e);
}
- return new ArrayList<FieldSchema>();
+ } catch (HiveException e) {
+ LOG.error("Unable to get field from serde: " + getSerializationLib(), e);
}
+ return new ArrayList<FieldSchema>();
}
/**
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=1579876&r1=1579875&r2=1579876&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 Mar 21 04:15:18 2014
@@ -311,7 +311,7 @@ public final class MetaDataFormatUtils {
}
static String getComment(FieldSchema col) {
- return col.getComment() != null ? col.getComment() : "None";
+ return col.getComment() != null ? col.getComment() : "";
}
private static String formatDate(long timeInSeconds) {
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java?rev=1579876&r1=1579875&r2=1579876&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java Fri Mar 21 04:15:18 2014
@@ -1551,7 +1551,7 @@ public class SemanticAnalyzer extends Ba
return false;
}
-
+
/*
* This method is invoked for unqualified column references in join conditions.
* This is passed in the Alias to Operator mapping in the QueryBlock so far.
@@ -1874,7 +1874,7 @@ public class SemanticAnalyzer extends Ba
}
@SuppressWarnings("rawtypes")
- private void parseJoinCondition(QBJoinTree joinTree, ASTNode joinCond, List<String> leftSrc,
+ private void parseJoinCondition(QBJoinTree joinTree, ASTNode joinCond, List<String> leftSrc,
Map<String, Operator> aliasToOpInfo)
throws SemanticException {
if (joinCond == null) {
@@ -2038,14 +2038,14 @@ public class SemanticAnalyzer extends Ba
}
@SuppressWarnings("rawtypes")
- private void extractJoinCondsFromWhereClause(QBJoinTree joinTree, QB qb, String dest, ASTNode predicate,
+ private void extractJoinCondsFromWhereClause(QBJoinTree joinTree, QB qb, String dest, ASTNode predicate,
Map<String, Operator> aliasToOpInfo) throws SemanticException {
switch (predicate.getType()) {
case HiveParser.KW_AND:
- extractJoinCondsFromWhereClause(joinTree, qb, dest,
+ extractJoinCondsFromWhereClause(joinTree, qb, dest,
(ASTNode) predicate.getChild(0), aliasToOpInfo);
- extractJoinCondsFromWhereClause(joinTree, qb, dest,
+ extractJoinCondsFromWhereClause(joinTree, qb, dest,
(ASTNode) predicate.getChild(1), aliasToOpInfo);
break;
case HiveParser.EQUAL_NS:
@@ -8940,7 +8940,7 @@ public class SemanticAnalyzer extends Ba
String dest = dests.iterator().next();
ASTNode whereClause = qb.getParseInfo().getWhrForClause(dest);
if ( whereClause != null ) {
- extractJoinCondsFromWhereClause(joinTree, qb, dest,
+ extractJoinCondsFromWhereClause(joinTree, qb, dest,
(ASTNode) whereClause.getChild(0),
aliasToOpInfo );
}
@@ -9907,7 +9907,7 @@ public class SemanticAnalyzer extends Ba
crtTblDesc.setStoredAsSubDirectories(storedAsDirs);
crtTblDesc.setNullFormat(rowFormatParams.nullFormat);
- crtTblDesc.validate();
+ crtTblDesc.validate(conf);
// outputs is empty, which means this create table happens in the current
// database.
SessionState.get().setCommandType(HiveOperation.CREATETABLE);
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/TaskCompiler.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/TaskCompiler.java?rev=1579876&r1=1579875&r2=1579876&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/TaskCompiler.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/TaskCompiler.java Fri Mar 21 04:15:18 2014
@@ -221,7 +221,7 @@ public abstract class TaskCompiler {
// generate a DDL task and make it a dependent task of the leaf
CreateTableDesc crtTblDesc = qb.getTableDesc();
- crtTblDesc.validate();
+ crtTblDesc.validate(conf);
// Clear the output for CTAS since we don't need the output from the
// mapredWork, the
@@ -339,7 +339,7 @@ public abstract class TaskCompiler {
/*
* Called at the beginning of the compile phase to have another chance to optimize the operator plan
*/
- protected void optimizeOperatorPlan(ParseContext pCtxSet, Set<ReadEntity> inputs,
+ protected void optimizeOperatorPlan(ParseContext pCtxSet, Set<ReadEntity> inputs,
Set<WriteEntity> outputs) throws SemanticException {
}
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/CreateTableDesc.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/CreateTableDesc.java?rev=1579876&r1=1579875&r2=1579876&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/CreateTableDesc.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/CreateTableDesc.java Fri Mar 21 04:15:18 2014
@@ -28,6 +28,8 @@ import org.apache.commons.lang.StringUti
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hive.common.JavaUtils;
+import org.apache.hadoop.hive.conf.HiveConf;
+import org.apache.hadoop.hive.conf.HiveConf.ConfVars;
import org.apache.hadoop.hive.metastore.api.FieldSchema;
import org.apache.hadoop.hive.metastore.api.Order;
import org.apache.hadoop.hive.ql.ErrorMsg;
@@ -403,13 +405,13 @@ public class CreateTableDesc extends DDL
this.skewedColValues = skewedColValues;
}
- public void validate()
+ public void validate(HiveConf conf)
throws SemanticException {
if ((this.getCols() == null) || (this.getCols().size() == 0)) {
// for now make sure that serde exists
if (StringUtils.isEmpty(this.getSerName())
- || !SerDeUtils.shouldGetColsFromSerDe(this.getSerName())) {
+ || conf.getStringCollection(ConfVars.SERDESUSINGMETASTOREFORSCHEMA.varname).contains(this.getSerName())) {
throw new SemanticException(ErrorMsg.INVALID_TBL_DDL_SERDE.getMsg());
}
return;
Modified: hive/trunk/ql/src/test/results/clientnegative/alter_partition_coltype_2columns.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientnegative/alter_partition_coltype_2columns.q.out?rev=1579876&r1=1579875&r2=1579876&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientnegative/alter_partition_coltype_2columns.q.out (original)
+++ hive/trunk/ql/src/test/results/clientnegative/alter_partition_coltype_2columns.q.out Fri Mar 21 04:15:18 2014
@@ -25,14 +25,14 @@ 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), ]
-key string None
-value string None
-dt string None
-ts string None
+key string
+value string
+dt string
+ts string
# Partition Information
# col_name data_type comment
-dt string None
-ts string None
+dt string
+ts string
FAILED: ParseException line 4:50 mismatched input ',' expecting ) near 'int' in alter partition key type
Modified: hive/trunk/ql/src/test/results/clientnegative/alter_partition_coltype_invalidcolname.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientnegative/alter_partition_coltype_invalidcolname.q.out?rev=1579876&r1=1579875&r2=1579876&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientnegative/alter_partition_coltype_invalidcolname.q.out (original)
+++ hive/trunk/ql/src/test/results/clientnegative/alter_partition_coltype_invalidcolname.q.out Fri Mar 21 04:15:18 2014
@@ -25,14 +25,14 @@ 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), ]
-key string None
-value string None
-dt string None
-ts string None
+key string
+value string
+dt string
+ts string
# Partition Information
# col_name data_type comment
-dt string None
-ts string None
+dt string
+ts string
FAILED: SemanticException [Error 10002]: Invalid column reference dd
Modified: hive/trunk/ql/src/test/results/clientnegative/alter_partition_coltype_invalidtype.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientnegative/alter_partition_coltype_invalidtype.q.out?rev=1579876&r1=1579875&r2=1579876&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientnegative/alter_partition_coltype_invalidtype.q.out (original)
+++ hive/trunk/ql/src/test/results/clientnegative/alter_partition_coltype_invalidtype.q.out Fri Mar 21 04:15:18 2014
@@ -25,14 +25,14 @@ 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), ]
-key string None
-value string None
-dt string None
-ts string None
+key string
+value string
+dt string
+ts string
# Partition Information
# col_name data_type comment
-dt string None
-ts string None
+dt string
+ts string
FAILED: ParseException line 4:47 cannot recognize input near 'time' ')' '<EOF>' in column type
Modified: hive/trunk/ql/src/test/results/clientnegative/alter_view_as_select_with_partition.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientnegative/alter_view_as_select_with_partition.q.out?rev=1579876&r1=1579875&r2=1579876&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientnegative/alter_view_as_select_with_partition.q.out (original)
+++ hive/trunk/ql/src/test/results/clientnegative/alter_view_as_select_with_partition.q.out Fri Mar 21 04:15:18 2014
@@ -33,12 +33,12 @@ POSTHOOK: query: DESCRIBE FORMATTED test
POSTHOOK: type: DESCTABLE
# col_name data_type comment
-key string None
+key string
# Partition Information
# col_name data_type comment
-value string None
+value string
# Detailed Table Information
Database: default
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=1579876&r1=1579875&r2=1579876&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 Mar 21 04:15:18 2014
@@ -4,12 +4,12 @@ POSTHOOK: query: DESC srcpart
POSTHOOK: type: DESCTABLE
key string default
value string default
-ds string None
-hr string None
+ds string
+hr string
# Partition Information
# col_name data_type comment
-ds string None
-hr string None
+ds string
+hr string
FAILED: SemanticException [Error 10006]: Partition not found {ds=2012-04-08, hr=15}
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=1579876&r1=1579875&r2=1579876&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 Mar 21 04:15:18 2014
@@ -33,14 +33,14 @@ 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 None
-c2 string None
-p string None
+c1 string
+c2 string
+p string
# Partition Information
# col_name data_type comment
-p string None
+p string
#### A masked pattern was here ####
FAILED: SemanticException [Error 30011]: Partition protected from being dropped default@tbl_protectmode_no_drop@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=1579876&r1=1579875&r2=1579876&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 Mar 21 04:15:18 2014
@@ -48,13 +48,13 @@ PREHOOK: query: desc extended tbl_protec
PREHOOK: type: DESCTABLE
POSTHOOK: query: desc extended tbl_protectmode2
POSTHOOK: type: DESCTABLE
-col string None
-p string None
+col string
+p string
# Partition Information
# col_name data_type comment
-p string None
+p string
#### 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=1579876&r1=1579875&r2=1579876&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 Mar 21 04:15:18 2014
@@ -33,7 +33,7 @@ PREHOOK: query: desc extended tbl_protec
PREHOOK: type: DESCTABLE
POSTHOOK: query: desc extended tbl_protectmode_4
POSTHOOK: type: DESCTABLE
-col string None
+col string
#### 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=1579876&r1=1579875&r2=1579876&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 Mar 21 04:15:18 2014
@@ -59,13 +59,13 @@ PREHOOK: query: desc extended tbl_protec
PREHOOK: type: DESCTABLE
POSTHOOK: query: desc extended tbl_protectmode_tbl4
POSTHOOK: type: DESCTABLE
-col string None
-p string None
+col string
+p string
# Partition Information
# col_name data_type comment
-p string None
+p string
#### 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=1579876&r1=1579875&r2=1579876&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 Mar 21 04:15:18 2014
@@ -59,13 +59,13 @@ PREHOOK: query: desc extended tbl_protec
PREHOOK: type: DESCTABLE
POSTHOOK: query: desc extended tbl_protectmode_tbl5
POSTHOOK: type: DESCTABLE
-col string None
-p string None
+col string
+p string
# Partition Information
# col_name data_type comment
-p string None
+p string
#### 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=1579876&r1=1579875&r2=1579876&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 Mar 21 04:15:18 2014
@@ -33,7 +33,7 @@ PREHOOK: query: desc extended tbl_protec
PREHOOK: type: DESCTABLE
POSTHOOK: query: desc extended tbl_protectmode__no_drop
POSTHOOK: type: DESCTABLE
-col string None
+col string
#### A masked pattern was here ####
PREHOOK: query: drop table tbl_protectmode__no_drop
Modified: hive/trunk/ql/src/test/results/clientnegative/stats_partialscan_autogether.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientnegative/stats_partialscan_autogether.q.out?rev=1579876&r1=1579875&r2=1579876&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientnegative/stats_partialscan_autogether.q.out (original)
+++ hive/trunk/ql/src/test/results/clientnegative/stats_partialscan_autogether.q.out Fri Mar 21 04:15:18 2014
@@ -56,14 +56,14 @@ POSTHOOK: Lineage: analyze_srcpart_parti
POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-09,hr=12).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
# col_name data_type comment
-key string None
-value string None
+key string
+value string
# Partition Information
# col_name data_type comment
-ds string None
-hr string None
+ds string
+hr string
# Detailed Partition Information
Partition Value: [2008-04-08, 11]
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=1579876&r1=1579875&r2=1579876&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/alter1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/alter1.q.out Fri Mar 21 04:15:18 2014
@@ -9,8 +9,8 @@ PREHOOK: query: describe extended alter1
PREHOOK: type: DESCTABLE
POSTHOOK: query: describe extended alter1
POSTHOOK: type: DESCTABLE
-a int None
-b int None
+a int
+b int
#### A masked pattern was here ####
PREHOOK: query: alter table alter1 set tblproperties ('a'='1', 'c'='3')
@@ -25,8 +25,8 @@ PREHOOK: query: describe extended alter1
PREHOOK: type: DESCTABLE
POSTHOOK: query: describe extended alter1
POSTHOOK: type: DESCTABLE
-a int None
-b int None
+a int
+b int
#### A masked pattern was here ####
PREHOOK: query: alter table alter1 set tblproperties ('a'='1', 'c'='4', 'd'='3')
@@ -41,8 +41,8 @@ PREHOOK: query: describe extended alter1
PREHOOK: type: DESCTABLE
POSTHOOK: query: describe extended alter1
POSTHOOK: type: DESCTABLE
-a int None
-b int None
+a int
+b int
#### A masked pattern was here ####
PREHOOK: query: alter table alter1 set tblproperties ('EXTERNAL'='TRUE')
@@ -57,8 +57,8 @@ PREHOOK: query: describe extended alter1
PREHOOK: type: DESCTABLE
POSTHOOK: query: describe extended alter1
POSTHOOK: type: DESCTABLE
-a int None
-b int None
+a int
+b int
#### A masked pattern was here ####
PREHOOK: query: alter table alter1 set tblproperties ('EXTERNAL'='FALSE')
@@ -73,8 +73,8 @@ PREHOOK: query: describe extended alter1
PREHOOK: type: DESCTABLE
POSTHOOK: query: describe extended alter1
POSTHOOK: type: DESCTABLE
-a int None
-b int None
+a int
+b int
#### A masked pattern was here ####
PREHOOK: query: alter table alter1 set serdeproperties('s1'='9')
@@ -89,8 +89,8 @@ PREHOOK: query: describe extended alter1
PREHOOK: type: DESCTABLE
POSTHOOK: query: describe extended alter1
POSTHOOK: type: DESCTABLE
-a int None
-b int None
+a int
+b int
#### A masked pattern was here ####
PREHOOK: query: alter table alter1 set serdeproperties('s1'='10', 's2' ='20')
@@ -105,8 +105,8 @@ PREHOOK: query: describe extended alter1
PREHOOK: type: DESCTABLE
POSTHOOK: query: describe extended alter1
POSTHOOK: type: DESCTABLE
-a int None
-b int None
+a int
+b int
#### A masked pattern was here ####
PREHOOK: query: alter table alter1 set serde 'org.apache.hadoop.hive.serde2.TestSerDe' with serdeproperties('s1'='9')
@@ -121,8 +121,8 @@ PREHOOK: query: describe extended alter1
PREHOOK: type: DESCTABLE
POSTHOOK: query: describe extended alter1
POSTHOOK: type: DESCTABLE
-a string from deserializer
-b string from deserializer
+a string
+b string
#### A masked pattern was here ####
PREHOOK: query: alter table alter1 set serde 'org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe'
@@ -137,8 +137,8 @@ PREHOOK: query: describe extended alter1
PREHOOK: type: DESCTABLE
POSTHOOK: query: describe extended alter1
POSTHOOK: type: DESCTABLE
-a string from deserializer
-b string from deserializer
+a string
+b string
#### A masked pattern was here ####
PREHOOK: query: alter table alter1 replace columns (a int, b int, c string)
@@ -153,9 +153,9 @@ PREHOOK: query: describe alter1
PREHOOK: type: DESCTABLE
POSTHOOK: query: describe alter1
POSTHOOK: type: DESCTABLE
-a int None
-b int None
-c string None
+a int
+b int
+c string
PREHOOK: query: -- Cleanup
DROP TABLE alter1
PREHOOK: type: DROPTABLE
@@ -206,8 +206,8 @@ PREHOOK: query: DESCRIBE EXTENDED alter1
PREHOOK: type: DESCTABLE
POSTHOOK: query: DESCRIBE EXTENDED alter1
POSTHOOK: type: DESCTABLE
-a int None
-b int None
+a int
+b int
#### A masked pattern was here ####
PREHOOK: query: ALTER TABLE alter1 SET TBLPROPERTIES ('a'='1', 'c'='3')
@@ -222,8 +222,8 @@ PREHOOK: query: DESCRIBE EXTENDED alter1
PREHOOK: type: DESCTABLE
POSTHOOK: query: DESCRIBE EXTENDED alter1
POSTHOOK: type: DESCTABLE
-a int None
-b int None
+a int
+b int
#### A masked pattern was here ####
PREHOOK: query: ALTER TABLE alter1 SET TBLPROPERTIES ('a'='1', 'c'='4', 'd'='3')
@@ -238,8 +238,8 @@ PREHOOK: query: DESCRIBE EXTENDED alter1
PREHOOK: type: DESCTABLE
POSTHOOK: query: DESCRIBE EXTENDED alter1
POSTHOOK: type: DESCTABLE
-a int None
-b int None
+a int
+b int
#### A masked pattern was here ####
PREHOOK: query: ALTER TABLE alter1 SET TBLPROPERTIES ('EXTERNAL'='TRUE')
@@ -254,8 +254,8 @@ PREHOOK: query: DESCRIBE EXTENDED alter1
PREHOOK: type: DESCTABLE
POSTHOOK: query: DESCRIBE EXTENDED alter1
POSTHOOK: type: DESCTABLE
-a int None
-b int None
+a int
+b int
#### A masked pattern was here ####
PREHOOK: query: ALTER TABLE alter1 SET TBLPROPERTIES ('EXTERNAL'='FALSE')
@@ -270,8 +270,8 @@ PREHOOK: query: DESCRIBE EXTENDED alter1
PREHOOK: type: DESCTABLE
POSTHOOK: query: DESCRIBE EXTENDED alter1
POSTHOOK: type: DESCTABLE
-a int None
-b int None
+a int
+b int
#### A masked pattern was here ####
PREHOOK: query: ALTER TABLE alter1 SET SERDEPROPERTIES('s1'='9')
@@ -286,8 +286,8 @@ PREHOOK: query: DESCRIBE EXTENDED alter1
PREHOOK: type: DESCTABLE
POSTHOOK: query: DESCRIBE EXTENDED alter1
POSTHOOK: type: DESCTABLE
-a int None
-b int None
+a int
+b int
#### A masked pattern was here ####
PREHOOK: query: ALTER TABLE alter1 SET SERDEPROPERTIES('s1'='10', 's2' ='20')
@@ -302,8 +302,8 @@ PREHOOK: query: DESCRIBE EXTENDED alter1
PREHOOK: type: DESCTABLE
POSTHOOK: query: DESCRIBE EXTENDED alter1
POSTHOOK: type: DESCTABLE
-a int None
-b int None
+a int
+b int
#### A masked pattern was here ####
PREHOOK: query: ALTER TABLE alter1 SET SERDE 'org.apache.hadoop.hive.serde2.TestSerDe' WITH SERDEPROPERTIES ('s1'='9')
@@ -318,8 +318,8 @@ PREHOOK: query: DESCRIBE EXTENDED alter1
PREHOOK: type: DESCTABLE
POSTHOOK: query: DESCRIBE EXTENDED alter1
POSTHOOK: type: DESCTABLE
-a string from deserializer
-b string from deserializer
+a string
+b string
#### A masked pattern was here ####
PREHOOK: query: ALTER TABLE alter1 SET SERDE 'org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe'
@@ -334,8 +334,8 @@ PREHOOK: query: DESCRIBE EXTENDED alter1
PREHOOK: type: DESCTABLE
POSTHOOK: query: DESCRIBE EXTENDED alter1
POSTHOOK: type: DESCTABLE
-a string from deserializer
-b string from deserializer
+a string
+b string
#### A masked pattern was here ####
PREHOOK: query: ALTER TABLE alter1 REPLACE COLUMNS (a int, b int, c string)
@@ -350,9 +350,9 @@ PREHOOK: query: DESCRIBE alter1
PREHOOK: type: DESCTABLE
POSTHOOK: query: DESCRIBE alter1
POSTHOOK: type: DESCTABLE
-a int None
-b int None
-c string None
+a int
+b int
+c string
PREHOOK: query: DROP TABLE alter1
PREHOOK: type: DROPTABLE
PREHOOK: Input: alter1_db@alter1