You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by se...@apache.org on 2014/09/16 19:37:19 UTC
svn commit: r1625341 [1/12] - in /hive/branches/llap: ./
common/src/java/org/apache/hadoop/hive/common/
common/src/java/org/apache/hadoop/hive/conf/
contrib/src/test/results/clientpositive/ data/conf/tez/ data/files/
hbase-handler/ itests/hive-unit-had...
Author: sershe
Date: Tue Sep 16 17:37:13 2014
New Revision: 1625341
URL: http://svn.apache.org/r1625341
Log:
Merge trunk thru r1625336
Added:
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/exec/AbstractFileMergeOperator.java
- copied unchanged from r1625336, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/AbstractFileMergeOperator.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/exec/OrcFileMergeOperator.java
- copied unchanged from r1625336, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/OrcFileMergeOperator.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/exec/RCFileMergeOperator.java
- copied unchanged from r1625336, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/RCFileMergeOperator.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/DataInputByteBuffer.java
- copied unchanged from r1625336, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/DataInputByteBuffer.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/MergeFileRecordProcessor.java
- copied unchanged from r1625336, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/MergeFileRecordProcessor.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/MergeFileTezProcessor.java
- copied unchanged from r1625336, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/MergeFileTezProcessor.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/io/merge/MergeFileInputFormat.java
- copied unchanged from r1625336, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/merge/MergeFileInputFormat.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/io/merge/MergeFileMapper.java
- copied unchanged from r1625336, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/merge/MergeFileMapper.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/io/merge/MergeFileOutputFormat.java
- copied unchanged from r1625336, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/merge/MergeFileOutputFormat.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/io/merge/MergeFileTask.java
- copied unchanged from r1625336, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/merge/MergeFileTask.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/io/merge/MergeFileWork.java
- copied unchanged from r1625336, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/merge/MergeFileWork.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/parse/UpdateDeleteSemanticAnalyzer.java
- copied unchanged from r1625336, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/UpdateDeleteSemanticAnalyzer.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/plan/FileMergeDesc.java
- copied unchanged from r1625336, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/FileMergeDesc.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/plan/OrcFileMergeDesc.java
- copied unchanged from r1625336, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/OrcFileMergeDesc.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/plan/RCFileMergeDesc.java
- copied unchanged from r1625336, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/RCFileMergeDesc.java
hive/branches/llap/ql/src/test/org/apache/hadoop/hive/ql/parse/TestUpdateDeleteSemanticAnalyzer.java
- copied unchanged from r1625336, hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/parse/TestUpdateDeleteSemanticAnalyzer.java
hive/branches/llap/ql/src/test/queries/clientnegative/acid_overwrite.q
- copied unchanged from r1625336, hive/trunk/ql/src/test/queries/clientnegative/acid_overwrite.q
hive/branches/llap/ql/src/test/queries/clientnegative/authorization_uri_export.q
- copied unchanged from r1625336, hive/trunk/ql/src/test/queries/clientnegative/authorization_uri_export.q
hive/branches/llap/ql/src/test/queries/clientnegative/authorization_uri_import.q
- copied unchanged from r1625336, hive/trunk/ql/src/test/queries/clientnegative/authorization_uri_import.q
hive/branches/llap/ql/src/test/queries/clientnegative/delete_not_acid.q
- copied unchanged from r1625336, hive/trunk/ql/src/test/queries/clientnegative/delete_not_acid.q
hive/branches/llap/ql/src/test/queries/clientnegative/update_not_acid.q
- copied unchanged from r1625336, hive/trunk/ql/src/test/queries/clientnegative/update_not_acid.q
hive/branches/llap/ql/src/test/queries/clientnegative/update_partition_col.q
- copied unchanged from r1625336, hive/trunk/ql/src/test/queries/clientnegative/update_partition_col.q
hive/branches/llap/ql/src/test/queries/clientpositive/authorization_default_create_table_owner_privs.q
- copied unchanged from r1625336, hive/trunk/ql/src/test/queries/clientpositive/authorization_default_create_table_owner_privs.q
hive/branches/llap/ql/src/test/queries/clientpositive/delete_all_non_partitioned.q
- copied unchanged from r1625336, hive/trunk/ql/src/test/queries/clientpositive/delete_all_non_partitioned.q
hive/branches/llap/ql/src/test/queries/clientpositive/delete_all_partitioned.q
- copied unchanged from r1625336, hive/trunk/ql/src/test/queries/clientpositive/delete_all_partitioned.q
hive/branches/llap/ql/src/test/queries/clientpositive/delete_orig_table.q
- copied unchanged from r1625336, hive/trunk/ql/src/test/queries/clientpositive/delete_orig_table.q
hive/branches/llap/ql/src/test/queries/clientpositive/delete_tmp_table.q
- copied unchanged from r1625336, hive/trunk/ql/src/test/queries/clientpositive/delete_tmp_table.q
hive/branches/llap/ql/src/test/queries/clientpositive/delete_where_no_match.q
- copied unchanged from r1625336, hive/trunk/ql/src/test/queries/clientpositive/delete_where_no_match.q
hive/branches/llap/ql/src/test/queries/clientpositive/delete_where_non_partitioned.q
- copied unchanged from r1625336, hive/trunk/ql/src/test/queries/clientpositive/delete_where_non_partitioned.q
hive/branches/llap/ql/src/test/queries/clientpositive/delete_where_partitioned.q
- copied unchanged from r1625336, hive/trunk/ql/src/test/queries/clientpositive/delete_where_partitioned.q
hive/branches/llap/ql/src/test/queries/clientpositive/delete_whole_partition.q
- copied unchanged from r1625336, hive/trunk/ql/src/test/queries/clientpositive/delete_whole_partition.q
hive/branches/llap/ql/src/test/queries/clientpositive/insert_orig_table.q
- copied unchanged from r1625336, hive/trunk/ql/src/test/queries/clientpositive/insert_orig_table.q
hive/branches/llap/ql/src/test/queries/clientpositive/insert_update_delete.q
- copied unchanged from r1625336, hive/trunk/ql/src/test/queries/clientpositive/insert_update_delete.q
hive/branches/llap/ql/src/test/queries/clientpositive/insert_values_dynamic_partitioned.q
- copied unchanged from r1625336, hive/trunk/ql/src/test/queries/clientpositive/insert_values_dynamic_partitioned.q
hive/branches/llap/ql/src/test/queries/clientpositive/insert_values_non_partitioned.q
- copied unchanged from r1625336, hive/trunk/ql/src/test/queries/clientpositive/insert_values_non_partitioned.q
hive/branches/llap/ql/src/test/queries/clientpositive/insert_values_orig_table.q
- copied unchanged from r1625336, hive/trunk/ql/src/test/queries/clientpositive/insert_values_orig_table.q
hive/branches/llap/ql/src/test/queries/clientpositive/insert_values_partitioned.q
- copied unchanged from r1625336, hive/trunk/ql/src/test/queries/clientpositive/insert_values_partitioned.q
hive/branches/llap/ql/src/test/queries/clientpositive/insert_values_tmp_table.q
- copied unchanged from r1625336, hive/trunk/ql/src/test/queries/clientpositive/insert_values_tmp_table.q
hive/branches/llap/ql/src/test/queries/clientpositive/orc_merge5.q
- copied unchanged from r1625336, hive/trunk/ql/src/test/queries/clientpositive/orc_merge5.q
hive/branches/llap/ql/src/test/queries/clientpositive/orc_merge6.q
- copied unchanged from r1625336, hive/trunk/ql/src/test/queries/clientpositive/orc_merge6.q
hive/branches/llap/ql/src/test/queries/clientpositive/orc_merge7.q
- copied unchanged from r1625336, hive/trunk/ql/src/test/queries/clientpositive/orc_merge7.q
hive/branches/llap/ql/src/test/queries/clientpositive/update_after_multiple_inserts.q
- copied unchanged from r1625336, hive/trunk/ql/src/test/queries/clientpositive/update_after_multiple_inserts.q
hive/branches/llap/ql/src/test/queries/clientpositive/update_all_non_partitioned.q
- copied unchanged from r1625336, hive/trunk/ql/src/test/queries/clientpositive/update_all_non_partitioned.q
hive/branches/llap/ql/src/test/queries/clientpositive/update_all_partitioned.q
- copied unchanged from r1625336, hive/trunk/ql/src/test/queries/clientpositive/update_all_partitioned.q
hive/branches/llap/ql/src/test/queries/clientpositive/update_all_types.q
- copied unchanged from r1625336, hive/trunk/ql/src/test/queries/clientpositive/update_all_types.q
hive/branches/llap/ql/src/test/queries/clientpositive/update_orig_table.q
- copied unchanged from r1625336, hive/trunk/ql/src/test/queries/clientpositive/update_orig_table.q
hive/branches/llap/ql/src/test/queries/clientpositive/update_tmp_table.q
- copied unchanged from r1625336, hive/trunk/ql/src/test/queries/clientpositive/update_tmp_table.q
hive/branches/llap/ql/src/test/queries/clientpositive/update_two_cols.q
- copied unchanged from r1625336, hive/trunk/ql/src/test/queries/clientpositive/update_two_cols.q
hive/branches/llap/ql/src/test/queries/clientpositive/update_where_no_match.q
- copied unchanged from r1625336, hive/trunk/ql/src/test/queries/clientpositive/update_where_no_match.q
hive/branches/llap/ql/src/test/queries/clientpositive/update_where_non_partitioned.q
- copied unchanged from r1625336, hive/trunk/ql/src/test/queries/clientpositive/update_where_non_partitioned.q
hive/branches/llap/ql/src/test/queries/clientpositive/update_where_partitioned.q
- copied unchanged from r1625336, hive/trunk/ql/src/test/queries/clientpositive/update_where_partitioned.q
hive/branches/llap/ql/src/test/results/clientnegative/acid_overwrite.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientnegative/acid_overwrite.q.out
hive/branches/llap/ql/src/test/results/clientnegative/authorization_uri_export.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientnegative/authorization_uri_export.q.out
hive/branches/llap/ql/src/test/results/clientnegative/authorization_uri_import.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientnegative/authorization_uri_import.q.out
hive/branches/llap/ql/src/test/results/clientnegative/delete_not_acid.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientnegative/delete_not_acid.q.out
hive/branches/llap/ql/src/test/results/clientnegative/update_not_acid.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientnegative/update_not_acid.q.out
hive/branches/llap/ql/src/test/results/clientnegative/update_partition_col.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientnegative/update_partition_col.q.out
hive/branches/llap/ql/src/test/results/clientpositive/authorization_default_create_table_owner_privs.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/authorization_default_create_table_owner_privs.q.out
hive/branches/llap/ql/src/test/results/clientpositive/delete_all_non_partitioned.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/delete_all_non_partitioned.q.out
hive/branches/llap/ql/src/test/results/clientpositive/delete_all_partitioned.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/delete_all_partitioned.q.out
hive/branches/llap/ql/src/test/results/clientpositive/delete_orig_table.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/delete_orig_table.q.out
hive/branches/llap/ql/src/test/results/clientpositive/delete_tmp_table.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/delete_tmp_table.q.out
hive/branches/llap/ql/src/test/results/clientpositive/delete_where_no_match.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/delete_where_no_match.q.out
hive/branches/llap/ql/src/test/results/clientpositive/delete_where_non_partitioned.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/delete_where_non_partitioned.q.out
hive/branches/llap/ql/src/test/results/clientpositive/delete_where_partitioned.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/delete_where_partitioned.q.out
hive/branches/llap/ql/src/test/results/clientpositive/delete_whole_partition.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/delete_whole_partition.q.out
hive/branches/llap/ql/src/test/results/clientpositive/insert_orig_table.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/insert_orig_table.q.out
hive/branches/llap/ql/src/test/results/clientpositive/insert_update_delete.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/insert_update_delete.q.out
hive/branches/llap/ql/src/test/results/clientpositive/insert_values_dynamic_partitioned.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/insert_values_dynamic_partitioned.q.out
hive/branches/llap/ql/src/test/results/clientpositive/insert_values_non_partitioned.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/insert_values_non_partitioned.q.out
hive/branches/llap/ql/src/test/results/clientpositive/insert_values_orig_table.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/insert_values_orig_table.q.out
hive/branches/llap/ql/src/test/results/clientpositive/insert_values_partitioned.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/insert_values_partitioned.q.out
hive/branches/llap/ql/src/test/results/clientpositive/insert_values_tmp_table.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/insert_values_tmp_table.q.out
hive/branches/llap/ql/src/test/results/clientpositive/orc_merge5.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/orc_merge5.q.out
hive/branches/llap/ql/src/test/results/clientpositive/orc_merge6.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/orc_merge6.q.out
hive/branches/llap/ql/src/test/results/clientpositive/orc_merge7.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/orc_merge7.q.out
hive/branches/llap/ql/src/test/results/clientpositive/tez/correlationoptimizer1.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/tez/correlationoptimizer1.q.out
hive/branches/llap/ql/src/test/results/clientpositive/tez/delete_all_non_partitioned.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/tez/delete_all_non_partitioned.q.out
hive/branches/llap/ql/src/test/results/clientpositive/tez/delete_all_partitioned.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/tez/delete_all_partitioned.q.out
hive/branches/llap/ql/src/test/results/clientpositive/tez/delete_orig_table.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/tez/delete_orig_table.q.out
hive/branches/llap/ql/src/test/results/clientpositive/tez/delete_tmp_table.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/tez/delete_tmp_table.q.out
hive/branches/llap/ql/src/test/results/clientpositive/tez/delete_where_no_match.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/tez/delete_where_no_match.q.out
hive/branches/llap/ql/src/test/results/clientpositive/tez/delete_where_non_partitioned.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/tez/delete_where_non_partitioned.q.out
hive/branches/llap/ql/src/test/results/clientpositive/tez/delete_where_partitioned.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/tez/delete_where_partitioned.q.out
hive/branches/llap/ql/src/test/results/clientpositive/tez/delete_whole_partition.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/tez/delete_whole_partition.q.out
hive/branches/llap/ql/src/test/results/clientpositive/tez/insert_orig_table.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/tez/insert_orig_table.q.out
hive/branches/llap/ql/src/test/results/clientpositive/tez/insert_update_delete.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/tez/insert_update_delete.q.out
hive/branches/llap/ql/src/test/results/clientpositive/tez/insert_values_dynamic_partitioned.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/tez/insert_values_dynamic_partitioned.q.out
hive/branches/llap/ql/src/test/results/clientpositive/tez/insert_values_non_partitioned.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/tez/insert_values_non_partitioned.q.out
hive/branches/llap/ql/src/test/results/clientpositive/tez/insert_values_orig_table.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/tez/insert_values_orig_table.q.out
hive/branches/llap/ql/src/test/results/clientpositive/tez/insert_values_partitioned.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/tez/insert_values_partitioned.q.out
hive/branches/llap/ql/src/test/results/clientpositive/tez/insert_values_tmp_table.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/tez/insert_values_tmp_table.q.out
hive/branches/llap/ql/src/test/results/clientpositive/tez/orc_merge5.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge5.q.out
hive/branches/llap/ql/src/test/results/clientpositive/tez/orc_merge6.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge6.q.out
hive/branches/llap/ql/src/test/results/clientpositive/tez/orc_merge7.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge7.q.out
hive/branches/llap/ql/src/test/results/clientpositive/tez/orc_merge_incompat1.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge_incompat1.q.out
hive/branches/llap/ql/src/test/results/clientpositive/tez/orc_merge_incompat2.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/tez/orc_merge_incompat2.q.out
hive/branches/llap/ql/src/test/results/clientpositive/tez/parallel.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/tez/parallel.q.out
hive/branches/llap/ql/src/test/results/clientpositive/tez/update_after_multiple_inserts.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/tez/update_after_multiple_inserts.q.out
hive/branches/llap/ql/src/test/results/clientpositive/tez/update_all_non_partitioned.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/tez/update_all_non_partitioned.q.out
hive/branches/llap/ql/src/test/results/clientpositive/tez/update_all_partitioned.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/tez/update_all_partitioned.q.out
hive/branches/llap/ql/src/test/results/clientpositive/tez/update_all_types.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/tez/update_all_types.q.out
hive/branches/llap/ql/src/test/results/clientpositive/tez/update_orig_table.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/tez/update_orig_table.q.out
hive/branches/llap/ql/src/test/results/clientpositive/tez/update_tmp_table.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/tez/update_tmp_table.q.out
hive/branches/llap/ql/src/test/results/clientpositive/tez/update_two_cols.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/tez/update_two_cols.q.out
hive/branches/llap/ql/src/test/results/clientpositive/tez/update_where_no_match.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/tez/update_where_no_match.q.out
hive/branches/llap/ql/src/test/results/clientpositive/tez/update_where_non_partitioned.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/tez/update_where_non_partitioned.q.out
hive/branches/llap/ql/src/test/results/clientpositive/tez/update_where_partitioned.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/tez/update_where_partitioned.q.out
hive/branches/llap/ql/src/test/results/clientpositive/update_after_multiple_inserts.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/update_after_multiple_inserts.q.out
hive/branches/llap/ql/src/test/results/clientpositive/update_all_non_partitioned.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/update_all_non_partitioned.q.out
hive/branches/llap/ql/src/test/results/clientpositive/update_all_partitioned.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/update_all_partitioned.q.out
hive/branches/llap/ql/src/test/results/clientpositive/update_all_types.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/update_all_types.q.out
hive/branches/llap/ql/src/test/results/clientpositive/update_orig_table.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/update_orig_table.q.out
hive/branches/llap/ql/src/test/results/clientpositive/update_tmp_table.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/update_tmp_table.q.out
hive/branches/llap/ql/src/test/results/clientpositive/update_two_cols.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/update_two_cols.q.out
hive/branches/llap/ql/src/test/results/clientpositive/update_where_no_match.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/update_where_no_match.q.out
hive/branches/llap/ql/src/test/results/clientpositive/update_where_non_partitioned.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/update_where_non_partitioned.q.out
hive/branches/llap/ql/src/test/results/clientpositive/update_where_partitioned.q.out
- copied unchanged from r1625336, hive/trunk/ql/src/test/results/clientpositive/update_where_partitioned.q.out
hive/branches/llap/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/PropValueUnion.java
- copied unchanged from r1625336, hive/trunk/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/PropValueUnion.java
hive/branches/llap/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/SetIntString.java
- copied unchanged from r1625336, hive/trunk/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/SetIntString.java
hive/branches/llap/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ThriftObjectInspectorUtils.java
- copied unchanged from r1625336, hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ThriftObjectInspectorUtils.java
hive/branches/llap/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ThriftUnionObjectInspector.java
- copied unchanged from r1625336, hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ThriftUnionObjectInspector.java
Removed:
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/io/merge/MergeInputFormat.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/io/merge/MergeMapper.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/io/merge/MergeOutputFormat.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/io/merge/MergeTask.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/io/merge/MergeWork.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcFileMergeMapper.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/merge/RCFileMergeMapper.java
Modified:
hive/branches/llap/ (props changed)
hive/branches/llap/common/src/java/org/apache/hadoop/hive/common/FileUtils.java
hive/branches/llap/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
hive/branches/llap/contrib/src/test/results/clientpositive/udf_example_arraymapstruct.q.out
hive/branches/llap/data/conf/tez/hive-site.xml
hive/branches/llap/data/files/complex.seq
hive/branches/llap/hbase-handler/pom.xml (props changed)
hive/branches/llap/itests/hive-unit-hadoop2/src/test/java/org/apache/hadoop/hive/ql/security/TestStorageBasedMetastoreAuthorizationProviderWithACL.java
hive/branches/llap/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/history/TestHiveHistory.java
hive/branches/llap/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/TestStorageBasedClientSideAuthorizationProvider.java
hive/branches/llap/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/txn/compactor/TestCompactor.java
hive/branches/llap/itests/hive-unit/src/test/java/org/apache/hive/jdbc/miniHS2/TestHiveServer2.java
hive/branches/llap/itests/src/test/resources/testconfiguration.properties
hive/branches/llap/metastore/if/hive_metastore.thrift
hive/branches/llap/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.cpp
hive/branches/llap/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.h
hive/branches/llap/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FieldSchema.java
hive/branches/llap/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Partition.java
hive/branches/llap/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SerDeInfo.java
hive/branches/llap/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowCompactResponseElement.java
hive/branches/llap/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StorageDescriptor.java
hive/branches/llap/metastore/src/gen/thrift/gen-py/hive_metastore/ttypes.py
hive/branches/llap/metastore/src/gen/thrift/gen-rb/hive_metastore_types.rb
hive/branches/llap/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java
hive/branches/llap/metastore/src/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java
hive/branches/llap/metastore/src/test/org/apache/hadoop/hive/metastore/TestHiveMetaStorePartitionSpecs.java
hive/branches/llap/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/OperatorType.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/Context.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/Driver.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/ErrorMsg.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/exec/ColumnStatsTask.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/exec/MoveTask.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/exec/OperatorFactory.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/exec/ReduceSinkOperator.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/exec/TaskFactory.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/CustomPartitionEdge.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/DagUtils.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/RecordProcessor.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezProcessor.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorColumnAssignFactory.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/hooks/ReadEntity.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/hooks/WriteEntity.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/io/AcidUtils.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/io/orc/CompressionCodec.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcFile.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcFileStripeMergeInputFormat.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/io/orc/SnappyCodec.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/io/orc/Writer.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/io/orc/WriterImpl.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/io/orc/ZlibCodec.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/merge/RCFileBlockMergeInputFormat.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/lockmgr/DbTxnManager.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/lockmgr/DummyTxnManager.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/lockmgr/HiveTxnManager.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/metadata/Table.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/optimizer/BucketingSortingReduceSinkOptimizer.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/optimizer/Optimizer.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/optimizer/SortedDynPartitionOptimizer.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/optimizer/StatsOptimizer.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/parse/AppMasterEventProcessor.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/parse/BaseSemanticAnalyzer.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/parse/ExportSemanticAnalyzer.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/parse/ImportSemanticAnalyzer.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/parse/QBParseInfo.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzerFactory.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/parse/StorageFormat.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/parse/TezCompiler.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/plan/LoadTableDesc.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/plan/PlanUtils.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/plan/ReduceSinkDesc.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/Operation2Privilege.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/session/SessionState.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFToInteger.java
hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFIf.java
hive/branches/llap/ql/src/test/org/apache/hadoop/hive/ql/exec/TestExecDriver.java
hive/branches/llap/ql/src/test/queries/clientpositive/dynamic_partition_pruning_2.q
hive/branches/llap/ql/src/test/queries/clientpositive/exim_00_nonpart_empty.q
hive/branches/llap/ql/src/test/queries/clientpositive/input_lazyserde.q
hive/branches/llap/ql/src/test/queries/clientpositive/list_bucket_dml_8.q
hive/branches/llap/ql/src/test/queries/clientpositive/orc_merge1.q
hive/branches/llap/ql/src/test/queries/clientpositive/stats_only_null.q
hive/branches/llap/ql/src/test/queries/clientpositive/vector_decimal_aggregate.q
hive/branches/llap/ql/src/test/resources/orc-file-dump-dictionary-threshold.out
hive/branches/llap/ql/src/test/resources/orc-file-dump.out
hive/branches/llap/ql/src/test/results/beelinepositive/convert_enum_to_string.q.out
hive/branches/llap/ql/src/test/results/clientnegative/describe_xpath1.q.out
hive/branches/llap/ql/src/test/results/clientnegative/describe_xpath2.q.out
hive/branches/llap/ql/src/test/results/clientnegative/invalid_cast_from_binary_1.q.out
hive/branches/llap/ql/src/test/results/clientpositive/alter_merge_orc.q.out
hive/branches/llap/ql/src/test/results/clientpositive/alter_merge_stats_orc.q.out
hive/branches/llap/ql/src/test/results/clientpositive/case_sensitivity.q.out
hive/branches/llap/ql/src/test/results/clientpositive/columnarserde_create_shortcut.q.out
hive/branches/llap/ql/src/test/results/clientpositive/convert_enum_to_string.q.out
hive/branches/llap/ql/src/test/results/clientpositive/exim_00_nonpart_empty.q.out
hive/branches/llap/ql/src/test/results/clientpositive/exim_01_nonpart.q.out
hive/branches/llap/ql/src/test/results/clientpositive/exim_02_00_part_empty.q.out
hive/branches/llap/ql/src/test/results/clientpositive/exim_02_part.q.out
hive/branches/llap/ql/src/test/results/clientpositive/exim_03_nonpart_over_compat.q.out
hive/branches/llap/ql/src/test/results/clientpositive/exim_04_all_part.q.out
hive/branches/llap/ql/src/test/results/clientpositive/exim_04_evolved_parts.q.out
hive/branches/llap/ql/src/test/results/clientpositive/exim_05_some_part.q.out
hive/branches/llap/ql/src/test/results/clientpositive/exim_06_one_part.q.out
hive/branches/llap/ql/src/test/results/clientpositive/exim_07_all_part_over_nonoverlap.q.out
hive/branches/llap/ql/src/test/results/clientpositive/exim_08_nonpart_rename.q.out
hive/branches/llap/ql/src/test/results/clientpositive/exim_09_part_spec_nonoverlap.q.out
hive/branches/llap/ql/src/test/results/clientpositive/exim_10_external_managed.q.out
hive/branches/llap/ql/src/test/results/clientpositive/exim_11_managed_external.q.out
hive/branches/llap/ql/src/test/results/clientpositive/exim_12_external_location.q.out
hive/branches/llap/ql/src/test/results/clientpositive/exim_13_managed_location.q.out
hive/branches/llap/ql/src/test/results/clientpositive/exim_14_managed_location_over_existing.q.out
hive/branches/llap/ql/src/test/results/clientpositive/exim_15_external_part.q.out
hive/branches/llap/ql/src/test/results/clientpositive/exim_16_part_external.q.out
hive/branches/llap/ql/src/test/results/clientpositive/exim_17_part_managed.q.out
hive/branches/llap/ql/src/test/results/clientpositive/exim_18_part_external.q.out
hive/branches/llap/ql/src/test/results/clientpositive/exim_19_00_part_external_location.q.out
hive/branches/llap/ql/src/test/results/clientpositive/exim_19_part_external_location.q.out
hive/branches/llap/ql/src/test/results/clientpositive/exim_20_part_managed_location.q.out
hive/branches/llap/ql/src/test/results/clientpositive/exim_22_import_exist_authsuccess.q.out
hive/branches/llap/ql/src/test/results/clientpositive/exim_23_import_part_authsuccess.q.out
hive/branches/llap/ql/src/test/results/clientpositive/exim_24_import_nonexist_authsuccess.q.out
hive/branches/llap/ql/src/test/results/clientpositive/exim_hidden_files.q.out
hive/branches/llap/ql/src/test/results/clientpositive/import_exported_table.q.out
hive/branches/llap/ql/src/test/results/clientpositive/infer_bucket_sort_dyn_part.q.out
hive/branches/llap/ql/src/test/results/clientpositive/input17.q.out
hive/branches/llap/ql/src/test/results/clientpositive/input5.q.out
hive/branches/llap/ql/src/test/results/clientpositive/input_columnarserde.q.out
hive/branches/llap/ql/src/test/results/clientpositive/input_dynamicserde.q.out
hive/branches/llap/ql/src/test/results/clientpositive/input_lazyserde.q.out
hive/branches/llap/ql/src/test/results/clientpositive/input_testxpath.q.out
hive/branches/llap/ql/src/test/results/clientpositive/input_testxpath2.q.out
hive/branches/llap/ql/src/test/results/clientpositive/input_testxpath3.q.out
hive/branches/llap/ql/src/test/results/clientpositive/input_testxpath4.q.out
hive/branches/llap/ql/src/test/results/clientpositive/inputddl8.q.out
hive/branches/llap/ql/src/test/results/clientpositive/join_thrift.q.out
hive/branches/llap/ql/src/test/results/clientpositive/list_bucket_dml_10.q.out
hive/branches/llap/ql/src/test/results/clientpositive/list_bucket_dml_4.q.out
hive/branches/llap/ql/src/test/results/clientpositive/list_bucket_dml_6.q.out
hive/branches/llap/ql/src/test/results/clientpositive/list_bucket_dml_7.q.out
hive/branches/llap/ql/src/test/results/clientpositive/list_bucket_dml_9.q.out
hive/branches/llap/ql/src/test/results/clientpositive/merge_dynamic_partition4.q.out
hive/branches/llap/ql/src/test/results/clientpositive/merge_dynamic_partition5.q.out
hive/branches/llap/ql/src/test/results/clientpositive/orc_analyze.q.out
hive/branches/llap/ql/src/test/results/clientpositive/orc_createas1.q.out
hive/branches/llap/ql/src/test/results/clientpositive/orc_merge1.q.out
hive/branches/llap/ql/src/test/results/clientpositive/orc_merge3.q.out
hive/branches/llap/ql/src/test/results/clientpositive/orc_merge4.q.out
hive/branches/llap/ql/src/test/results/clientpositive/rcfile_createas1.q.out
hive/branches/llap/ql/src/test/results/clientpositive/rcfile_merge1.q.out
hive/branches/llap/ql/src/test/results/clientpositive/rcfile_merge2.q.out
hive/branches/llap/ql/src/test/results/clientpositive/rcfile_merge3.q.out
hive/branches/llap/ql/src/test/results/clientpositive/stats_only_null.q.out
hive/branches/llap/ql/src/test/results/clientpositive/tez/alter_merge_orc.q.out
hive/branches/llap/ql/src/test/results/clientpositive/tez/alter_merge_stats_orc.q.out
hive/branches/llap/ql/src/test/results/clientpositive/tez/dynamic_partition_pruning_2.q.out
hive/branches/llap/ql/src/test/results/clientpositive/tez/orc_analyze.q.out
hive/branches/llap/ql/src/test/results/clientpositive/tez/orc_merge1.q.out
hive/branches/llap/ql/src/test/results/clientpositive/tez/orc_merge3.q.out
hive/branches/llap/ql/src/test/results/clientpositive/tez/orc_merge4.q.out
hive/branches/llap/ql/src/test/results/clientpositive/tez/vector_decimal_aggregate.q.out
hive/branches/llap/ql/src/test/results/clientpositive/tez/vectorized_ptf.q.out
hive/branches/llap/ql/src/test/results/clientpositive/udf_case_thrift.q.out
hive/branches/llap/ql/src/test/results/clientpositive/udf_coalesce.q.out
hive/branches/llap/ql/src/test/results/clientpositive/udf_isnull_isnotnull.q.out
hive/branches/llap/ql/src/test/results/clientpositive/udf_size.q.out
hive/branches/llap/ql/src/test/results/clientpositive/union21.q.out
hive/branches/llap/ql/src/test/results/clientpositive/union_remove_10.q.out
hive/branches/llap/ql/src/test/results/clientpositive/union_remove_11.q.out
hive/branches/llap/ql/src/test/results/clientpositive/union_remove_12.q.out
hive/branches/llap/ql/src/test/results/clientpositive/union_remove_13.q.out
hive/branches/llap/ql/src/test/results/clientpositive/union_remove_14.q.out
hive/branches/llap/ql/src/test/results/clientpositive/union_remove_16.q.out
hive/branches/llap/ql/src/test/results/clientpositive/union_remove_9.q.out
hive/branches/llap/ql/src/test/results/clientpositive/vector_decimal_aggregate.q.out
hive/branches/llap/ql/src/test/results/clientpositive/vectorized_ptf.q.out
hive/branches/llap/ql/src/test/results/compiler/plan/case_sensitivity.q.xml
hive/branches/llap/ql/src/test/results/compiler/plan/input5.q.xml
hive/branches/llap/ql/src/test/results/compiler/plan/input_testxpath.q.xml
hive/branches/llap/ql/src/test/results/compiler/plan/input_testxpath2.q.xml
hive/branches/llap/serde/if/test/complex.thrift
hive/branches/llap/serde/src/gen/thrift/gen-cpp/complex_types.cpp
hive/branches/llap/serde/src/gen/thrift/gen-cpp/complex_types.h
hive/branches/llap/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/Complex.java
hive/branches/llap/serde/src/gen/thrift/gen-py/complex/ttypes.py
hive/branches/llap/serde/src/gen/thrift/gen-rb/complex_types.rb
hive/branches/llap/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorFactory.java
hive/branches/llap/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ReflectionStructObjectInspector.java
hive/branches/llap/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/StandardListObjectInspector.java
hive/branches/llap/serde/src/test/org/apache/hadoop/hive/serde2/objectinspector/TestObjectInspectorUtils.java
hive/branches/llap/serde/src/test/org/apache/hadoop/hive/serde2/objectinspector/TestThriftObjectInspectors.java
hive/branches/llap/serde/src/test/org/apache/hadoop/hive/serde2/thrift_test/CreateSequenceFile.java
hive/branches/llap/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/PTest.java
hive/branches/llap/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/TestConfiguration.java
hive/branches/llap/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/ssh/SSHCommandExecutor.java
hive/branches/llap/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/ssh/TestSSHCommandExecutor.java
Propchange: hive/branches/llap/
------------------------------------------------------------------------------
Merged /hive/trunk:r1624170-1625336
Modified: hive/branches/llap/common/src/java/org/apache/hadoop/hive/common/FileUtils.java
URL: http://svn.apache.org/viewvc/hive/branches/llap/common/src/java/org/apache/hadoop/hive/common/FileUtils.java?rev=1625341&r1=1625340&r2=1625341&view=diff
==============================================================================
--- hive/branches/llap/common/src/java/org/apache/hadoop/hive/common/FileUtils.java (original)
+++ hive/branches/llap/common/src/java/org/apache/hadoop/hive/common/FileUtils.java Tue Sep 16 17:37:13 2014
@@ -446,12 +446,26 @@ public final class FileUtils {
public static boolean isLocalFile(HiveConf conf, String fileName) {
try {
// do best effor to determine if this is a local file
- FileSystem fsForFile = FileSystem.get(new URI(fileName), conf);
- return LocalFileSystem.class.isInstance(fsForFile);
+ return isLocalFile(conf, new URI(fileName));
} catch (URISyntaxException e) {
LOG.warn("Unable to create URI from " + fileName, e);
+ }
+ return false;
+ }
+
+ /**
+ * A best effort attempt to determine if if the file is a local file
+ * @param conf
+ * @param fileUri
+ * @return true if it was successfully able to determine that it is a local file
+ */
+ public static boolean isLocalFile(HiveConf conf, URI fileUri) {
+ try {
+ // do best effor to determine if this is a local file
+ FileSystem fsForFile = FileSystem.get(fileUri, conf);
+ return LocalFileSystem.class.isInstance(fsForFile);
} catch (IOException e) {
- LOG.warn("Unable to get FileSystem for " + fileName, e);
+ LOG.warn("Unable to get FileSystem for " + fileUri, e);
}
return false;
}
Modified: hive/branches/llap/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
URL: http://svn.apache.org/viewvc/hive/branches/llap/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java?rev=1625341&r1=1625340&r2=1625341&view=diff
==============================================================================
--- hive/branches/llap/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java (original)
+++ hive/branches/llap/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java Tue Sep 16 17:37:13 2014
@@ -301,6 +301,9 @@ public class HiveConf extends Configurat
HIVE_IN_TEST("hive.in.test", false, "internal usage only, true in test mode", true),
+ HIVE_IN_TEZ_TEST("hive.in.tez.test", false, "internal use only, true when in testing tez",
+ true),
+
LOCALMODEAUTO("hive.exec.mode.local.auto", false,
"Let Hive determine whether to run in local mode automatically"),
LOCALMODEMAXBYTES("hive.exec.mode.local.auto.inputbytes.max", 134217728L,
@@ -803,18 +806,11 @@ public class HiveConf extends Configurat
"map-reduce job to merge the output files into bigger files. This is only done for map-only jobs \n" +
"if hive.merge.mapfiles is true, and for map-reduce jobs if hive.merge.mapredfiles is true."),
HIVEMERGERCFILEBLOCKLEVEL("hive.merge.rcfile.block.level", true, ""),
- HIVEMERGEINPUTFORMATBLOCKLEVEL("hive.merge.input.format.block.level",
- "org.apache.hadoop.hive.ql.io.rcfile.merge.RCFileBlockMergeInputFormat", ""),
HIVEMERGEORCFILESTRIPELEVEL("hive.merge.orcfile.stripe.level", true,
"When hive.merge.mapfiles or hive.merge.mapredfiles is enabled while writing a\n" +
" table with ORC file format, enabling this config will do stripe level fast merge\n" +
" for small ORC files. Note that enabling this config will not honor padding tolerance\n" +
" config (hive.exec.orc.block.padding.tolerance)."),
- HIVEMERGEINPUTFORMATSTRIPELEVEL("hive.merge.input.format.stripe.level",
- "org.apache.hadoop.hive.ql.io.orc.OrcFileStripeMergeInputFormat",
- "Input file format to use for ORC stripe level merging (for internal use only)"),
- HIVEMERGECURRENTJOBHASDYNAMICPARTITIONS(
- "hive.merge.current.job.has.dynamic.partitions", false, ""),
HIVEUSEEXPLICITRCFILEHEADER("hive.exec.rcfile.use.explicit.header", true,
"If this is set the header for RCFiles will simply be RCF. If this is not\n" +
@@ -859,6 +855,10 @@ public class HiveConf extends Configurat
"only affect the light weight encoding for integers. This flag will not\n" +
"change the compression level of higher level compression codec (like ZLIB)."),
+ HIVE_ORC_COMPRESSION_STRATEGY("hive.exec.orc.compression.strategy", "SPEED", new StringSet("SPEED", "COMPRESSION"),
+ "Define the compression strategy to use while writing data. \n" +
+ "This changes the compression level of higher level compression codec (like ZLIB)."),
+
HIVE_ORC_INCLUDE_FILE_FOOTER_IN_SPLITS("hive.orc.splits.include.file.footer", false,
"If turned on splits generated by orc will include metadata about the stripes in the file. This\n" +
"data is read remotely (from the client or HS2 machine) and sent to all the tasks."),
@@ -1672,17 +1672,6 @@ public class HiveConf extends Configurat
" it will now take 512 reducers, similarly if the max number of reducers is 511,\n" +
" and a job was going to use this many, it will now use 256 reducers."),
- /* The following section contains all configurations used for list bucketing feature.*/
- /* This is not for clients. but only for block merge task. */
- /* This is used by BlockMergeTask to send out flag to RCFileMergeMapper */
- /* about alter table...concatenate and list bucketing case. */
- HIVEMERGECURRENTJOBCONCATENATELISTBUCKETING(
- "hive.merge.current.job.concatenate.list.bucketing", true, ""),
- /* This is not for clients. but only for block merge task. */
- /* This is used by BlockMergeTask to send out flag to RCFileMergeMapper */
- /* about depth of list bucketing. */
- HIVEMERGECURRENTJOBCONCATENATELISTBUCKETINGDEPTH(
- "hive.merge.current.job.concatenate.list.bucketing.depth", 0, ""),
HIVEOPTLISTBUCKETING("hive.optimize.listbucketing", false,
"Enable list bucketing optimizer. Default value is false so that we disable it by default."),
@@ -1793,7 +1782,7 @@ public class HiveConf extends Configurat
"vertices to the tez application master. These events will be used to prune unnecessary partitions."),
TEZ_DYNAMIC_PARTITION_PRUNING_MAX_EVENT_SIZE("hive.tez.dynamic.partition.pruning.max.event.size", 1*1024*1024L,
"Maximum size of events sent by processors in dynamic pruning. If this size is crossed no pruning will take place."),
- TEZ_DYNAMIC_PARTITION_PRUNING_MAX_DATA_SIZE("hive.tez.dynamic.parition.pruning.max.data.size", 100*1024*1024L,
+ TEZ_DYNAMIC_PARTITION_PRUNING_MAX_DATA_SIZE("hive.tez.dynamic.partition.pruning.max.data.size", 100*1024*1024L,
"Maximum total data size of events in dynamic pruning.")
;
Modified: hive/branches/llap/contrib/src/test/results/clientpositive/udf_example_arraymapstruct.q.out
URL: http://svn.apache.org/viewvc/hive/branches/llap/contrib/src/test/results/clientpositive/udf_example_arraymapstruct.q.out?rev=1625341&r1=1625340&r2=1625341&view=diff
==============================================================================
--- hive/branches/llap/contrib/src/test/results/clientpositive/udf_example_arraymapstruct.q.out (original)
+++ hive/branches/llap/contrib/src/test/results/clientpositive/udf_example_arraymapstruct.q.out Tue Sep 16 17:37:13 2014
@@ -34,14 +34,14 @@ STAGE PLANS:
Map Operator Tree:
TableScan
alias: src_thrift
- Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
Select Operator
expressions: example_arraysum(lint) (type: double), example_mapconcat(mstringstring) (type: string), example_structprint(lintstring[0]) (type: string)
outputColumnNames: _col0, _col1, _col2
- Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
File Output Operator
compressed: false
- Statistics: Num rows: 11 Data size: 1606 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 11 Data size: 3070 Basic stats: COMPLETE Column stats: NONE
table:
input format: org.apache.hadoop.mapred.TextInputFormat
output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
Modified: hive/branches/llap/data/conf/tez/hive-site.xml
URL: http://svn.apache.org/viewvc/hive/branches/llap/data/conf/tez/hive-site.xml?rev=1625341&r1=1625340&r2=1625341&view=diff
==============================================================================
Binary files - no diff available.
Modified: hive/branches/llap/data/files/complex.seq
URL: http://svn.apache.org/viewvc/hive/branches/llap/data/files/complex.seq?rev=1625341&r1=1625340&r2=1625341&view=diff
==============================================================================
Binary files - no diff available.
Propchange: hive/branches/llap/hbase-handler/pom.xml
------------------------------------------------------------------------------
Merged /hive/trunk/hbase-handler/pom.xml:r1624170-1625336
Modified: hive/branches/llap/itests/hive-unit-hadoop2/src/test/java/org/apache/hadoop/hive/ql/security/TestStorageBasedMetastoreAuthorizationProviderWithACL.java
URL: http://svn.apache.org/viewvc/hive/branches/llap/itests/hive-unit-hadoop2/src/test/java/org/apache/hadoop/hive/ql/security/TestStorageBasedMetastoreAuthorizationProviderWithACL.java?rev=1625341&r1=1625340&r2=1625341&view=diff
==============================================================================
--- hive/branches/llap/itests/hive-unit-hadoop2/src/test/java/org/apache/hadoop/hive/ql/security/TestStorageBasedMetastoreAuthorizationProviderWithACL.java (original)
+++ hive/branches/llap/itests/hive-unit-hadoop2/src/test/java/org/apache/hadoop/hive/ql/security/TestStorageBasedMetastoreAuthorizationProviderWithACL.java Tue Sep 16 17:37:13 2014
@@ -154,11 +154,6 @@ public class TestStorageBasedMetastoreAu
allowWriteAccessViaAcl(userName, warehouseDir.toString());
}
- protected void disallowCreateDatabase(String userName)
- throws Exception {
- disallowWriteAccessViaAcl(userName, warehouseDir.toString());
- }
-
@Override
protected void allowCreateInDb(String dbName, String userName, String location)
throws Exception {
Modified: hive/branches/llap/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/history/TestHiveHistory.java
URL: http://svn.apache.org/viewvc/hive/branches/llap/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/history/TestHiveHistory.java?rev=1625341&r1=1625340&r2=1625341&view=diff
==============================================================================
--- hive/branches/llap/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/history/TestHiveHistory.java (original)
+++ hive/branches/llap/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/history/TestHiveHistory.java Tue Sep 16 17:37:13 2014
@@ -103,7 +103,7 @@ public class TestHiveHistory extends Tes
db.dropTable(MetaStoreUtils.DEFAULT_DATABASE_NAME, src, true, true);
db.createTable(src, cols, null, TextInputFormat.class,
IgnoreKeyTextOutputFormat.class);
- db.loadTable(hadoopDataFile[i], src, false, false, false, false);
+ db.loadTable(hadoopDataFile[i], src, false, false, false, false, false);
i++;
}
Modified: hive/branches/llap/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/TestStorageBasedClientSideAuthorizationProvider.java
URL: http://svn.apache.org/viewvc/hive/branches/llap/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/TestStorageBasedClientSideAuthorizationProvider.java?rev=1625341&r1=1625340&r2=1625341&view=diff
==============================================================================
--- hive/branches/llap/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/TestStorageBasedClientSideAuthorizationProvider.java (original)
+++ hive/branches/llap/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/TestStorageBasedClientSideAuthorizationProvider.java Tue Sep 16 17:37:13 2014
@@ -85,7 +85,7 @@ public class TestStorageBasedClientSideA
protected void assertNoPrivileges(CommandProcessorResponse ret){
assertNotNull(ret);
assertFalse(0 == ret.getResponseCode());
- assertTrue(ret.getErrorMessage().indexOf("not permitted") != -1);
+ assertTrue(ret.getErrorMessage().indexOf("AccessControlException") != -1);
}
Modified: hive/branches/llap/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/txn/compactor/TestCompactor.java
URL: http://svn.apache.org/viewvc/hive/branches/llap/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/txn/compactor/TestCompactor.java?rev=1625341&r1=1625340&r2=1625341&view=diff
==============================================================================
--- hive/branches/llap/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/txn/compactor/TestCompactor.java (original)
+++ hive/branches/llap/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/txn/compactor/TestCompactor.java Tue Sep 16 17:37:13 2014
@@ -147,10 +147,10 @@ public class TestCompactor {
execSelectAndDumpData("select * from " + tblNameStg, driver, "Dumping data for " +
tblNameStg + " after load:");
executeStatementOnDriver("FROM " + tblNameStg +
- " INSERT OVERWRITE TABLE " + tblName + " PARTITION(bkt=0) " +
+ " INSERT INTO TABLE " + tblName + " PARTITION(bkt=0) " +
"SELECT a, b where a < 2", driver);
executeStatementOnDriver("FROM " + tblNameStg +
- " INSERT OVERWRITE TABLE " + tblName + " PARTITION(bkt=1) " +
+ " INSERT INTO TABLE " + tblName + " PARTITION(bkt=1) " +
"SELECT a, b where a >= 2", driver);
execSelectAndDumpData("select * from " + tblName, driver, "Dumping data for " +
tblName + " after load:");
Modified: hive/branches/llap/itests/hive-unit/src/test/java/org/apache/hive/jdbc/miniHS2/TestHiveServer2.java
URL: http://svn.apache.org/viewvc/hive/branches/llap/itests/hive-unit/src/test/java/org/apache/hive/jdbc/miniHS2/TestHiveServer2.java?rev=1625341&r1=1625340&r2=1625341&view=diff
==============================================================================
--- hive/branches/llap/itests/hive-unit/src/test/java/org/apache/hive/jdbc/miniHS2/TestHiveServer2.java (original)
+++ hive/branches/llap/itests/hive-unit/src/test/java/org/apache/hive/jdbc/miniHS2/TestHiveServer2.java Tue Sep 16 17:37:13 2014
@@ -18,9 +18,9 @@
package org.apache.hive.jdbc.miniHS2;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
-import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
@@ -31,7 +31,7 @@ import org.apache.hive.service.cli.Opera
import org.apache.hive.service.cli.RowSet;
import org.apache.hive.service.cli.SessionHandle;
import org.junit.After;
-import org.junit.Assert;
+import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -39,44 +39,60 @@ import org.junit.Test;
public class TestHiveServer2 {
private static MiniHS2 miniHS2 = null;
- private Map<String, String> confOverlay;
+ private static Map<String, String> confOverlay;
@BeforeClass
public static void beforeTest() throws Exception {
miniHS2 = new MiniHS2(new HiveConf());
+ confOverlay = new HashMap<String, String>();
+ confOverlay.put(ConfVars.HIVE_SUPPORT_CONCURRENCY.varname, "false");
+ miniHS2.start(confOverlay);
+ }
+
+ @AfterClass
+ public static void afterTest() throws Exception {
+ miniHS2.stop();
}
@Before
public void setUp() throws Exception {
- confOverlay = new HashMap<String, String>();
- confOverlay.put(ConfVars.HIVE_SUPPORT_CONCURRENCY.varname, "false");
- miniHS2.start(confOverlay);
}
@After
public void tearDown() throws Exception {
- miniHS2.stop();
}
+ /**
+ * Open a new session and run a test query
+ * @throws Exception
+ */
@Test
public void testConnection() throws Exception {
- String tabName = "testTab1";
+ String tableName = "TestHiveServer2TestConnection";
CLIServiceClient serviceClient = miniHS2.getServiceClient();
SessionHandle sessHandle = serviceClient.openSession("foo", "bar");
- serviceClient.executeStatement(sessHandle, "DROP TABLE IF EXISTS tab", confOverlay);
- serviceClient.executeStatement(sessHandle, "CREATE TABLE " + tabName + " (id INT)", confOverlay);
+ serviceClient.executeStatement(sessHandle, "DROP TABLE IF EXISTS " + tableName, confOverlay);
+ serviceClient.executeStatement(sessHandle, "CREATE TABLE " + tableName + " (id INT)", confOverlay);
OperationHandle opHandle = serviceClient.executeStatement(sessHandle, "SHOW TABLES", confOverlay);
RowSet rowSet = serviceClient.fetchResults(opHandle);
assertFalse(rowSet.numRows() == 0);
+ serviceClient.executeStatement(sessHandle, "DROP TABLE IF EXISTS " + tableName, confOverlay);
+ serviceClient.closeSession(sessHandle);
}
+
+ /**
+ * Open a new session and execute a set command
+ * @throws Exception
+ */
@Test
public void testGetVariableValue() throws Exception {
CLIServiceClient serviceClient = miniHS2.getServiceClient();
SessionHandle sessHandle = serviceClient.openSession("foo", "bar");
OperationHandle opHandle = serviceClient.executeStatement(sessHandle, "set system:os.name", confOverlay);
RowSet rowSet = serviceClient.fetchResults(opHandle);
- Assert.assertEquals(1, rowSet.numRows());
+ assertEquals(1, rowSet.numRows());
+ serviceClient.closeSession(sessHandle);
}
}
Modified: hive/branches/llap/itests/src/test/resources/testconfiguration.properties
URL: http://svn.apache.org/viewvc/hive/branches/llap/itests/src/test/resources/testconfiguration.properties?rev=1625341&r1=1625340&r2=1625341&view=diff
==============================================================================
--- hive/branches/llap/itests/src/test/resources/testconfiguration.properties (original)
+++ hive/branches/llap/itests/src/test/resources/testconfiguration.properties Tue Sep 16 17:37:13 2014
@@ -55,6 +55,7 @@ minitez.query.files.shared=alter_merge_2
bucket2.q,\
bucket3.q,\
bucket4.q,\
+ correlationoptimizer1.q,\
count.q,\
create_merge_compressed.q,\
cross_join.q,\
@@ -62,6 +63,14 @@ minitez.query.files.shared=alter_merge_2
cross_product_check_2.q,\
ctas.q,\
custom_input_output_format.q,\
+ delete_all_non_partitioned.q,\
+ delete_all_partitioned.q,\
+ delete_orig_table.q,\
+ delete_tmp_table.q,\
+ delete_where_no_match.q,\
+ delete_where_non_partitioned.q,\
+ delete_where_partitioned.q,\
+ delete_whole_partition.q,\
disable_merge_for_bucketing.q,\
dynpart_sort_opt_vectorization.q,\
dynpart_sort_optimization.q,\
@@ -75,6 +84,13 @@ minitez.query.files.shared=alter_merge_2
insert1.q,\
insert_into1.q,\
insert_into2.q,\
+ insert_orig_table.q,\
+ insert_values_dynamic_partitioned.q,\
+ insert_values_non_partitioned.q,\
+ insert_values_orig_table.q\
+ insert_values_partitioned.q,\
+ insert_values_tmp_table.q,\
+ insert_update_delete.q,\
join0.q,\
join1.q,\
leftsemijoin.q,\
@@ -95,6 +111,12 @@ minitez.query.files.shared=alter_merge_2
orc_merge2.q,\
orc_merge3.q,\
orc_merge4.q,\
+ orc_merge5.q,\
+ orc_merge6.q,\
+ orc_merge7.q,\
+ orc_merge_incompat1.q,\
+ orc_merge_incompat2.q,\
+ parallel.q,\
ptf.q,\
sample1.q,\
script_env_var1.q,\
@@ -120,6 +142,16 @@ minitez.query.files.shared=alter_merge_2
union7.q,\
union8.q,\
union9.q,\
+ update_after_multiple_inserts.q,\
+ update_all_non_partitioned.q,\
+ update_all_partitioned.q,\
+ update_all_types.q,\
+ update_orig_table.q,\
+ update_tmp_table.q,\
+ update_where_no_match.q,\
+ update_where_non_partitioned.q,\
+ update_where_partitioned.q,\
+ update_two_cols.q,\
vector_cast_constant.q,\
vector_data_types.q,\
vector_decimal_aggregate.q,\
Modified: hive/branches/llap/metastore/if/hive_metastore.thrift
URL: http://svn.apache.org/viewvc/hive/branches/llap/metastore/if/hive_metastore.thrift?rev=1625341&r1=1625340&r2=1625341&view=diff
==============================================================================
--- hive/branches/llap/metastore/if/hive_metastore.thrift (original)
+++ hive/branches/llap/metastore/if/hive_metastore.thrift Tue Sep 16 17:37:13 2014
@@ -630,12 +630,12 @@ struct ShowCompactRequest {
struct ShowCompactResponseElement {
1: required string dbname,
2: required string tablename,
- 3: required string partitionname,
+ 3: optional string partitionname,
4: required CompactionType type,
5: required string state,
- 6: required string workerid,
- 7: required i64 start,
- 8: required string runAs,
+ 6: optional string workerid,
+ 7: optional i64 start,
+ 8: optional string runAs,
}
struct ShowCompactResponse {
Modified: hive/branches/llap/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.cpp
URL: http://svn.apache.org/viewvc/hive/branches/llap/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.cpp?rev=1625341&r1=1625340&r2=1625341&view=diff
==============================================================================
--- hive/branches/llap/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.cpp (original)
+++ hive/branches/llap/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.cpp Tue Sep 16 17:37:13 2014
@@ -9027,8 +9027,8 @@ void swap(ShowCompactRequest &a, ShowCom
(void) b;
}
-const char* ShowCompactResponseElement::ascii_fingerprint = "42464F3A97707F984FDE462104223A69";
-const uint8_t ShowCompactResponseElement::binary_fingerprint[16] = {0x42,0x46,0x4F,0x3A,0x97,0x70,0x7F,0x98,0x4F,0xDE,0x46,0x21,0x04,0x22,0x3A,0x69};
+const char* ShowCompactResponseElement::ascii_fingerprint = "2F338C265DC4FD82DD13F4966FE43F13";
+const uint8_t ShowCompactResponseElement::binary_fingerprint[16] = {0x2F,0x33,0x8C,0x26,0x5D,0xC4,0xFD,0x82,0xDD,0x13,0xF4,0x96,0x6F,0xE4,0x3F,0x13};
uint32_t ShowCompactResponseElement::read(::apache::thrift::protocol::TProtocol* iprot) {
@@ -9043,12 +9043,8 @@ uint32_t ShowCompactResponseElement::rea
bool isset_dbname = false;
bool isset_tablename = false;
- bool isset_partitionname = false;
bool isset_type = false;
bool isset_state = false;
- bool isset_workerid = false;
- bool isset_start = false;
- bool isset_runAs = false;
while (true)
{
@@ -9077,7 +9073,7 @@ uint32_t ShowCompactResponseElement::rea
case 3:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->partitionname);
- isset_partitionname = true;
+ this->__isset.partitionname = true;
} else {
xfer += iprot->skip(ftype);
}
@@ -9103,7 +9099,7 @@ uint32_t ShowCompactResponseElement::rea
case 6:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->workerid);
- isset_workerid = true;
+ this->__isset.workerid = true;
} else {
xfer += iprot->skip(ftype);
}
@@ -9111,7 +9107,7 @@ uint32_t ShowCompactResponseElement::rea
case 7:
if (ftype == ::apache::thrift::protocol::T_I64) {
xfer += iprot->readI64(this->start);
- isset_start = true;
+ this->__isset.start = true;
} else {
xfer += iprot->skip(ftype);
}
@@ -9119,7 +9115,7 @@ uint32_t ShowCompactResponseElement::rea
case 8:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->runAs);
- isset_runAs = true;
+ this->__isset.runAs = true;
} else {
xfer += iprot->skip(ftype);
}
@@ -9137,18 +9133,10 @@ uint32_t ShowCompactResponseElement::rea
throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_tablename)
throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_partitionname)
- throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_type)
throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_state)
throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_workerid)
- throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_start)
- throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_runAs)
- throw TProtocolException(TProtocolException::INVALID_DATA);
return xfer;
}
@@ -9164,10 +9152,11 @@ uint32_t ShowCompactResponseElement::wri
xfer += oprot->writeString(this->tablename);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("partitionname", ::apache::thrift::protocol::T_STRING, 3);
- xfer += oprot->writeString(this->partitionname);
- xfer += oprot->writeFieldEnd();
-
+ if (this->__isset.partitionname) {
+ xfer += oprot->writeFieldBegin("partitionname", ::apache::thrift::protocol::T_STRING, 3);
+ xfer += oprot->writeString(this->partitionname);
+ xfer += oprot->writeFieldEnd();
+ }
xfer += oprot->writeFieldBegin("type", ::apache::thrift::protocol::T_I32, 4);
xfer += oprot->writeI32((int32_t)this->type);
xfer += oprot->writeFieldEnd();
@@ -9176,18 +9165,21 @@ uint32_t ShowCompactResponseElement::wri
xfer += oprot->writeString(this->state);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("workerid", ::apache::thrift::protocol::T_STRING, 6);
- xfer += oprot->writeString(this->workerid);
- xfer += oprot->writeFieldEnd();
-
- xfer += oprot->writeFieldBegin("start", ::apache::thrift::protocol::T_I64, 7);
- xfer += oprot->writeI64(this->start);
- xfer += oprot->writeFieldEnd();
-
- xfer += oprot->writeFieldBegin("runAs", ::apache::thrift::protocol::T_STRING, 8);
- xfer += oprot->writeString(this->runAs);
- xfer += oprot->writeFieldEnd();
-
+ if (this->__isset.workerid) {
+ xfer += oprot->writeFieldBegin("workerid", ::apache::thrift::protocol::T_STRING, 6);
+ xfer += oprot->writeString(this->workerid);
+ xfer += oprot->writeFieldEnd();
+ }
+ if (this->__isset.start) {
+ xfer += oprot->writeFieldBegin("start", ::apache::thrift::protocol::T_I64, 7);
+ xfer += oprot->writeI64(this->start);
+ xfer += oprot->writeFieldEnd();
+ }
+ if (this->__isset.runAs) {
+ xfer += oprot->writeFieldBegin("runAs", ::apache::thrift::protocol::T_STRING, 8);
+ xfer += oprot->writeString(this->runAs);
+ xfer += oprot->writeFieldEnd();
+ }
xfer += oprot->writeFieldStop();
xfer += oprot->writeStructEnd();
return xfer;
@@ -9203,10 +9195,11 @@ void swap(ShowCompactResponseElement &a,
swap(a.workerid, b.workerid);
swap(a.start, b.start);
swap(a.runAs, b.runAs);
+ swap(a.__isset, b.__isset);
}
-const char* ShowCompactResponse::ascii_fingerprint = "3CCBC4D398CA25527272FE78625DE88A";
-const uint8_t ShowCompactResponse::binary_fingerprint[16] = {0x3C,0xCB,0xC4,0xD3,0x98,0xCA,0x25,0x52,0x72,0x72,0xFE,0x78,0x62,0x5D,0xE8,0x8A};
+const char* ShowCompactResponse::ascii_fingerprint = "915B7B8DB8966D65769C0F98707BBAE3";
+const uint8_t ShowCompactResponse::binary_fingerprint[16] = {0x91,0x5B,0x7B,0x8D,0xB8,0x96,0x6D,0x65,0x76,0x9C,0x0F,0x98,0x70,0x7B,0xBA,0xE3};
uint32_t ShowCompactResponse::read(::apache::thrift::protocol::TProtocol* iprot) {
Modified: hive/branches/llap/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.h
URL: http://svn.apache.org/viewvc/hive/branches/llap/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.h?rev=1625341&r1=1625340&r2=1625341&view=diff
==============================================================================
--- hive/branches/llap/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.h (original)
+++ hive/branches/llap/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.h Tue Sep 16 17:37:13 2014
@@ -4934,12 +4934,19 @@ class ShowCompactRequest {
void swap(ShowCompactRequest &a, ShowCompactRequest &b);
+typedef struct _ShowCompactResponseElement__isset {
+ _ShowCompactResponseElement__isset() : partitionname(false), workerid(false), start(false), runAs(false) {}
+ bool partitionname;
+ bool workerid;
+ bool start;
+ bool runAs;
+} _ShowCompactResponseElement__isset;
class ShowCompactResponseElement {
public:
- static const char* ascii_fingerprint; // = "42464F3A97707F984FDE462104223A69";
- static const uint8_t binary_fingerprint[16]; // = {0x42,0x46,0x4F,0x3A,0x97,0x70,0x7F,0x98,0x4F,0xDE,0x46,0x21,0x04,0x22,0x3A,0x69};
+ static const char* ascii_fingerprint; // = "2F338C265DC4FD82DD13F4966FE43F13";
+ static const uint8_t binary_fingerprint[16]; // = {0x2F,0x33,0x8C,0x26,0x5D,0xC4,0xFD,0x82,0xDD,0x13,0xF4,0x96,0x6F,0xE4,0x3F,0x13};
ShowCompactResponseElement() : dbname(), tablename(), partitionname(), type((CompactionType::type)0), state(), workerid(), start(0), runAs() {
}
@@ -4955,6 +4962,8 @@ class ShowCompactResponseElement {
int64_t start;
std::string runAs;
+ _ShowCompactResponseElement__isset __isset;
+
void __set_dbname(const std::string& val) {
dbname = val;
}
@@ -4965,6 +4974,7 @@ class ShowCompactResponseElement {
void __set_partitionname(const std::string& val) {
partitionname = val;
+ __isset.partitionname = true;
}
void __set_type(const CompactionType::type val) {
@@ -4977,14 +4987,17 @@ class ShowCompactResponseElement {
void __set_workerid(const std::string& val) {
workerid = val;
+ __isset.workerid = true;
}
void __set_start(const int64_t val) {
start = val;
+ __isset.start = true;
}
void __set_runAs(const std::string& val) {
runAs = val;
+ __isset.runAs = true;
}
bool operator == (const ShowCompactResponseElement & rhs) const
@@ -4993,17 +5006,25 @@ class ShowCompactResponseElement {
return false;
if (!(tablename == rhs.tablename))
return false;
- if (!(partitionname == rhs.partitionname))
+ if (__isset.partitionname != rhs.__isset.partitionname)
+ return false;
+ else if (__isset.partitionname && !(partitionname == rhs.partitionname))
return false;
if (!(type == rhs.type))
return false;
if (!(state == rhs.state))
return false;
- if (!(workerid == rhs.workerid))
+ if (__isset.workerid != rhs.__isset.workerid)
+ return false;
+ else if (__isset.workerid && !(workerid == rhs.workerid))
+ return false;
+ if (__isset.start != rhs.__isset.start)
+ return false;
+ else if (__isset.start && !(start == rhs.start))
return false;
- if (!(start == rhs.start))
+ if (__isset.runAs != rhs.__isset.runAs)
return false;
- if (!(runAs == rhs.runAs))
+ else if (__isset.runAs && !(runAs == rhs.runAs))
return false;
return true;
}
@@ -5024,8 +5045,8 @@ void swap(ShowCompactResponseElement &a,
class ShowCompactResponse {
public:
- static const char* ascii_fingerprint; // = "3CCBC4D398CA25527272FE78625DE88A";
- static const uint8_t binary_fingerprint[16]; // = {0x3C,0xCB,0xC4,0xD3,0x98,0xCA,0x25,0x52,0x72,0x72,0xFE,0x78,0x62,0x5D,0xE8,0x8A};
+ static const char* ascii_fingerprint; // = "915B7B8DB8966D65769C0F98707BBAE3";
+ static const uint8_t binary_fingerprint[16]; // = {0x91,0x5B,0x7B,0x8D,0xB8,0x96,0x6D,0x65,0x76,0x9C,0x0F,0x98,0x70,0x7B,0xBA,0xE3};
ShowCompactResponse() {
}
Modified: hive/branches/llap/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FieldSchema.java
URL: http://svn.apache.org/viewvc/hive/branches/llap/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FieldSchema.java?rev=1625341&r1=1625340&r2=1625341&view=diff
==============================================================================
--- hive/branches/llap/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FieldSchema.java (original)
+++ hive/branches/llap/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FieldSchema.java Tue Sep 16 17:37:13 2014
@@ -135,9 +135,9 @@ public class FieldSchema implements org.
String comment)
{
this();
- this.name = org.apache.hive.common.util.HiveStringUtils.intern(name);
- this.type = org.apache.hive.common.util.HiveStringUtils.intern(type);
- this.comment = org.apache.hive.common.util.HiveStringUtils.intern(comment);
+ this.name = name;
+ this.type = type;
+ this.comment = comment;
}
/**
@@ -145,13 +145,13 @@ public class FieldSchema implements org.
*/
public FieldSchema(FieldSchema other) {
if (other.isSetName()) {
- this.name = org.apache.hive.common.util.HiveStringUtils.intern(other.name);
+ this.name = other.name;
}
if (other.isSetType()) {
- this.type = org.apache.hive.common.util.HiveStringUtils.intern(other.type);
+ this.type = other.type;
}
if (other.isSetComment()) {
- this.comment = org.apache.hive.common.util.HiveStringUtils.intern(other.comment);
+ this.comment = other.comment;
}
}
@@ -171,7 +171,7 @@ public class FieldSchema implements org.
}
public void setName(String name) {
- this.name = org.apache.hive.common.util.HiveStringUtils.intern(name);
+ this.name = name;
}
public void unsetName() {
@@ -194,7 +194,7 @@ public class FieldSchema implements org.
}
public void setType(String type) {
- this.type = org.apache.hive.common.util.HiveStringUtils.intern(type);
+ this.type = type;
}
public void unsetType() {
@@ -217,7 +217,7 @@ public class FieldSchema implements org.
}
public void setComment(String comment) {
- this.comment = org.apache.hive.common.util.HiveStringUtils.intern(comment);
+ this.comment = comment;
}
public void unsetComment() {
Modified: hive/branches/llap/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Partition.java
URL: http://svn.apache.org/viewvc/hive/branches/llap/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Partition.java?rev=1625341&r1=1625340&r2=1625341&view=diff
==============================================================================
--- hive/branches/llap/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Partition.java (original)
+++ hive/branches/llap/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Partition.java Tue Sep 16 17:37:13 2014
@@ -182,14 +182,14 @@ public class Partition implements org.ap
{
this();
this.values = values;
- this.dbName = org.apache.hive.common.util.HiveStringUtils.intern(dbName);
- this.tableName = org.apache.hive.common.util.HiveStringUtils.intern(tableName);
+ this.dbName = dbName;
+ this.tableName = tableName;
this.createTime = createTime;
setCreateTimeIsSet(true);
this.lastAccessTime = lastAccessTime;
setLastAccessTimeIsSet(true);
this.sd = sd;
- this.parameters = org.apache.hive.common.util.HiveStringUtils.intern(parameters);
+ this.parameters = parameters;
}
/**
@@ -205,10 +205,10 @@ public class Partition implements org.ap
this.values = __this__values;
}
if (other.isSetDbName()) {
- this.dbName = org.apache.hive.common.util.HiveStringUtils.intern(other.dbName);
+ this.dbName = other.dbName;
}
if (other.isSetTableName()) {
- this.tableName = org.apache.hive.common.util.HiveStringUtils.intern(other.tableName);
+ this.tableName = other.tableName;
}
this.createTime = other.createTime;
this.lastAccessTime = other.lastAccessTime;
@@ -222,9 +222,9 @@ public class Partition implements org.ap
String other_element_key = other_element.getKey();
String other_element_value = other_element.getValue();
- String __this__parameters_copy_key = org.apache.hive.common.util.HiveStringUtils.intern(other_element_key);
+ String __this__parameters_copy_key = other_element_key;
- String __this__parameters_copy_value = org.apache.hive.common.util.HiveStringUtils.intern(other_element_value);
+ String __this__parameters_copy_value = other_element_value;
__this__parameters.put(__this__parameters_copy_key, __this__parameters_copy_value);
}
@@ -296,7 +296,7 @@ public class Partition implements org.ap
}
public void setDbName(String dbName) {
- this.dbName = org.apache.hive.common.util.HiveStringUtils.intern(dbName);
+ this.dbName = dbName;
}
public void unsetDbName() {
@@ -319,7 +319,7 @@ public class Partition implements org.ap
}
public void setTableName(String tableName) {
- this.tableName = org.apache.hive.common.util.HiveStringUtils.intern(tableName);
+ this.tableName = tableName;
}
public void unsetTableName() {
@@ -420,7 +420,7 @@ public class Partition implements org.ap
}
public void setParameters(Map<String,String> parameters) {
- this.parameters = org.apache.hive.common.util.HiveStringUtils.intern(parameters);
+ this.parameters = parameters;
}
public void unsetParameters() {
Modified: hive/branches/llap/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SerDeInfo.java
URL: http://svn.apache.org/viewvc/hive/branches/llap/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SerDeInfo.java?rev=1625341&r1=1625340&r2=1625341&view=diff
==============================================================================
--- hive/branches/llap/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SerDeInfo.java (original)
+++ hive/branches/llap/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SerDeInfo.java Tue Sep 16 17:37:13 2014
@@ -137,9 +137,9 @@ public class SerDeInfo implements org.ap
Map<String,String> parameters)
{
this();
- this.name = org.apache.hive.common.util.HiveStringUtils.intern(name);
- this.serializationLib = org.apache.hive.common.util.HiveStringUtils.intern(serializationLib);
- this.parameters = org.apache.hive.common.util.HiveStringUtils.intern(parameters);
+ this.name = name;
+ this.serializationLib = serializationLib;
+ this.parameters = parameters;
}
/**
@@ -147,10 +147,10 @@ public class SerDeInfo implements org.ap
*/
public SerDeInfo(SerDeInfo other) {
if (other.isSetName()) {
- this.name = org.apache.hive.common.util.HiveStringUtils.intern(other.name);
+ this.name = other.name;
}
if (other.isSetSerializationLib()) {
- this.serializationLib = org.apache.hive.common.util.HiveStringUtils.intern(other.serializationLib);
+ this.serializationLib = other.serializationLib;
}
if (other.isSetParameters()) {
Map<String,String> __this__parameters = new HashMap<String,String>();
@@ -159,9 +159,9 @@ public class SerDeInfo implements org.ap
String other_element_key = other_element.getKey();
String other_element_value = other_element.getValue();
- String __this__parameters_copy_key = org.apache.hive.common.util.HiveStringUtils.intern(other_element_key);
+ String __this__parameters_copy_key = other_element_key;
- String __this__parameters_copy_value = org.apache.hive.common.util.HiveStringUtils.intern(other_element_value);
+ String __this__parameters_copy_value = other_element_value;
__this__parameters.put(__this__parameters_copy_key, __this__parameters_copy_value);
}
@@ -185,7 +185,7 @@ public class SerDeInfo implements org.ap
}
public void setName(String name) {
- this.name = org.apache.hive.common.util.HiveStringUtils.intern(name);
+ this.name = name;
}
public void unsetName() {
@@ -208,7 +208,7 @@ public class SerDeInfo implements org.ap
}
public void setSerializationLib(String serializationLib) {
- this.serializationLib = org.apache.hive.common.util.HiveStringUtils.intern(serializationLib);
+ this.serializationLib = serializationLib;
}
public void unsetSerializationLib() {
@@ -242,7 +242,7 @@ public class SerDeInfo implements org.ap
}
public void setParameters(Map<String,String> parameters) {
- this.parameters = org.apache.hive.common.util.HiveStringUtils.intern(parameters);
+ this.parameters = parameters;
}
public void unsetParameters() {