You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by am...@apache.org on 2013/04/26 06:59:58 UTC
svn commit: r1476039 [1/22] - in /hive/branches/HIVE-4115: ./ beeline/
beeline/src/java/org/apache/hive/beeline/ bin/ builtins/ cli/
common/src/java/org/apache/hadoop/hive/conf/ conf/ data/files/
eclipse-templates/ hbase-handler/ hbase-handler/src/java...
Author: amareshwari
Date: Fri Apr 26 04:59:50 2013
New Revision: 1476039
URL: http://svn.apache.org/r1476039
Log:
Merging r1468779 through r1476036 into HIVE-4115
Added:
hive/branches/HIVE-4115/data/files/dim-data.txt
- copied unchanged from r1476036, hive/trunk/data/files/dim-data.txt
hive/branches/HIVE-4115/data/files/fact-data.txt
- copied unchanged from r1476036, hive/trunk/data/files/fact-data.txt
hive/branches/HIVE-4115/data/files/nulls.txt
- copied unchanged from r1476036, hive/trunk/data/files/nulls.txt
hive/branches/HIVE-4115/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreUtils.java.orig
- copied unchanged from r1476036, hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreUtils.java.orig
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/exec/OperatorUtils.java
- copied unchanged from r1476036, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/OperatorUtils.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/io/orc/MemoryManager.java
- copied unchanged from r1476036, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/orc/MemoryManager.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/truncate/
- copied from r1476036, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/truncate/
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/truncate/ColumnTruncateMapper.java
- copied unchanged from r1476036, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/truncate/ColumnTruncateMapper.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/truncate/ColumnTruncateTask.java
- copied unchanged from r1476036, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/truncate/ColumnTruncateTask.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/truncate/ColumnTruncateWork.java
- copied unchanged from r1476036, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/truncate/ColumnTruncateWork.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/AbstractJoinTaskDispatcher.java
- copied unchanged from r1476036, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/AbstractJoinTaskDispatcher.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/CommonJoinTaskDispatcher.java
- copied unchanged from r1476036, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/CommonJoinTaskDispatcher.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/SortMergeJoinResolver.java
- copied unchanged from r1476036, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/SortMergeJoinResolver.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/SortMergeJoinTaskDispatcher.java
- copied unchanged from r1476036, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/SortMergeJoinTaskDispatcher.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/plan/AlterTableExchangePartition.java
- copied unchanged from r1476036, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/AlterTableExchangePartition.java
hive/branches/HIVE-4115/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestMemoryManager.java
- copied unchanged from r1476036, hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestMemoryManager.java
hive/branches/HIVE-4115/ql/src/test/queries/clientnegative/auto_sortmerge_join_1.q
- copied unchanged from r1476036, hive/trunk/ql/src/test/queries/clientnegative/auto_sortmerge_join_1.q
hive/branches/HIVE-4115/ql/src/test/queries/clientnegative/disallow_incompatible_type_change_on1.q
- copied unchanged from r1476036, hive/trunk/ql/src/test/queries/clientnegative/disallow_incompatible_type_change_on1.q
hive/branches/HIVE-4115/ql/src/test/queries/clientnegative/disallow_incompatible_type_change_on2.q
- copied unchanged from r1476036, hive/trunk/ql/src/test/queries/clientnegative/disallow_incompatible_type_change_on2.q
hive/branches/HIVE-4115/ql/src/test/queries/clientnegative/exchange_partition_neg_incomplete_partition.q
- copied unchanged from r1476036, hive/trunk/ql/src/test/queries/clientnegative/exchange_partition_neg_incomplete_partition.q
hive/branches/HIVE-4115/ql/src/test/queries/clientnegative/exchange_partition_neg_partition_exists.q
- copied unchanged from r1476036, hive/trunk/ql/src/test/queries/clientnegative/exchange_partition_neg_partition_exists.q
hive/branches/HIVE-4115/ql/src/test/queries/clientnegative/exchange_partition_neg_partition_exists2.q
- copied unchanged from r1476036, hive/trunk/ql/src/test/queries/clientnegative/exchange_partition_neg_partition_exists2.q
hive/branches/HIVE-4115/ql/src/test/queries/clientnegative/exchange_partition_neg_partition_exists3.q
- copied unchanged from r1476036, hive/trunk/ql/src/test/queries/clientnegative/exchange_partition_neg_partition_exists3.q
hive/branches/HIVE-4115/ql/src/test/queries/clientnegative/exchange_partition_neg_partition_missing.q
- copied unchanged from r1476036, hive/trunk/ql/src/test/queries/clientnegative/exchange_partition_neg_partition_missing.q
hive/branches/HIVE-4115/ql/src/test/queries/clientnegative/exchange_partition_neg_table_missing.q
- copied unchanged from r1476036, hive/trunk/ql/src/test/queries/clientnegative/exchange_partition_neg_table_missing.q
hive/branches/HIVE-4115/ql/src/test/queries/clientnegative/exchange_partition_neg_table_missing2.q
- copied unchanged from r1476036, hive/trunk/ql/src/test/queries/clientnegative/exchange_partition_neg_table_missing2.q
hive/branches/HIVE-4115/ql/src/test/queries/clientnegative/exchange_partition_neg_test.q
- copied unchanged from r1476036, hive/trunk/ql/src/test/queries/clientnegative/exchange_partition_neg_test.q
hive/branches/HIVE-4115/ql/src/test/queries/clientnegative/truncate_bucketed_column.q
- copied unchanged from r1476036, hive/trunk/ql/src/test/queries/clientnegative/truncate_bucketed_column.q
hive/branches/HIVE-4115/ql/src/test/queries/clientnegative/truncate_column_indexed_table.q
- copied unchanged from r1476036, hive/trunk/ql/src/test/queries/clientnegative/truncate_column_indexed_table.q
hive/branches/HIVE-4115/ql/src/test/queries/clientnegative/truncate_column_list_bucketing.q
- copied unchanged from r1476036, hive/trunk/ql/src/test/queries/clientnegative/truncate_column_list_bucketing.q
hive/branches/HIVE-4115/ql/src/test/queries/clientnegative/truncate_column_seqfile.q
- copied unchanged from r1476036, hive/trunk/ql/src/test/queries/clientnegative/truncate_column_seqfile.q
hive/branches/HIVE-4115/ql/src/test/queries/clientnegative/truncate_nonexistant_column.q
- copied unchanged from r1476036, hive/trunk/ql/src/test/queries/clientnegative/truncate_nonexistant_column.q
hive/branches/HIVE-4115/ql/src/test/queries/clientnegative/truncate_partition_column.q
- copied unchanged from r1476036, hive/trunk/ql/src/test/queries/clientnegative/truncate_partition_column.q
hive/branches/HIVE-4115/ql/src/test/queries/clientnegative/truncate_partition_column2.q
- copied unchanged from r1476036, hive/trunk/ql/src/test/queries/clientnegative/truncate_partition_column2.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/auto_sortmerge_join_12.q
- copied unchanged from r1476036, hive/trunk/ql/src/test/queries/clientpositive/auto_sortmerge_join_12.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/auto_sortmerge_join_13.q
- copied unchanged from r1476036, hive/trunk/ql/src/test/queries/clientpositive/auto_sortmerge_join_13.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/auto_sortmerge_join_14.q
- copied unchanged from r1476036, hive/trunk/ql/src/test/queries/clientpositive/auto_sortmerge_join_14.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/disallow_incompatible_type_change_off.q
- copied unchanged from r1476036, hive/trunk/ql/src/test/queries/clientpositive/disallow_incompatible_type_change_off.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/exchange_partition.q
- copied unchanged from r1476036, hive/trunk/ql/src/test/queries/clientpositive/exchange_partition.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/exchange_partition2.q
- copied unchanged from r1476036, hive/trunk/ql/src/test/queries/clientpositive/exchange_partition2.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/exchange_partition3.q
- copied unchanged from r1476036, hive/trunk/ql/src/test/queries/clientpositive/exchange_partition3.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/groupby_sort_11.q
- copied unchanged from r1476036, hive/trunk/ql/src/test/queries/clientpositive/groupby_sort_11.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/join_star.q
- copied unchanged from r1476036, hive/trunk/ql/src/test/queries/clientpositive/join_star.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/orc_diff_part_cols.q
- copied unchanged from r1476036, hive/trunk/ql/src/test/queries/clientpositive/orc_diff_part_cols.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/orc_empty_files.q
- copied unchanged from r1476036, hive/trunk/ql/src/test/queries/clientpositive/orc_empty_files.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/orc_ends_with_nulls.q
- copied unchanged from r1476036, hive/trunk/ql/src/test/queries/clientpositive/orc_ends_with_nulls.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/truncate_column.q
- copied unchanged from r1476036, hive/trunk/ql/src/test/queries/clientpositive/truncate_column.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/truncate_column_buckets.q
- copied unchanged from r1476036, hive/trunk/ql/src/test/queries/clientpositive/truncate_column_buckets.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/truncate_column_list_bucket.q
- copied unchanged from r1476036, hive/trunk/ql/src/test/queries/clientpositive/truncate_column_list_bucket.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/truncate_column_merge.q
- copied unchanged from r1476036, hive/trunk/ql/src/test/queries/clientpositive/truncate_column_merge.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/union34.q
- copied unchanged from r1476036, hive/trunk/ql/src/test/queries/clientpositive/union34.q
hive/branches/HIVE-4115/ql/src/test/results/clientnegative/auto_sortmerge_join_1.q.out
- copied unchanged from r1476036, hive/trunk/ql/src/test/results/clientnegative/auto_sortmerge_join_1.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientnegative/disallow_incompatible_type_change_on1.q.out
- copied unchanged from r1476036, hive/trunk/ql/src/test/results/clientnegative/disallow_incompatible_type_change_on1.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientnegative/disallow_incompatible_type_change_on2.q.out
- copied unchanged from r1476036, hive/trunk/ql/src/test/results/clientnegative/disallow_incompatible_type_change_on2.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientnegative/exchange_partition_neg_incomplete_partition.q.out
- copied unchanged from r1476036, hive/trunk/ql/src/test/results/clientnegative/exchange_partition_neg_incomplete_partition.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientnegative/exchange_partition_neg_partition_exists.q.out
- copied unchanged from r1476036, hive/trunk/ql/src/test/results/clientnegative/exchange_partition_neg_partition_exists.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientnegative/exchange_partition_neg_partition_exists2.q.out
- copied unchanged from r1476036, hive/trunk/ql/src/test/results/clientnegative/exchange_partition_neg_partition_exists2.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientnegative/exchange_partition_neg_partition_exists3.q.out
- copied unchanged from r1476036, hive/trunk/ql/src/test/results/clientnegative/exchange_partition_neg_partition_exists3.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientnegative/exchange_partition_neg_partition_missing.q.out
- copied unchanged from r1476036, hive/trunk/ql/src/test/results/clientnegative/exchange_partition_neg_partition_missing.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientnegative/exchange_partition_neg_table_missing.q.out
- copied unchanged from r1476036, hive/trunk/ql/src/test/results/clientnegative/exchange_partition_neg_table_missing.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientnegative/exchange_partition_neg_table_missing2.q.out
- copied unchanged from r1476036, hive/trunk/ql/src/test/results/clientnegative/exchange_partition_neg_table_missing2.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientnegative/exchange_partition_neg_test.q.out
- copied unchanged from r1476036, hive/trunk/ql/src/test/results/clientnegative/exchange_partition_neg_test.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientnegative/truncate_bucketed_column.q.out
- copied unchanged from r1476036, hive/trunk/ql/src/test/results/clientnegative/truncate_bucketed_column.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientnegative/truncate_column_archived.q.out
- copied unchanged from r1476036, hive/trunk/ql/src/test/results/clientnegative/truncate_column_archived.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientnegative/truncate_column_indexed_table.q.out
- copied unchanged from r1476036, hive/trunk/ql/src/test/results/clientnegative/truncate_column_indexed_table.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientnegative/truncate_column_list_bucketing.q.out
- copied unchanged from r1476036, hive/trunk/ql/src/test/results/clientnegative/truncate_column_list_bucketing.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientnegative/truncate_column_seqfile.q.out
- copied unchanged from r1476036, hive/trunk/ql/src/test/results/clientnegative/truncate_column_seqfile.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientnegative/truncate_nonexistant_column.q.out
- copied unchanged from r1476036, hive/trunk/ql/src/test/results/clientnegative/truncate_nonexistant_column.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientnegative/truncate_partition_column.q.out
- copied unchanged from r1476036, hive/trunk/ql/src/test/results/clientnegative/truncate_partition_column.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientnegative/truncate_partition_column2.q.out
- copied unchanged from r1476036, hive/trunk/ql/src/test/results/clientnegative/truncate_partition_column2.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientpositive/auto_sortmerge_join_12.q.out
- copied unchanged from r1476036, hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_12.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientpositive/auto_sortmerge_join_13.q.out
- copied unchanged from r1476036, hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_13.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientpositive/auto_sortmerge_join_14.q.out
- copied unchanged from r1476036, hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_14.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientpositive/disallow_incompatible_type_change_off.q.out
- copied unchanged from r1476036, hive/trunk/ql/src/test/results/clientpositive/disallow_incompatible_type_change_off.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exchange_partition.q.out
- copied unchanged from r1476036, hive/trunk/ql/src/test/results/clientpositive/exchange_partition.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exchange_partition2.q.out
- copied unchanged from r1476036, hive/trunk/ql/src/test/results/clientpositive/exchange_partition2.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientpositive/exchange_partition3.q.out
- copied unchanged from r1476036, hive/trunk/ql/src/test/results/clientpositive/exchange_partition3.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientpositive/groupby_sort_11.q.out
- copied unchanged from r1476036, hive/trunk/ql/src/test/results/clientpositive/groupby_sort_11.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientpositive/join_star.q.out
- copied unchanged from r1476036, hive/trunk/ql/src/test/results/clientpositive/join_star.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientpositive/orc_diff_part_cols.q.out
- copied unchanged from r1476036, hive/trunk/ql/src/test/results/clientpositive/orc_diff_part_cols.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientpositive/orc_empty_files.q.out
- copied unchanged from r1476036, hive/trunk/ql/src/test/results/clientpositive/orc_empty_files.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientpositive/orc_ends_with_nulls.q.out
- copied unchanged from r1476036, hive/trunk/ql/src/test/results/clientpositive/orc_ends_with_nulls.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientpositive/truncate_column.q.out
- copied unchanged from r1476036, hive/trunk/ql/src/test/results/clientpositive/truncate_column.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientpositive/truncate_column_buckets.q.out
- copied unchanged from r1476036, hive/trunk/ql/src/test/results/clientpositive/truncate_column_buckets.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientpositive/truncate_column_list_bucket.q.out
- copied unchanged from r1476036, hive/trunk/ql/src/test/results/clientpositive/truncate_column_list_bucket.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientpositive/truncate_column_merge.q.out
- copied unchanged from r1476036, hive/trunk/ql/src/test/results/clientpositive/truncate_column_merge.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientpositive/union34.q.out
- copied unchanged from r1476036, hive/trunk/ql/src/test/results/clientpositive/union34.q.out
hive/branches/HIVE-4115/serde/src/gen/thrift/gen-cpp/complex_constants.cpp
- copied unchanged from r1476036, hive/trunk/serde/src/gen/thrift/gen-cpp/complex_constants.cpp
hive/branches/HIVE-4115/serde/src/gen/thrift/gen-cpp/complex_constants.h
- copied unchanged from r1476036, hive/trunk/serde/src/gen/thrift/gen-cpp/complex_constants.h
hive/branches/HIVE-4115/serde/src/gen/thrift/gen-cpp/complex_types.cpp
- copied unchanged from r1476036, hive/trunk/serde/src/gen/thrift/gen-cpp/complex_types.cpp
hive/branches/HIVE-4115/serde/src/gen/thrift/gen-cpp/complex_types.h
- copied unchanged from r1476036, hive/trunk/serde/src/gen/thrift/gen-cpp/complex_types.h
hive/branches/HIVE-4115/serde/src/gen/thrift/gen-cpp/megastruct_constants.cpp
- copied unchanged from r1476036, hive/trunk/serde/src/gen/thrift/gen-cpp/megastruct_constants.cpp
hive/branches/HIVE-4115/serde/src/gen/thrift/gen-cpp/megastruct_constants.h
- copied unchanged from r1476036, hive/trunk/serde/src/gen/thrift/gen-cpp/megastruct_constants.h
hive/branches/HIVE-4115/serde/src/gen/thrift/gen-cpp/megastruct_types.cpp
- copied unchanged from r1476036, hive/trunk/serde/src/gen/thrift/gen-cpp/megastruct_types.cpp
hive/branches/HIVE-4115/serde/src/gen/thrift/gen-cpp/megastruct_types.h
- copied unchanged from r1476036, hive/trunk/serde/src/gen/thrift/gen-cpp/megastruct_types.h
hive/branches/HIVE-4115/serde/src/gen/thrift/gen-cpp/testthrift_constants.cpp
- copied unchanged from r1476036, hive/trunk/serde/src/gen/thrift/gen-cpp/testthrift_constants.cpp
hive/branches/HIVE-4115/serde/src/gen/thrift/gen-cpp/testthrift_constants.h
- copied unchanged from r1476036, hive/trunk/serde/src/gen/thrift/gen-cpp/testthrift_constants.h
hive/branches/HIVE-4115/serde/src/gen/thrift/gen-cpp/testthrift_types.cpp
- copied unchanged from r1476036, hive/trunk/serde/src/gen/thrift/gen-cpp/testthrift_types.cpp
hive/branches/HIVE-4115/serde/src/gen/thrift/gen-cpp/testthrift_types.h
- copied unchanged from r1476036, hive/trunk/serde/src/gen/thrift/gen-cpp/testthrift_types.h
hive/branches/HIVE-4115/serde/src/gen/thrift/gen-php/Types.php
- copied unchanged from r1476036, hive/trunk/serde/src/gen/thrift/gen-php/Types.php
hive/branches/HIVE-4115/serde/src/gen/thrift/gen-py/complex/
- copied from r1476036, hive/trunk/serde/src/gen/thrift/gen-py/complex/
hive/branches/HIVE-4115/serde/src/gen/thrift/gen-py/complex/__init__.py
- copied unchanged from r1476036, hive/trunk/serde/src/gen/thrift/gen-py/complex/__init__.py
hive/branches/HIVE-4115/serde/src/gen/thrift/gen-py/complex/constants.py
- copied unchanged from r1476036, hive/trunk/serde/src/gen/thrift/gen-py/complex/constants.py
hive/branches/HIVE-4115/serde/src/gen/thrift/gen-py/complex/ttypes.py
- copied unchanged from r1476036, hive/trunk/serde/src/gen/thrift/gen-py/complex/ttypes.py
hive/branches/HIVE-4115/serde/src/gen/thrift/gen-py/megastruct/
- copied from r1476036, hive/trunk/serde/src/gen/thrift/gen-py/megastruct/
hive/branches/HIVE-4115/serde/src/gen/thrift/gen-py/megastruct/__init__.py
- copied unchanged from r1476036, hive/trunk/serde/src/gen/thrift/gen-py/megastruct/__init__.py
hive/branches/HIVE-4115/serde/src/gen/thrift/gen-py/megastruct/constants.py
- copied unchanged from r1476036, hive/trunk/serde/src/gen/thrift/gen-py/megastruct/constants.py
hive/branches/HIVE-4115/serde/src/gen/thrift/gen-py/megastruct/ttypes.py
- copied unchanged from r1476036, hive/trunk/serde/src/gen/thrift/gen-py/megastruct/ttypes.py
hive/branches/HIVE-4115/serde/src/gen/thrift/gen-py/testthrift/
- copied from r1476036, hive/trunk/serde/src/gen/thrift/gen-py/testthrift/
hive/branches/HIVE-4115/serde/src/gen/thrift/gen-py/testthrift/__init__.py
- copied unchanged from r1476036, hive/trunk/serde/src/gen/thrift/gen-py/testthrift/__init__.py
hive/branches/HIVE-4115/serde/src/gen/thrift/gen-py/testthrift/constants.py
- copied unchanged from r1476036, hive/trunk/serde/src/gen/thrift/gen-py/testthrift/constants.py
hive/branches/HIVE-4115/serde/src/gen/thrift/gen-py/testthrift/ttypes.py
- copied unchanged from r1476036, hive/trunk/serde/src/gen/thrift/gen-py/testthrift/ttypes.py
hive/branches/HIVE-4115/serde/src/gen/thrift/gen-rb/complex_constants.rb
- copied unchanged from r1476036, hive/trunk/serde/src/gen/thrift/gen-rb/complex_constants.rb
hive/branches/HIVE-4115/serde/src/gen/thrift/gen-rb/complex_types.rb
- copied unchanged from r1476036, hive/trunk/serde/src/gen/thrift/gen-rb/complex_types.rb
hive/branches/HIVE-4115/serde/src/gen/thrift/gen-rb/megastruct_constants.rb
- copied unchanged from r1476036, hive/trunk/serde/src/gen/thrift/gen-rb/megastruct_constants.rb
hive/branches/HIVE-4115/serde/src/gen/thrift/gen-rb/megastruct_types.rb
- copied unchanged from r1476036, hive/trunk/serde/src/gen/thrift/gen-rb/megastruct_types.rb
hive/branches/HIVE-4115/serde/src/gen/thrift/gen-rb/testthrift_constants.rb
- copied unchanged from r1476036, hive/trunk/serde/src/gen/thrift/gen-rb/testthrift_constants.rb
hive/branches/HIVE-4115/serde/src/gen/thrift/gen-rb/testthrift_types.rb
- copied unchanged from r1476036, hive/trunk/serde/src/gen/thrift/gen-rb/testthrift_types.rb
hive/branches/HIVE-4115/service/src/test/org/apache/hive/service/auth/
- copied from r1476036, hive/trunk/service/src/test/org/apache/hive/service/auth/
hive/branches/HIVE-4115/service/src/test/org/apache/hive/service/auth/TestPlainSaslHelper.java
- copied unchanged from r1476036, hive/trunk/service/src/test/org/apache/hive/service/auth/TestPlainSaslHelper.java
hive/branches/HIVE-4115/service/src/test/org/apache/hive/service/cli/thrift/
- copied from r1476036, hive/trunk/service/src/test/org/apache/hive/service/cli/thrift/
hive/branches/HIVE-4115/service/src/test/org/apache/hive/service/cli/thrift/TestThriftCLIService.java
- copied unchanged from r1476036, hive/trunk/service/src/test/org/apache/hive/service/cli/thrift/TestThriftCLIService.java
Removed:
hive/branches/HIVE-4115/builtins/
hive/branches/HIVE-4115/metastore/src/gen/thrift/gen-php/ThriftHiveMetastore.php
hive/branches/HIVE-4115/metastore/src/gen/thrift/gen-php/hive_metastore/
hive/branches/HIVE-4115/metastore/src/gen/thrift/gen-php/hive_metastore_constants.php
hive/branches/HIVE-4115/metastore/src/gen/thrift/gen-php/hive_metastore_types.php
hive/branches/HIVE-4115/pdk/
hive/branches/HIVE-4115/ql/src/gen/thrift/gen-php/queryplan/
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/exec/OperatorHook.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/exec/OperatorHookContext.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/exec/OperatorHookUtils.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/profiler/HiveProfilePublisher.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/profiler/HiveProfilePublisherInfo.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/profiler/HiveProfiler.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/profiler/HiveProfilerAggregateStat.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/profiler/HiveProfilerConnectionInfo.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/profiler/HiveProfilerStats.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/profiler/HiveProfilerStatsAggregator.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/profiler/HiveProfilerUtils.java
hive/branches/HIVE-4115/ql/src/test/org/apache/hadoop/hive/ql/exec/TstOperatorHook.java
hive/branches/HIVE-4115/ql/src/test/org/apache/hadoop/hive/ql/exec/TstOperatorHookUtils.java
hive/branches/HIVE-4115/ql/src/test/org/apache/hadoop/hive/ql/hooks/HiveProfilerResultsHook.java
hive/branches/HIVE-4115/ql/src/test/org/apache/hadoop/hive/ql/hooks/PostTestOperatorHook.java
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/hiveprofiler0.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/hiveprofiler_script0.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/hiveprofiler_union0.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/operatorhook.q
hive/branches/HIVE-4115/ql/src/test/results/clientpositive/hiveprofiler0.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientpositive/hiveprofiler_script0.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientpositive/hiveprofiler_union0.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientpositive/operatorhook.q.out
hive/branches/HIVE-4115/serde/src/gen/thrift/gen-php/serde/
hive/branches/HIVE-4115/service/src/gen/thrift/gen-php/hive_service/
Modified:
hive/branches/HIVE-4115/ (props changed)
hive/branches/HIVE-4115/.gitignore
hive/branches/HIVE-4115/beeline/ivy.xml
hive/branches/HIVE-4115/beeline/src/java/org/apache/hive/beeline/BeeLine.java
hive/branches/HIVE-4115/bin/hive
hive/branches/HIVE-4115/build-common.xml
hive/branches/HIVE-4115/build.properties
hive/branches/HIVE-4115/build.xml
hive/branches/HIVE-4115/cli/ivy.xml
hive/branches/HIVE-4115/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
hive/branches/HIVE-4115/conf/hive-default.xml.template
hive/branches/HIVE-4115/eclipse-templates/.classpath
hive/branches/HIVE-4115/hbase-handler/ivy.xml
hive/branches/HIVE-4115/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseStorageHandler.java
hive/branches/HIVE-4115/hbase-handler/src/test/org/apache/hadoop/hive/hbase/HBaseTestSetup.java
hive/branches/HIVE-4115/hcatalog/bin/hcat
hive/branches/HIVE-4115/hcatalog/build-support/ant/deploy.xml
hive/branches/HIVE-4115/hcatalog/build.properties
hive/branches/HIVE-4115/hcatalog/core/pom.xml
hive/branches/HIVE-4115/hcatalog/core/src/main/java/org/apache/hcatalog/mapreduce/HCatStorageHandler.java
hive/branches/HIVE-4115/hcatalog/hcatalog-pig-adapter/pom.xml
hive/branches/HIVE-4115/hcatalog/hcatalog-pig-adapter/src/test/java/org/apache/hcatalog/pig/TestHCatStorer.java
hive/branches/HIVE-4115/hcatalog/pom.xml
hive/branches/HIVE-4115/hcatalog/server-extensions/pom.xml
hive/branches/HIVE-4115/hcatalog/storage-handlers/hbase/pom.xml
hive/branches/HIVE-4115/hcatalog/webhcat/java-client/pom.xml
hive/branches/HIVE-4115/hcatalog/webhcat/svr/pom.xml
hive/branches/HIVE-4115/hcatalog/webhcat/svr/src/main/bin/webhcat_config.sh
hive/branches/HIVE-4115/hwi/ivy.xml
hive/branches/HIVE-4115/ivy/libraries.properties
hive/branches/HIVE-4115/metastore/if/hive_metastore.thrift
hive/branches/HIVE-4115/metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore.cpp
hive/branches/HIVE-4115/metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore.h
hive/branches/HIVE-4115/metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore_server.skeleton.cpp
hive/branches/HIVE-4115/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ThriftHiveMetastore.java
hive/branches/HIVE-4115/metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore.php
hive/branches/HIVE-4115/metastore/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore-remote
hive/branches/HIVE-4115/metastore/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore.py
hive/branches/HIVE-4115/metastore/src/gen/thrift/gen-rb/thrift_hive_metastore.rb
hive/branches/HIVE-4115/metastore/src/java/org/apache/hadoop/hive/metastore/HiveAlterHandler.java
hive/branches/HIVE-4115/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
hive/branches/HIVE-4115/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
hive/branches/HIVE-4115/metastore/src/java/org/apache/hadoop/hive/metastore/IMetaStoreClient.java
hive/branches/HIVE-4115/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreUtils.java
hive/branches/HIVE-4115/metastore/src/java/org/apache/hadoop/hive/metastore/Warehouse.java
hive/branches/HIVE-4115/metastore/src/java/org/apache/hadoop/hive/metastore/events/DropPartitionEvent.java
hive/branches/HIVE-4115/metastore/src/java/org/apache/hadoop/hive/metastore/events/DropTableEvent.java
hive/branches/HIVE-4115/metastore/src/java/org/apache/hadoop/hive/metastore/events/PreDropPartitionEvent.java
hive/branches/HIVE-4115/metastore/src/java/org/apache/hadoop/hive/metastore/events/PreDropTableEvent.java
hive/branches/HIVE-4115/metastore/src/test/org/apache/hadoop/hive/metastore/TestHiveMetaStoreWithEnvironmentContext.java
hive/branches/HIVE-4115/metastore/src/test/org/apache/hadoop/hive/metastore/TestMarkPartition.java
hive/branches/HIVE-4115/metastore/src/test/org/apache/hadoop/hive/metastore/TestMetaStoreEndFunctionListener.java
hive/branches/HIVE-4115/metastore/src/test/org/apache/hadoop/hive/metastore/TestMetaStoreEventListener.java
hive/branches/HIVE-4115/metastore/src/test/org/apache/hadoop/hive/metastore/TestRetryingHMSHandler.java
hive/branches/HIVE-4115/ql/build.xml
hive/branches/HIVE-4115/ql/ivy.xml
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/ErrorMsg.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/exec/AbstractMapJoinOperator.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/exec/ExecDriver.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/exec/ExecMapper.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/exec/ExecReducer.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/exec/FileSinkOperator.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/exec/GroupByOperator.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/exec/HashTableSinkOperator.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/exec/JoinOperator.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/exec/MapJoinMetaData.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/exec/MapJoinOperator.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/exec/MoveTask.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/exec/Operator.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/exec/PTFOperator.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/exec/PTFUtils.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/exec/ReduceSinkOperator.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/exec/Task.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/exec/UnionOperator.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/HashMapWrapper.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/MapJoinDoubleKeys.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/MapJoinObjectKey.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/MapJoinObjectValue.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/MapJoinSingleKey.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/io/RCFile.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcFile.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcOutputFormat.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcStruct.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/io/orc/RecordReaderImpl.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/io/orc/WriterImpl.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/merge/RCFileKeyBufferWrapper.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/merge/RCFileValueBufferWrapper.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/metadata/DefaultStorageHandler.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/metadata/HiveStorageHandler.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/optimizer/AbstractSMBJoinProc.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/optimizer/AvgPartitionSizeBasedBigTableSelectorForAutoSMJ.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/optimizer/BucketingSortingReduceSinkOptimizer.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMRUnion1.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GroupByOptimizer.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/optimizer/MapJoinProcessor.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/optimizer/SizeBasedBigTableSelectorForAutoSMJ.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/optimizer/TableSizeBasedBigTableSelectorForAutoSMJ.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/CommonJoinResolver.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/PhysicalOptimizer.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/optimizer/unionproc/UnionProcContext.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/optimizer/unionproc/UnionProcFactory.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/parse/DDLSemanticAnalyzer.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveLexer.g
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveParser.g
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzerFactory.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/plan/ConditionalResolverCommonJoin.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/plan/DDLWork.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/plan/FileSinkDesc.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/plan/GroupByDesc.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/plan/MapredWork.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/plan/PTFDesc.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/plan/PlanUtils.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/plan/TruncateTableDesc.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/ppd/OpProcFactory.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/session/SessionState.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFLeadLag.java
hive/branches/HIVE-4115/ql/src/java/org/apache/hadoop/hive/ql/udf/ptf/TableFunctionEvaluator.java
hive/branches/HIVE-4115/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestFileDump.java
hive/branches/HIVE-4115/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestOrcFile.java
hive/branches/HIVE-4115/ql/src/test/org/apache/hadoop/hive/ql/security/TestAuthorizationPreEventListener.java
hive/branches/HIVE-4115/ql/src/test/queries/clientnegative/exim_00_unsupported_schema.q
hive/branches/HIVE-4115/ql/src/test/queries/clientnegative/exim_01_nonpart_over_loaded.q
hive/branches/HIVE-4115/ql/src/test/queries/clientnegative/exim_02_all_part_over_overlap.q
hive/branches/HIVE-4115/ql/src/test/queries/clientnegative/exim_03_nonpart_noncompat_colschema.q
hive/branches/HIVE-4115/ql/src/test/queries/clientnegative/exim_04_nonpart_noncompat_colnumber.q
hive/branches/HIVE-4115/ql/src/test/queries/clientnegative/exim_05_nonpart_noncompat_coltype.q
hive/branches/HIVE-4115/ql/src/test/queries/clientnegative/exim_06_nonpart_noncompat_storage.q
hive/branches/HIVE-4115/ql/src/test/queries/clientnegative/exim_07_nonpart_noncompat_ifof.q
hive/branches/HIVE-4115/ql/src/test/queries/clientnegative/exim_08_nonpart_noncompat_serde.q
hive/branches/HIVE-4115/ql/src/test/queries/clientnegative/exim_09_nonpart_noncompat_serdeparam.q
hive/branches/HIVE-4115/ql/src/test/queries/clientnegative/exim_10_nonpart_noncompat_bucketing.q
hive/branches/HIVE-4115/ql/src/test/queries/clientnegative/exim_11_nonpart_noncompat_sorting.q
hive/branches/HIVE-4115/ql/src/test/queries/clientnegative/exim_13_nonnative_import.q
hive/branches/HIVE-4115/ql/src/test/queries/clientnegative/exim_14_nonpart_part.q
hive/branches/HIVE-4115/ql/src/test/queries/clientnegative/exim_15_part_nonpart.q
hive/branches/HIVE-4115/ql/src/test/queries/clientnegative/exim_16_part_noncompat_schema.q
hive/branches/HIVE-4115/ql/src/test/queries/clientnegative/exim_17_part_spec_underspec.q
hive/branches/HIVE-4115/ql/src/test/queries/clientnegative/exim_18_part_spec_missing.q
hive/branches/HIVE-4115/ql/src/test/queries/clientnegative/exim_19_external_over_existing.q
hive/branches/HIVE-4115/ql/src/test/queries/clientnegative/exim_20_managed_location_over_existing.q
hive/branches/HIVE-4115/ql/src/test/queries/clientnegative/exim_21_part_managed_external.q
hive/branches/HIVE-4115/ql/src/test/queries/clientnegative/exim_22_export_authfail.q
hive/branches/HIVE-4115/ql/src/test/queries/clientnegative/exim_23_import_exist_authfail.q
hive/branches/HIVE-4115/ql/src/test/queries/clientnegative/exim_24_import_part_authfail.q
hive/branches/HIVE-4115/ql/src/test/queries/clientnegative/exim_25_import_nonexist_authfail.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/allcolref_in_udf.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/auto_sortmerge_join_1.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/auto_sortmerge_join_10.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/auto_sortmerge_join_2.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/auto_sortmerge_join_3.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/auto_sortmerge_join_4.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/auto_sortmerge_join_5.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/auto_sortmerge_join_6.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/auto_sortmerge_join_7.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/auto_sortmerge_join_8.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/auto_sortmerge_join_9.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_1.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_2.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_3.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_4.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_5.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_6.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_7.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_8.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/database_drop.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/exim_00_nonpart_empty.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/exim_01_nonpart.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/exim_02_00_part_empty.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/exim_02_part.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/exim_03_nonpart_over_compat.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/exim_04_all_part.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/exim_04_evolved_parts.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/exim_05_some_part.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/exim_06_one_part.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/exim_07_all_part_over_nonoverlap.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/exim_08_nonpart_rename.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/exim_09_part_spec_nonoverlap.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/exim_10_external_managed.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/exim_11_managed_external.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/exim_12_external_location.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/exim_13_managed_location.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/exim_14_managed_location_over_existing.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/exim_15_external_part.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/exim_16_part_external.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/exim_17_part_managed.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/exim_18_part_external.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/exim_19_00_part_external_location.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/exim_19_part_external_location.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/exim_20_part_managed_location.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/exim_21_export_authsuccess.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/exim_22_import_exist_authsuccess.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/exim_23_import_part_authsuccess.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/exim_24_import_nonexist_authsuccess.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/groupby_sort_8.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/insertexternal1.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/leadlag.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/metadata_export_drop.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/multiMapJoin1.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/multi_insert.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/multi_insert_move_tasks_share_dependencies.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/ptf.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/ptf_general_queries.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/rename_external_partition_location.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/repair.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/schemeAuthority.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/semijoin.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/stats_noscan_2.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/udtf_explode.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/windowing.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/windowing_expressions.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/windowing_multipartitioning.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/windowing_navfn.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/windowing_ntile.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/windowing_rank.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/windowing_udaf.q
hive/branches/HIVE-4115/ql/src/test/queries/clientpositive/windowing_windowspec.q
hive/branches/HIVE-4115/ql/src/test/results/clientnegative/alter_view_as_select_with_partition.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientnegative/create_or_replace_view1.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientnegative/create_or_replace_view2.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientnegative/udf_assert_true.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientnegative/udf_assert_true2.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientpositive/allcolref_in_udf.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientpositive/auto_sortmerge_join_1.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientpositive/auto_sortmerge_join_2.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientpositive/auto_sortmerge_join_3.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientpositive/auto_sortmerge_join_4.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientpositive/auto_sortmerge_join_5.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientpositive/auto_sortmerge_join_6.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientpositive/auto_sortmerge_join_7.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientpositive/auto_sortmerge_join_8.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientpositive/auto_sortmerge_join_9.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientpositive/bucketsortoptimize_insert_2.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientpositive/bucketsortoptimize_insert_4.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientpositive/bucketsortoptimize_insert_5.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientpositive/bucketsortoptimize_insert_6.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientpositive/groupby_sort_8.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientpositive/lateral_view.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientpositive/lateral_view_ppd.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientpositive/leadlag.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientpositive/multiMapJoin1.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientpositive/multi_insert_lateral_view.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientpositive/ptf.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientpositive/ptf_general_queries.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientpositive/semijoin.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientpositive/show_functions.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientpositive/udtf_explode.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientpositive/udtf_json_tuple.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientpositive/udtf_parse_url_tuple.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientpositive/udtf_stack.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientpositive/union26.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientpositive/windowing.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientpositive/windowing_expressions.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientpositive/windowing_multipartitioning.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientpositive/windowing_navfn.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientpositive/windowing_ntile.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientpositive/windowing_rank.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientpositive/windowing_udaf.q.out
hive/branches/HIVE-4115/ql/src/test/results/clientpositive/windowing_windowspec.q.out
hive/branches/HIVE-4115/ql/src/test/results/compiler/plan/groupby2.q.xml
hive/branches/HIVE-4115/ql/src/test/results/compiler/plan/groupby3.q.xml
hive/branches/HIVE-4115/ql/src/test/results/compiler/plan/join1.q.xml
hive/branches/HIVE-4115/ql/src/test/results/compiler/plan/join2.q.xml
hive/branches/HIVE-4115/ql/src/test/results/compiler/plan/join3.q.xml
hive/branches/HIVE-4115/ql/src/test/results/compiler/plan/join4.q.xml
hive/branches/HIVE-4115/ql/src/test/results/compiler/plan/join5.q.xml
hive/branches/HIVE-4115/ql/src/test/results/compiler/plan/join6.q.xml
hive/branches/HIVE-4115/ql/src/test/results/compiler/plan/join7.q.xml
hive/branches/HIVE-4115/ql/src/test/results/compiler/plan/join8.q.xml
hive/branches/HIVE-4115/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde/test/InnerStruct.java
hive/branches/HIVE-4115/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde/test/ThriftTestObj.java
hive/branches/HIVE-4115/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/Complex.java
hive/branches/HIVE-4115/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/IntString.java
hive/branches/HIVE-4115/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/MegaStruct.java
hive/branches/HIVE-4115/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/MiniStruct.java
hive/branches/HIVE-4115/serde/src/java/org/apache/hadoop/hive/serde2/columnar/BytesRefArrayWritable.java
hive/branches/HIVE-4115/service/src/java/org/apache/hive/service/auth/PlainSaslHelper.java
hive/branches/HIVE-4115/service/src/java/org/apache/hive/service/cli/CLIService.java
hive/branches/HIVE-4115/service/src/java/org/apache/hive/service/cli/thrift/ThriftCLIService.java
Propchange: hive/branches/HIVE-4115/
------------------------------------------------------------------------------
Merged /hive/trunk:r1468779-1476036
Modified: hive/branches/HIVE-4115/.gitignore
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/.gitignore?rev=1476039&r1=1476038&r2=1476039&view=diff
==============================================================================
--- hive/branches/HIVE-4115/.gitignore (original)
+++ hive/branches/HIVE-4115/.gitignore Fri Apr 26 04:59:50 2013
@@ -13,4 +13,7 @@ common/src/gen
*.iml
*.ipr
*.iws
+ql/derby.log
+derby.log
+.arc
Modified: hive/branches/HIVE-4115/beeline/ivy.xml
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/beeline/ivy.xml?rev=1476039&r1=1476038&r2=1476039&view=diff
==============================================================================
--- hive/branches/HIVE-4115/beeline/ivy.xml (original)
+++ hive/branches/HIVE-4115/beeline/ivy.xml Fri Apr 26 04:59:50 2013
@@ -45,8 +45,6 @@
conf="compile->default" />
<dependency org="org.apache.hive" name="hive-shims" rev="${version}"
conf="runtime" transitive="false"/>
- <dependency org="org.apache.hive" name="hive-builtins" rev="${version}"
- conf="runtime" transitive="false"/>
<!-- Test Dependencies -->
<dependency org="junit" name="junit"
Modified: hive/branches/HIVE-4115/beeline/src/java/org/apache/hive/beeline/BeeLine.java
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/beeline/src/java/org/apache/hive/beeline/BeeLine.java?rev=1476039&r1=1476038&r2=1476039&view=diff
==============================================================================
--- hive/branches/HIVE-4115/beeline/src/java/org/apache/hive/beeline/BeeLine.java (original)
+++ hive/branches/HIVE-4115/beeline/src/java/org/apache/hive/beeline/BeeLine.java Fri Apr 26 04:59:50 2013
@@ -143,6 +143,10 @@ public class BeeLine {
private static final String SCRIPT_OUTPUT_PREFIX = ">>>";
private static final int SCRIPT_OUTPUT_PAD_SIZE = 5;
+ private static final int ERRNO_OK = 0;
+ private static final int ERRNO_ARGS = 1;
+ private static final int ERRNO_OTHER = 2;
+
private final Map<Object, Object> formats = map(new Object[] {
"vertical", new VerticalOutputFormat(this),
"table", new TableOutputFormat(this),
@@ -367,6 +371,7 @@ public class BeeLine {
/**
* Starts the program with redirected input. For redirected output,
* setOutputStream() and setErrorStream can be used.
+ * Exits with 0 on success, 1 on invalid arguments, and 2 on any other error
*
* @param args
* same as main()
@@ -377,12 +382,10 @@ public class BeeLine {
public static void mainWithInputRedirection(String[] args, InputStream inputStream)
throws IOException {
BeeLine beeLine = new BeeLine();
- beeLine.begin(args, inputStream);
+ int status = beeLine.begin(args, inputStream);
- // exit the system: useful for Hypersonic and other
- // badly-behaving systems
if (!Boolean.getBoolean(BeeLineOpts.PROPERTY_NAME_EXIT)) {
- System.exit(0);
+ System.exit(status);
}
}
@@ -608,7 +611,8 @@ public class BeeLine {
* to the appropriate {@link CommandHandler} until the
* global variable <code>exit</code> is true.
*/
- public void begin(String[] args, InputStream inputStream) throws IOException {
+ public int begin(String[] args, InputStream inputStream) throws IOException {
+ int status = ERRNO_OK;
try {
// load the options first, so we can override on the command line
getOpts().load();
@@ -618,7 +622,7 @@ public class BeeLine {
if (!(initArgs(args))) {
usage();
- return;
+ return ERRNO_ARGS;
}
ConsoleReader reader = null;
@@ -630,6 +634,7 @@ public class BeeLine {
} catch (Throwable t) {
handleException(t);
commands.quit(null);
+ status = ERRNO_OTHER;
}
} else {
reader = getConsoleReader(inputStream);
@@ -646,17 +651,20 @@ public class BeeLine {
// Execute one instruction; terminate on executing a script if there is an error
if (!dispatch(reader.readLine(getPrompt())) && runningScript) {
commands.quit(null);
+ status = ERRNO_OTHER;
}
} catch (EOFException eof) {
// CTRL-D
commands.quit(null);
} catch (Throwable t) {
handleException(t);
+ status = ERRNO_OTHER;
}
}
// ### NOTE jvs 10-Aug-2004: Clean up any outstanding
// connections automatically.
commands.closeall(null);
+ return status;
}
public void close() {
Modified: hive/branches/HIVE-4115/bin/hive
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/bin/hive?rev=1476039&r1=1476038&r2=1476039&view=diff
==============================================================================
--- hive/branches/HIVE-4115/bin/hive (original)
+++ hive/branches/HIVE-4115/bin/hive Fri Apr 26 04:59:50 2013
@@ -78,11 +78,6 @@ if [ ! -f ${HIVE_LIB}/hive-exec-*.jar ];
exit 1;
fi
-if [ ! -f ${HIVE_LIB}/hive-builtins-*.jar ]; then
- echo "Missing Hive Builtins Jar: ${HIVE_LIB}/hive-builtins-*.jar"
- exit 1;
-fi
-
if [ ! -f ${HIVE_LIB}/hive-metastore-*.jar ]; then
echo "Missing Hive MetaStore Jar"
exit 2;
Modified: hive/branches/HIVE-4115/build-common.xml
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/build-common.xml?rev=1476039&r1=1476038&r2=1476039&view=diff
==============================================================================
--- hive/branches/HIVE-4115/build-common.xml (original)
+++ hive/branches/HIVE-4115/build-common.xml Fri Apr 26 04:59:50 2013
@@ -59,7 +59,7 @@
<property name="test.output" value="true"/>
<property name="test.junit.output.format" value="xml"/>
<property name="test.junit.output.usefile" value="true"/>
- <property name="minimr.query.files" value="list_bucket_dml_10.q,input16_cc.q,scriptfile1.q,bucket4.q,bucketmapjoin6.q,disable_merge_for_bucketing.q,reduce_deduplicate.q,smb_mapjoin_8.q,join1.q,groupby2.q,bucketizedhiveinputformat.q,bucketmapjoin7.q,optrstat_groupby.q,bucket_num_reducers.q,bucket5.q,load_fs2.q,bucket_num_reducers2.q,operatorhook.q,infer_bucket_sort_merge.q,infer_bucket_sort_reducers_power_two.q,infer_bucket_sort_dyn_part.q,infer_bucket_sort_bucketed_table.q,infer_bucket_sort_map_operators.q,infer_bucket_sort_num_buckets.q,schemeAuthority.q"/>
+ <property name="minimr.query.files" value="list_bucket_dml_10.q,input16_cc.q,scriptfile1.q,bucket4.q,bucketmapjoin6.q,disable_merge_for_bucketing.q,reduce_deduplicate.q,smb_mapjoin_8.q,join1.q,groupby2.q,bucketizedhiveinputformat.q,bucketmapjoin7.q,optrstat_groupby.q,bucket_num_reducers.q,bucket5.q,load_fs2.q,bucket_num_reducers2.q,infer_bucket_sort_merge.q,infer_bucket_sort_reducers_power_two.q,infer_bucket_sort_dyn_part.q,infer_bucket_sort_bucketed_table.q,infer_bucket_sort_map_operators.q,infer_bucket_sort_num_buckets.q,schemeAuthority.q,truncate_column_buckets.q"/>
<property name="minimr.query.negative.files" value="cluster_tasklog_retrieval.q,minimr_broken_pipe.q,mapreduce_stack_trace.q,mapreduce_stack_trace_turnoff.q,mapreduce_stack_trace_hadoop20.q,mapreduce_stack_trace_turnoff_hadoop20.q" />
<property name="test.silent" value="true"/>
<property name="hadoopVersion" value="${hadoop.version.ant-internal}"/>
@@ -264,7 +264,7 @@
</copy>
</target>
- <target name="jar" depends="compile">
+ <target name="jar" depends="make-pom,compile">
<echo message="Project: ${ant.project.name}" />
<jar
jarfile="${build.dir}/hive-${ant.project.name}-${version}.jar"
@@ -406,9 +406,11 @@
<equals arg1="${hadoop.mr.rev}" arg2="23" />
<then>
<property name="hadoop.opts" value="${hadoop.opts.23}" />
+ <property name="test.dfs.mkdir" value="-mkdir -p"/>
</then>
<else>
<property name="hadoop.opts" value="${hadoop.opts.20}" />
+ <property name="test.dfs.mkdir" value="-mkdir"/>
</else>
</if>
<!-- Set the OS specific settings to run junit tests on unix as well as on windows -->
@@ -438,6 +440,7 @@
<env key="HADOOP_CLASSPATH" path="${test.src.data.dir}/conf:${build.dir.hive}/dist/lib/derby-${derby.version}.jar:${build.dir.hive}/dist/lib/JavaEWAH-${javaewah.version}.jar:${hadoop.root}/modules/*"/> <!-- Modules needed for Hadoop 0.23 -->
<env key="TZ" value="US/Pacific"/>
<sysproperty key="test.output.overwrite" value="${overwrite}"/>
+ <sysproperty key="test.dfs.mkdir" value="${test.dfs.mkdir}"/>
<sysproperty key="test.service.standalone.server" value="${standalone}"/>
<sysproperty key="test.service.disable.server" value="${disableserver}"/>
<sysproperty key="log4j.configuration" value="file:///${test.src.data.dir}/conf/hive-log4j.properties"/>
@@ -528,7 +531,7 @@
<available file="${basedir}/ivy.xml" property="ivy.present"/>
</target>
- <target name="make-pom" if="ivy.present" depends="check-ivy, jar">
+ <target name="make-pom" if="ivy.present" depends="check-ivy,ivy-resolve">
<echo message="Project: ${ant.project.name}"/>
<echo> Writing POM to ${build.dir}/pom.xml</echo>
Modified: hive/branches/HIVE-4115/build.properties
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/build.properties?rev=1476039&r1=1476038&r2=1476039&view=diff
==============================================================================
--- hive/branches/HIVE-4115/build.properties (original)
+++ hive/branches/HIVE-4115/build.properties Fri Apr 26 04:59:50 2013
@@ -17,7 +17,7 @@
Name=Hive
name=hive
version=0.12.0-SNAPSHOT
-hcatalog.version=0.11.0-SNAPSHOT
+hcatalog.version=${version}
year=2012
javac.debug=on
@@ -29,7 +29,7 @@ javac.args.warnings=
hadoop-0.20.version=0.20.2
hadoop-0.20S.version=1.1.2
-hadoop-0.23.version=2.0.0-alpha
+hadoop-0.23.version=2.0.3-alpha
hadoop.version=${hadoop-0.20.version}
hadoop.security.version=${hadoop-0.20S.version}
# Used to determine which set of Hadoop artifacts we depend on.
@@ -73,9 +73,9 @@ jsp.test.jar=${hadoop.root}/lib/jetty-ex
common.jar=${hadoop.root}/lib/commons-httpclient-3.0.1.jar
# module names needed for build process
-iterate.hive.all=ant,shims,common,serde,metastore,hcatalog,ql,contrib,service,cli,jdbc,beeline,hwi,hbase-handler,pdk,builtins,testutils
-iterate.hive.modules=shims,common,serde,metastore,hcatalog,ql,contrib,service,cli,jdbc,beeline,hwi,hbase-handler,pdk,builtins,testutils
-iterate.hive.tests=ql,contrib,hbase-handler,hwi,jdbc,metastore,hcatalog,odbc,serde,service
+iterate.hive.all=ant,shims,common,serde,metastore,ql,contrib,service,cli,jdbc,beeline,hwi,hbase-handler,testutils,hcatalog
+iterate.hive.modules=shims,common,serde,metastore,ql,contrib,service,cli,jdbc,beeline,hwi,hbase-handler,testutils,hcatalog
+iterate.hive.tests=ql,contrib,hbase-handler,hwi,jdbc,metastore,odbc,serde,service,hcatalog
iterate.hive.thrift=ql,service,metastore,serde
iterate.hive.protobuf=ql
iterate.hive.cpp=odbc
Modified: hive/branches/HIVE-4115/build.xml
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/build.xml?rev=1476039&r1=1476038&r2=1476039&view=diff
==============================================================================
--- hive/branches/HIVE-4115/build.xml (original)
+++ hive/branches/HIVE-4115/build.xml Fri Apr 26 04:59:50 2013
@@ -385,7 +385,6 @@
<mkdir dir="${target.conf.dir}"/>
<mkdir dir="${target.bin.dir}"/>
<mkdir dir="${target.scripts.dir}/metastore/upgrade"/>
- <mkdir dir="${target.scripts.dir}/pdk"/>
<mkdir dir="${target.example.dir}"/>
<mkdir dir="${target.example.dir}/files"/>
<mkdir dir="${target.example.dir}/queries"/>
@@ -402,9 +401,6 @@
<copy todir="${target.scripts.dir}/metastore/upgrade">
<fileset dir="${hive.root}/metastore/scripts/upgrade" excludes="${vcs.excludes}"/>
</copy>
- <copy todir="${target.scripts.dir}/pdk">
- <fileset dir="${hive.root}/pdk/scripts" excludes="${vcs.excludes},README"/>
- </copy>
<copy file="${basedir}/conf/hive-default.xml.template" todir="${target.conf.dir}">
<filterset>
<filter token="VERSION" value="${version}"/>
@@ -492,9 +488,6 @@
<copy todir="${target.example.dir}/files" preservelastmodified="true" flatten="true">
<fileset dir="${test.data.dir}/files" includes="*.*" excludes="${vcs.excludes}"/>
</copy>
- <copy todir="${target.example.dir}/test-plugin">
- <fileset dir="${hive.root}/pdk/test-plugin"/>
- </copy>
<copy file="${basedir}/README.txt" todir="${target.dir}">
<filterset>
<filter token="VERSION" value="${version}"/>
@@ -517,14 +510,6 @@
<copy todir="${build.dir.hive}/hcatalog">
<fileset dir="${hive.root}/hcatalog/build/hcatalog-${hcatalog.version}"/>
</copy>
-
- <!-- special case because builtins compilation depends on packaging
- up everything else first -->
- <ant antfile="${hive.root}/builtins/build.xml" target="package"
- inheritAll="false" />
- <copy todir="${target.lib.dir}" preservelastmodified="true" flatten="true">
- <fileset file="${build.dir.hive}/builtins/hive-builtins-${version}.jar"/>
- </copy>
</target>
@@ -684,8 +669,6 @@
<packageset dir="ql/src/gen/thrift/gen-javabean"/>
<packageset dir="${build.dir.hive}/ql/gen/antlr/gen-java"/>
<packageset dir="shims/src/common/java"/>
- <packageset dir="pdk/src/java"/>
- <packageset dir="builtins/src"/>
<link href="${javadoc.link.java}"/>
@@ -955,7 +938,6 @@
<sourcePath path="${hive.root}/ant" />
<sourcePath path="${hive.root}/beeline" />
- <sourcePath path="${hive.root}/builtins" />
<sourcePath path="${hive.root}/cli" />
<sourcePath path="${hive.root}/common" />
<sourcePath path="${hive.root}/contrib" />
@@ -965,14 +947,12 @@
<sourcePath path="${hive.root}/metastore" />
<sourcePath path="${hive.root}/hcatalog" />
<sourcePath path="${hive.root}/odbc" />
- <sourcePath path="${hive.root}/pdk" />
<sourcePath path="${hive.root}/ql" />
<sourcePath path="${hive.root}/serde" />
<sourcePath path="${hive.root}/service" />
<sourcePath path="${hive.root}/shims" />
<class location="${build.dir.hive}/anttasks/classes" />
<class location="${build.dir.hive}/beeline/classes" />
- <class location="${build.dir.hive}/builtins/classes" />
<class location="${build.dir.hive}/cli/classes" />
<class location="${build.dir.hive}/common/classes" />
<class location="${build.dir.hive}/contrib/classes" />
@@ -981,7 +961,6 @@
<class location="${build.dir.hive}/jdbc/classes" />
<class location="${build.dir.hive}/metastore/classes" />
<class location="${build.dir.hive}/hcatalog/classes" />
- <class location="${build.dir.hive}/pdk/classes" />
<class location="${build.dir.hive}/ql/classes" />
<class location="${build.dir.hive}/serde/classes" />
<class location="${build.dir.hive}/service/classes" />
@@ -1066,8 +1045,6 @@
todir="${mvn.jar.dir}" />
<copy file="${build.dir.hive}/beeline/hive-beeline-${version}.jar"
todir="${mvn.jar.dir}" />
- <copy file="${build.dir.hive}/builtins/hive-builtins-${version}.jar"
- todir="${mvn.jar.dir}" />
<copy file="${build.dir.hive}/cli/hive-cli-${version}.jar"
todir="${mvn.jar.dir}" />
<copy file="${build.dir.hive}/common/hive-common-${version}.jar"
@@ -1084,8 +1061,6 @@
todir="${mvn.jar.dir}" />
<copy file="${build.dir.hive}/hcatalog/hive-hcatalog-${hcatalog.version}.jar"
todir="${mvn.jar.dir}" />
- <copy file="${build.dir.hive}/pdk/hive-pdk-${version}.jar"
- todir="${mvn.jar.dir}" />
<copy file="${build.dir.hive}/ql/hive-exec-${version}.jar"
todir="${mvn.jar.dir}" />
<copy file="${build.dir.hive}/serde/hive-serde-${version}.jar"
@@ -1100,8 +1075,6 @@
tofile="${mvn.pom.dir}/hive-anttasks-${version}.pom" />
<copy file="${build.dir.hive}/beeline/pom.xml"
tofile="${mvn.pom.dir}/hive-beeline-${version}.pom" />
- <copy file="${build.dir.hive}/builtins/pom.xml"
- tofile="${mvn.pom.dir}/hive-builtins-${version}.pom" />
<copy file="${build.dir.hive}/cli/pom.xml"
tofile="${mvn.pom.dir}/hive-cli-${version}.pom" />
<copy file="${build.dir.hive}/common/pom.xml"
@@ -1118,9 +1091,7 @@
tofile="${mvn.pom.dir}/hive-metastore-${version}.pom" />
<copy file="${build.dir.hive}/hcatalog/pom.xml"
tofile="${mvn.pom.dir}/hive-hcatalog-${hcatalog.version}.pom" />
- <copy file="${build.dir.hive}/pdk/pom.xml"
- tofile="${mvn.pom.dir}/hive-pdk-${version}.pom" />
- <copy file="${build.dir.hive}/ql/pom.xml"
+ <copy file="${build.dir.hive}/ql/pom.xml"
tofile="${mvn.pom.dir}/hive-exec-${version}.pom" />
<copy file="${build.dir.hive}/serde/pom.xml"
tofile="${mvn.pom.dir}/hive-serde-${version}.pom" />
@@ -1208,9 +1179,6 @@
<param name="hive.project" value="beeline" />
</antcall>
<antcall target="maven-publish-artifact">
- <param name="hive.project" value="builtins" />
- </antcall>
- <antcall target="maven-publish-artifact">
<param name="hive.project" value="cli" />
</antcall>
<antcall target="maven-publish-artifact">
@@ -1238,9 +1206,6 @@
<param name="hive.project" value="hcatalog" />
</antcall>
<antcall target="maven-publish-artifact">
- <param name="hive.project" value="pdk" />
- </antcall>
- <antcall target="maven-publish-artifact">
<param name="hive.project" value="serde" />
</antcall>
<antcall target="maven-publish-artifact">
@@ -1384,16 +1349,6 @@
output.file="${mvn.pom.dir}/hive-hcatalog-${hcatalog.version}.pom.asc"
gpg.passphrase="${gpg.passphrase}"/>
- <!-- hive-pdk -->
- <sign-artifact
- input.file="${mvn.pom.dir}/hive-pdk-${version}.jar"
- output.file="${mvn.pom.dir}/hive-pdk-${version}.jar.asc"
- gpg.passphrase="${gpg.passphrase}"/>
- <sign-artifact
- input.file="${mvn.pom.dir}/hive-pdk-${version}.pom"
- output.file="${mvn.pom.dir}/hive-pdk-${version}.pom.asc"
- gpg.passphrase="${gpg.passphrase}"/>
-
<!-- hive-serde -->
<sign-artifact
input.file="${mvn.jar.dir}/hive-serde-${version}.jar"
Modified: hive/branches/HIVE-4115/cli/ivy.xml
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/cli/ivy.xml?rev=1476039&r1=1476038&r2=1476039&view=diff
==============================================================================
--- hive/branches/HIVE-4115/cli/ivy.xml (original)
+++ hive/branches/HIVE-4115/cli/ivy.xml Fri Apr 26 04:59:50 2013
@@ -35,7 +35,5 @@
conf="compile->default" />
<dependency org="org.apache.hive" name="hive-shims" rev="${version}"
conf="runtime" transitive="false"/>
- <dependency org="org.apache.hive" name="hive-builtins" rev="${version}"
- conf="runtime" transitive="false"/>
</dependencies>
</ivy-module>
Modified: hive/branches/HIVE-4115/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java?rev=1476039&r1=1476038&r2=1476039&view=diff
==============================================================================
--- hive/branches/HIVE-4115/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java (original)
+++ hive/branches/HIVE-4115/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java Fri Apr 26 04:59:50 2013
@@ -131,7 +131,8 @@ public class HiveConf extends Configurat
HiveConf.ConfVars.HMSHANDLERATTEMPTS,
HiveConf.ConfVars.HMSHANDLERINTERVAL,
HiveConf.ConfVars.HMSHANDLERFORCERELOADCONF,
- HiveConf.ConfVars.METASTORE_PARTITION_NAME_WHITELIST_PATTERN
+ HiveConf.ConfVars.METASTORE_PARTITION_NAME_WHITELIST_PATTERN,
+ HiveConf.ConfVars.METASTORE_DISALLOW_INCOMPATIBLE_COL_TYPE_CHANGES
};
/**
@@ -190,7 +191,6 @@ public class HiveConf extends Configurat
PREEXECHOOKS("hive.exec.pre.hooks", ""),
POSTEXECHOOKS("hive.exec.post.hooks", ""),
ONFAILUREHOOKS("hive.exec.failure.hooks", ""),
- OPERATORHOOKS("hive.exec.operator.hooks", ""),
CLIENTSTATSPUBLISHERS("hive.client.stats.publishers", ""),
EXECPARALLEL("hive.exec.parallel", false), // parallel query launching
EXECPARALLETHREADNUMBER("hive.exec.parallel.thread.number", 8),
@@ -340,7 +340,8 @@ public class HiveConf extends Configurat
METASTORE_EXECUTE_SET_UGI("hive.metastore.execute.setugi", false),
METASTORE_PARTITION_NAME_WHITELIST_PATTERN(
"hive.metastore.partition.name.whitelist.pattern", ""),
-
+ METASTORE_DISALLOW_INCOMPATIBLE_COL_TYPE_CHANGES(
+ "hive.metastore.disallow.incompatible.col.type.changes", false),
// Default parameters for creating tables
NEWTABLEDEFAULTPARA("hive.table.parameters.default", ""),
@@ -487,11 +488,15 @@ public class HiveConf extends Configurat
HIVEUSEEXPLICITRCFILEHEADER("hive.exec.rcfile.use.explicit.header", true),
HIVEUSERCFILESYNCCACHE("hive.exec.rcfile.use.sync.cache", true),
+ // Maximum fraction of heap that can be used by ORC file writers
+ HIVE_ORC_FILE_MEMORY_POOL("hive.exec.orc.memory.pool", 0.5f), // 50%
+
HIVESKEWJOIN("hive.optimize.skewjoin", false),
HIVECONVERTJOIN("hive.auto.convert.join", true),
HIVECONVERTJOINNOCONDITIONALTASK("hive.auto.convert.join.noconditionaltask", true),
HIVECONVERTJOINNOCONDITIONALTASKTHRESHOLD("hive.auto.convert.join.noconditionaltask.size",
10000000L),
+ HIVEOPTIMIZEMAPJOINFOLLOWEDBYMR("hive.optimize.mapjoin.mapreduce", false),
HIVESKEWJOINKEY("hive.skewjoin.key", 100000),
HIVESKEWJOINMAPJOINNUMMAPTASK("hive.skewjoin.mapjoin.map.tasks", 10000),
HIVESKEWJOINMAPJOINMINSPLIT("hive.skewjoin.mapjoin.min.split", 33554432L), //32M
@@ -524,6 +529,8 @@ public class HiveConf extends Configurat
HIVE_AUTO_SORTMERGE_JOIN_BIGTABLE_SELECTOR(
"hive.auto.convert.sortmerge.join.bigtable.selection.policy",
"org.apache.hadoop.hive.ql.optimizer.AvgPartitionSizeBasedBigTableSelectorForAutoSMJ"),
+ HIVE_AUTO_SORTMERGE_JOIN_TOMAPJOIN(
+ "hive.auto.convert.sortmerge.join.to.mapjoin", false),
HIVESCRIPTOPERATORTRUST("hive.exec.script.trust", false),
HIVEROWOFFSET("hive.exec.rowoffset", false),
@@ -565,18 +572,6 @@ public class HiveConf extends Configurat
HIVE_INDEX_COMPACT_QUERY_MAX_SIZE("hive.index.compact.query.max.size", (long) 10 * 1024 * 1024 * 1024), // 10G
HIVE_INDEX_COMPACT_BINARY_SEARCH("hive.index.compact.binary.search", true),
- //Profiler
- HIVEPROFILERDBCLASS("hive.profiler.dbclass","jdbc:derby"),
- HIVEPROFILERJDBCDRIVER("hive.profiler.jdbcdriver", "org.apache.derby.jdbc.EmbeddedDriver"),
- HIVEPROFILERDBCONNECTIONSTRING("hive.profiler.dbconnectionstring",
- "jdbc:derby:;databaseName=TempProfilerStore;create=true"), // automatically create database
- // default timeout for JDBC connection
- HIVE_PROFILER_JDBC_TIMEOUT("hive.profiler.jdbc.timeout", 30),
- HIVE_PROFILER_RETRIES_MAX("hive.stats.retries.max",
- 0), // maximum # of retries to insert/select/delete the stats DB
- HIVE_PROFILER_RETRIES_WAIT("hive.stats.retries.wait",
- 3000), // # milliseconds to wait before the next retry
-
// Statistics
HIVESTATSAUTOGATHER("hive.stats.autogather", true),
HIVESTATSDBCLASS("hive.stats.dbclass",
@@ -722,8 +717,8 @@ public class HiveConf extends Configurat
HIVE_SERVER2_KERBEROS_PRINCIPAL("hive.server2.authentication.kerberos.principal", ""),
HIVE_SERVER2_PLAIN_LDAP_URL("hive.server2.authentication.ldap.url", null),
HIVE_SERVER2_PLAIN_LDAP_BASEDN("hive.server2.authentication.ldap.baseDN", null),
- HIVE_SERVER2_KERBEROS_IMPERSONATION("hive.server2.enable.impersonation", false),
HIVE_SERVER2_CUSTOM_AUTHENTICATION_CLASS("hive.server2.custom.authentication.class", null),
+ HIVE_SERVER2_ENABLE_DOAS("hive.server2.enable.doAs", true),
HIVE_CONF_RESTRICTED_LIST("hive.conf.restricted.list", null),
Modified: hive/branches/HIVE-4115/conf/hive-default.xml.template
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/conf/hive-default.xml.template?rev=1476039&r1=1476038&r2=1476039&view=diff
==============================================================================
--- hive/branches/HIVE-4115/conf/hive-default.xml.template (original)
+++ hive/branches/HIVE-4115/conf/hive-default.xml.template Fri Apr 26 04:59:50 2013
@@ -290,6 +290,24 @@
</property>
<property>
+ <name>hive.metastore.disallow.incompatible.col.type.change</name>
+ <value></value>
+ <description>If true (default is false), ALTER TABLE operations which change the type of
+ a column (say STRING) to an incompatible type (say MAP<STRING, STRING>) are disallowed.
+ RCFile default serde (ColumnarSerde) serializes the values in such a way that the
+ datatypes can be converted from string to any type. The map is also serialized as
+ a string, which can be read as a string as well. However, with any binary
+ serialization, this is not true. Blocking the ALTER TABLE prevents ClassCastExceptions
+ when subsequently trying to access old partitions.
+
+ Primitive types like INT, STRING, BIGINT, etc are compatible with each other and are
+ not blocked.
+
+ See HIVE-4409 for more details.
+</description>
+</property>
+
+<property>
<name>hive.metastore.end.function.listeners</name>
<value></value>
<description>list of comma separated listeners for the end of metastore functions.</description>
@@ -842,6 +860,16 @@
</property>
<property>
+ <name>hive.optimize.mapjoin.mapreduce</name>
+ <value>false</value>
+ <description>If hive.auto.convert.join is off, this parameter does not take
+ affect. If it is on, and if there are map-join jobs followed by a map-reduce
+ job (for e.g a group by), each map-only job is merged with the following
+ map-reduce job.
+ </description>
+</property>
+
+<property>
<name>hive.script.auto.progress</name>
<value>false</value>
<description>Whether Hive Tranform/Map/Reduce Clause should automatically send progress information to TaskTracker to avoid the task getting killed because of inactivity. Hive sends progress information when the script is outputting to stderr. This option removes the need of periodically producing stderr messages, but users should be cautious because this may prevent infinite loops in the scripts to be killed by TaskTracker. </description>
@@ -983,6 +1011,20 @@
</property>
<property>
+ <name>hive.auto.convert.sortmerge.join.to.mapjoin</name>
+ <value>false</value>
+ <description>If hive.auto.convert.sortmerge.join is set to true, and a join was converted to a sort-merge join,
+ this parameter decides whether each table should be tried as a big table, and effectviely a map-join should be
+ tried. That would create a conditional task with n+1 children for a n-way join (1 child for each table as the
+ big table), and the backup task will be the sort-merge join. In some casess, a map-join would be faster than a
+ sort-merge join, if there is no advantage of having the output bucketed and sorted. For eg. if a very big sorted
+ and bucketed table with few files (say 10 files) are being joined with a very small sorter and bucketed table
+ with few files (10 files), the sort-merge join will only use 10 mappers, and a simple map-only join might be faster
+ if the complete small table can fit in memory, and a map-join can be performed.
+ </description>
+</property>
+
+<property>
<name>hive.metastore.ds.connection.url.hook</name>
<value></value>
<description>Name of the hook to use for retriving the JDO connection URL. If empty, the value in javax.jdo.option.ConnectionURL is used </description>
@@ -1123,42 +1165,6 @@
</property>
<property>
- <name>hive.profiler.dbclass</name>
- <value>jdbc:derby</value>
- <description>The default database that stores temporary hive statistics.</description>
-</property>
-
-<property>
- <name>hive.profiler.jdbcdriver</name>
- <value>org.apache.derby.jdbc.EmbeddedDriver</value>
- <description>The JDBC driver for the database that stores temporary hive statistics.</description>
-</property>
-
-<property>
- <name>hive.profiler.dbconnectionstring</name>
- <value>jdbc:derby:;databaseName=TempStatsStore;create=true</value>
- <description>The default connection string for the database that stores temporary hive statistics.</description>
-</property>
-
-<property>
- <name>hive.profiler.jdbc.timeout</name>
- <value>30</value>
- <description>Timeout value (number of seconds) used by JDBC connection and statements.</description>
-</property>
-
-<property>
- <name>hive.profiler.retries.max</name>
- <value>0</value>
- <description>Maximum number of retries when profiler publisher/aggregator got an exception updating intermediate database. Default is no tries on failures.</description>
-</property>
-
-<property>
- <name>hive.profiler.retries.wait</name>
- <value>3000</value>
- <description>The base waiting window (in milliseconds) before the next retry. The actual wait time is calculated by baseWindow * failues baseWindow * (failure 1) * (random number between [0.0,1.0]).</description>
-</property>
-
-<property>
<name>hive.stats.dbclass</name>
<value>jdbc:derby</value>
<description>The default database that stores temporary hive statistics.</description>
@@ -1877,7 +1883,6 @@
</description>
</property>
-
<property>
<name>hive.server2.authentication.ldap.baseDN</name>
<value></value>
@@ -1886,5 +1891,15 @@
</description>
</property>
+<property>
+ <name>hive.server2.enable.doAs</name>
+ <value>true</value>
+ <description>
+ Setting this property to true will have hive server2 execute
+ hive operations as the user making the calls to it.
+ </description>
+</property>
+
+
</configuration>
Modified: hive/branches/HIVE-4115/eclipse-templates/.classpath
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/eclipse-templates/.classpath?rev=1476039&r1=1476038&r2=1476039&view=diff
==============================================================================
--- hive/branches/HIVE-4115/eclipse-templates/.classpath (original)
+++ hive/branches/HIVE-4115/eclipse-templates/.classpath Fri Apr 26 04:59:50 2013
@@ -89,7 +89,6 @@
<classpathentry kind="lib" path="build/ivy/lib/default/snappy-@snappy.version@.jar"/>
<classpathentry kind="lib" path="build/beeline/hive-beeline-@HIVE_VERSION@.jar"/>
<classpathentry kind="lib" path="build/ivy/lib/default/tempus-fugit-@tempus-fugit.version@.jar"/>
- <classpathentry kind="lib" path="build/builtins/hive-builtins-@HIVE_VERSION@.jar"/>
<classpathentry kind="src" path="build/contrib/test/src"/>
<classpathentry kind="src" path="build/metastore/gen/antlr/gen-java"/>
<classpathentry kind="lib" path="build/testutils/hive-testutils-@HIVE_VERSION@.jar"/>
@@ -97,7 +96,6 @@
<classpathentry kind="src" path="build/ql/gen/antlr/gen-java"/>
<classpathentry kind="src" path="beeline/src/java"/>
<classpathentry kind="src" path="beeline/src/test"/>
- <classpathentry kind="src" path="builtins/src"/>
<classpathentry kind="src" path="cli/src/java"/>
<classpathentry kind="src" path="cli/src/test"/>
<classpathentry kind="src" path="common/src/java"/>
@@ -115,8 +113,6 @@
<classpathentry kind="src" path="metastore/src/java"/>
<classpathentry kind="src" path="metastore/src/model"/>
<classpathentry kind="src" path="metastore/src/test"/>
- <classpathentry kind="src" path="pdk/src/java"/>
- <classpathentry kind="src" path="pdk/test-plugin/src"/>
<classpathentry kind="src" path="ql/src/gen/thrift/gen-javabean"/>
<classpathentry kind="src" path="ql/src/gen/protobuf/gen-java"/>
<classpathentry kind="src" path="ql/src/java"/>
Modified: hive/branches/HIVE-4115/hbase-handler/ivy.xml
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/hbase-handler/ivy.xml?rev=1476039&r1=1476038&r2=1476039&view=diff
==============================================================================
--- hive/branches/HIVE-4115/hbase-handler/ivy.xml (original)
+++ hive/branches/HIVE-4115/hbase-handler/ivy.xml Fri Apr 26 04:59:50 2013
@@ -36,6 +36,9 @@
</dependency>
<dependency org="com.github.stephenc.high-scale-lib" name="high-scale-lib" rev="1.1.1"
transitive="false"/>
+ <dependency org="com.yammer.metrics" name="metrics-core" rev="${metrics-core.version}">
+ <exclude org="org.slf4j" module="slf4j-api"/><!--causes a dual slf4j presence otherwise-->
+ </dependency>
<dependency org="org.codehaus.jackson" name="jackson-jaxrs" rev="${jackson.version}"/>
<dependency org="org.codehaus.jackson" name="jackson-xc" rev="${jackson.version}"/>
</dependencies>
Modified: hive/branches/HIVE-4115/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseStorageHandler.java
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseStorageHandler.java?rev=1476039&r1=1476038&r2=1476039&view=diff
==============================================================================
--- hive/branches/HIVE-4115/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseStorageHandler.java (original)
+++ hive/branches/HIVE-4115/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseStorageHandler.java Fri Apr 26 04:59:50 2013
@@ -34,6 +34,7 @@ import org.apache.hadoop.hbase.HTableDes
import org.apache.hadoop.hbase.MasterNotRunningException;
import org.apache.hadoop.hbase.client.HBaseAdmin;
import org.apache.hadoop.hbase.client.HTable;
+import org.apache.hadoop.hbase.mapred.TableMapReduceUtil;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hive.hbase.HBaseSerDe.ColumnMapping;
import org.apache.hadoop.hive.metastore.HiveMetaHook;
@@ -268,6 +269,7 @@ public class HBaseStorageHandler extends
configureTableJobProperties(tableDesc, jobProperties);
}
+ @Override
public void configureTableJobProperties(
TableDesc tableDesc,
Map<String, String> jobProperties) {
@@ -293,6 +295,17 @@ public class HBaseStorageHandler extends
}
@Override
+ public void configureJobConf(TableDesc tableDesc, JobConf jobConf) {
+ try {
+ TableMapReduceUtil.addDependencyJars(jobConf);
+ org.apache.hadoop.hbase.mapreduce.TableMapReduceUtil.addDependencyJars(jobConf,
+ HBaseStorageHandler.class);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @Override
public DecomposedPredicate decomposePredicate(
JobConf jobConf,
Deserializer deserializer,