You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by br...@apache.org on 2013/10/28 19:44:09 UTC

svn commit: r1536480 [1/12] - in /hive/branches/maven: ./ ant/src/org/apache/hadoop/hive/ant/ common/src/java/conf/ common/src/java/org/apache/hadoop/hive/common/type/ common/src/test/org/apache/hadoop/hive/common/type/ data/files/ hcatalog/core/src/ma...

Author: brock
Date: Mon Oct 28 18:44:01 2013
New Revision: 1536480

URL: http://svn.apache.org/r1536480
Log:
Merge trunk into branch

Added:
    hive/branches/maven/common/src/test/org/apache/hadoop/hive/common/type/TestHiveDecimal.java
      - copied unchanged from r1536474, hive/trunk/common/src/test/org/apache/hadoop/hive/common/type/TestHiveDecimal.java
    hive/branches/maven/data/files/input.txt
      - copied unchanged from r1536474, hive/trunk/data/files/input.txt
    hive/branches/maven/data/files/kv9.txt
      - copied unchanged from r1536474, hive/trunk/data/files/kv9.txt
    hive/branches/maven/hcatalog/webhcat/svr/src/main/config/override-container-log4j.properties
      - copied unchanged from r1536474, hive/trunk/hcatalog/webhcat/svr/src/main/config/override-container-log4j.properties
    hive/branches/maven/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/JobSubmissionConstants.java
      - copied unchanged from r1536474, hive/trunk/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/JobSubmissionConstants.java
    hive/branches/maven/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/LaunchMapper.java
      - copied unchanged from r1536474, hive/trunk/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/LaunchMapper.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorExpressionDescriptor.java
      - copied unchanged from r1536474, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorExpressionDescriptor.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorizedExpressions.java
      - copied unchanged from r1536474, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorizedExpressions.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterColAndScalar.java
      - copied unchanged from r1536474, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterColAndScalar.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterColOrScalar.java
      - copied unchanged from r1536474, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterColOrScalar.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterScalarAndColumn.java
      - copied unchanged from r1536474, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterScalarAndColumn.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterScalarOrColumn.java
      - copied unchanged from r1536474, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterScalarOrColumn.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncRandNoSeed.java
      - copied unchanged from r1536474, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncRandNoSeed.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/parse/QBSubQuery.java
      - copied unchanged from r1536474, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/QBSubQuery.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/parse/SubQueryUtils.java
      - copied unchanged from r1536474, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/SubQueryUtils.java
    hive/branches/maven/ql/src/test/org/apache/hadoop/hive/ql/optimizer/listbucketingpruner/TestDynamicMultiDimeCollection.java
      - copied unchanged from r1536474, hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/optimizer/listbucketingpruner/TestDynamicMultiDimeCollection.java
    hive/branches/maven/ql/src/test/org/apache/hadoop/hive/ql/optimizer/listbucketingpruner/TestListBucketingPrunner.java
      - copied unchanged from r1536474, hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/optimizer/listbucketingpruner/TestListBucketingPrunner.java
    hive/branches/maven/ql/src/test/org/apache/hadoop/hive/ql/parse/TestHiveDecimalParse.java
      - copied unchanged from r1536474, hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/parse/TestHiveDecimalParse.java
    hive/branches/maven/ql/src/test/queries/clientnegative/subquery_exists_implicit_gby.q
      - copied unchanged from r1536474, hive/trunk/ql/src/test/queries/clientnegative/subquery_exists_implicit_gby.q
    hive/branches/maven/ql/src/test/queries/clientnegative/subquery_in_groupby.q
      - copied unchanged from r1536474, hive/trunk/ql/src/test/queries/clientnegative/subquery_in_groupby.q
    hive/branches/maven/ql/src/test/queries/clientnegative/subquery_in_select.q
      - copied unchanged from r1536474, hive/trunk/ql/src/test/queries/clientnegative/subquery_in_select.q
    hive/branches/maven/ql/src/test/queries/clientnegative/subquery_multiple_cols_in_select.q
      - copied unchanged from r1536474, hive/trunk/ql/src/test/queries/clientnegative/subquery_multiple_cols_in_select.q
    hive/branches/maven/ql/src/test/queries/clientnegative/subquery_notexists_implicit_gby.q
      - copied unchanged from r1536474, hive/trunk/ql/src/test/queries/clientnegative/subquery_notexists_implicit_gby.q
    hive/branches/maven/ql/src/test/queries/clientnegative/subquery_subquery_chain.q
      - copied unchanged from r1536474, hive/trunk/ql/src/test/queries/clientnegative/subquery_subquery_chain.q
    hive/branches/maven/ql/src/test/queries/clientnegative/subquery_windowing_corr.q
      - copied unchanged from r1536474, hive/trunk/ql/src/test/queries/clientnegative/subquery_windowing_corr.q
    hive/branches/maven/ql/src/test/queries/clientnegative/subquery_with_or_cond.q
      - copied unchanged from r1536474, hive/trunk/ql/src/test/queries/clientnegative/subquery_with_or_cond.q
    hive/branches/maven/ql/src/test/queries/clientpositive/decimal_5.q
      - copied unchanged from r1536474, hive/trunk/ql/src/test/queries/clientpositive/decimal_5.q
    hive/branches/maven/ql/src/test/queries/clientpositive/decimal_6.q
      - copied unchanged from r1536474, hive/trunk/ql/src/test/queries/clientpositive/decimal_6.q
    hive/branches/maven/ql/src/test/queries/clientpositive/join_merging.q
      - copied unchanged from r1536474, hive/trunk/ql/src/test/queries/clientpositive/join_merging.q
    hive/branches/maven/ql/src/test/queries/clientpositive/partition_varchar2.q
      - copied unchanged from r1536474, hive/trunk/ql/src/test/queries/clientpositive/partition_varchar2.q
    hive/branches/maven/ql/src/test/queries/clientpositive/split.q
      - copied unchanged from r1536474, hive/trunk/ql/src/test/queries/clientpositive/split.q
    hive/branches/maven/ql/src/test/queries/clientpositive/subquery_exists.q
      - copied unchanged from r1536474, hive/trunk/ql/src/test/queries/clientpositive/subquery_exists.q
    hive/branches/maven/ql/src/test/queries/clientpositive/subquery_in.q
      - copied unchanged from r1536474, hive/trunk/ql/src/test/queries/clientpositive/subquery_in.q
    hive/branches/maven/ql/src/test/queries/clientpositive/subquery_multiinsert.q
      - copied unchanged from r1536474, hive/trunk/ql/src/test/queries/clientpositive/subquery_multiinsert.q
    hive/branches/maven/ql/src/test/queries/clientpositive/subquery_notexists.q
      - copied unchanged from r1536474, hive/trunk/ql/src/test/queries/clientpositive/subquery_notexists.q
    hive/branches/maven/ql/src/test/queries/clientpositive/subquery_notin.q
      - copied unchanged from r1536474, hive/trunk/ql/src/test/queries/clientpositive/subquery_notin.q
    hive/branches/maven/ql/src/test/queries/clientpositive/vectorization_0.q
      - copied unchanged from r1536474, hive/trunk/ql/src/test/queries/clientpositive/vectorization_0.q
    hive/branches/maven/ql/src/test/queries/clientpositive/vectorization_1.q
      - copied unchanged from r1536474, hive/trunk/ql/src/test/queries/clientpositive/vectorization_1.q
    hive/branches/maven/ql/src/test/queries/clientpositive/vectorization_10.q
      - copied unchanged from r1536474, hive/trunk/ql/src/test/queries/clientpositive/vectorization_10.q
    hive/branches/maven/ql/src/test/queries/clientpositive/vectorization_11.q
      - copied unchanged from r1536474, hive/trunk/ql/src/test/queries/clientpositive/vectorization_11.q
    hive/branches/maven/ql/src/test/queries/clientpositive/vectorization_12.q
      - copied unchanged from r1536474, hive/trunk/ql/src/test/queries/clientpositive/vectorization_12.q
    hive/branches/maven/ql/src/test/queries/clientpositive/vectorization_13.q
      - copied unchanged from r1536474, hive/trunk/ql/src/test/queries/clientpositive/vectorization_13.q
    hive/branches/maven/ql/src/test/queries/clientpositive/vectorization_14.q
      - copied unchanged from r1536474, hive/trunk/ql/src/test/queries/clientpositive/vectorization_14.q
    hive/branches/maven/ql/src/test/queries/clientpositive/vectorization_15.q
      - copied unchanged from r1536474, hive/trunk/ql/src/test/queries/clientpositive/vectorization_15.q
    hive/branches/maven/ql/src/test/queries/clientpositive/vectorization_16.q
      - copied unchanged from r1536474, hive/trunk/ql/src/test/queries/clientpositive/vectorization_16.q
    hive/branches/maven/ql/src/test/queries/clientpositive/vectorization_2.q
      - copied unchanged from r1536474, hive/trunk/ql/src/test/queries/clientpositive/vectorization_2.q
    hive/branches/maven/ql/src/test/queries/clientpositive/vectorization_3.q
      - copied unchanged from r1536474, hive/trunk/ql/src/test/queries/clientpositive/vectorization_3.q
    hive/branches/maven/ql/src/test/queries/clientpositive/vectorization_4.q
      - copied unchanged from r1536474, hive/trunk/ql/src/test/queries/clientpositive/vectorization_4.q
    hive/branches/maven/ql/src/test/queries/clientpositive/vectorization_5.q
      - copied unchanged from r1536474, hive/trunk/ql/src/test/queries/clientpositive/vectorization_5.q
    hive/branches/maven/ql/src/test/queries/clientpositive/vectorization_6.q
      - copied unchanged from r1536474, hive/trunk/ql/src/test/queries/clientpositive/vectorization_6.q
    hive/branches/maven/ql/src/test/queries/clientpositive/vectorization_7.q
      - copied unchanged from r1536474, hive/trunk/ql/src/test/queries/clientpositive/vectorization_7.q
    hive/branches/maven/ql/src/test/queries/clientpositive/vectorization_8.q
      - copied unchanged from r1536474, hive/trunk/ql/src/test/queries/clientpositive/vectorization_8.q
    hive/branches/maven/ql/src/test/queries/clientpositive/vectorization_9.q
      - copied unchanged from r1536474, hive/trunk/ql/src/test/queries/clientpositive/vectorization_9.q
    hive/branches/maven/ql/src/test/queries/clientpositive/vectorization_not.q
      - copied unchanged from r1536474, hive/trunk/ql/src/test/queries/clientpositive/vectorization_not.q
    hive/branches/maven/ql/src/test/queries/clientpositive/vectorized_shufflejoin.q
      - copied unchanged from r1536474, hive/trunk/ql/src/test/queries/clientpositive/vectorized_shufflejoin.q
    hive/branches/maven/ql/src/test/results/clientnegative/subquery_exists_implicit_gby.q.out
      - copied unchanged from r1536474, hive/trunk/ql/src/test/results/clientnegative/subquery_exists_implicit_gby.q.out
    hive/branches/maven/ql/src/test/results/clientnegative/subquery_in_groupby.q.out
      - copied unchanged from r1536474, hive/trunk/ql/src/test/results/clientnegative/subquery_in_groupby.q.out
    hive/branches/maven/ql/src/test/results/clientnegative/subquery_in_select.q.out
      - copied unchanged from r1536474, hive/trunk/ql/src/test/results/clientnegative/subquery_in_select.q.out
    hive/branches/maven/ql/src/test/results/clientnegative/subquery_multiple_cols_in_select.q.out
      - copied unchanged from r1536474, hive/trunk/ql/src/test/results/clientnegative/subquery_multiple_cols_in_select.q.out
    hive/branches/maven/ql/src/test/results/clientnegative/subquery_notexists_implicit_gby.q.out
      - copied unchanged from r1536474, hive/trunk/ql/src/test/results/clientnegative/subquery_notexists_implicit_gby.q.out
    hive/branches/maven/ql/src/test/results/clientnegative/subquery_subquery_chain.q.out
      - copied unchanged from r1536474, hive/trunk/ql/src/test/results/clientnegative/subquery_subquery_chain.q.out
    hive/branches/maven/ql/src/test/results/clientnegative/subquery_windowing_corr.q.out
      - copied unchanged from r1536474, hive/trunk/ql/src/test/results/clientnegative/subquery_windowing_corr.q.out
    hive/branches/maven/ql/src/test/results/clientnegative/subquery_with_or_cond.q.out
      - copied unchanged from r1536474, hive/trunk/ql/src/test/results/clientnegative/subquery_with_or_cond.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/decimal_5.q.out
      - copied unchanged from r1536474, hive/trunk/ql/src/test/results/clientpositive/decimal_5.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/decimal_6.q.out
      - copied unchanged from r1536474, hive/trunk/ql/src/test/results/clientpositive/decimal_6.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/join_merging.q.out
      - copied unchanged from r1536474, hive/trunk/ql/src/test/results/clientpositive/join_merging.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/partition_varchar2.q.out
      - copied unchanged from r1536474, hive/trunk/ql/src/test/results/clientpositive/partition_varchar2.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/split.q.out
      - copied unchanged from r1536474, hive/trunk/ql/src/test/results/clientpositive/split.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/subquery_exists.q.out
      - copied unchanged from r1536474, hive/trunk/ql/src/test/results/clientpositive/subquery_exists.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/subquery_in.q.out
      - copied unchanged from r1536474, hive/trunk/ql/src/test/results/clientpositive/subquery_in.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/subquery_multiinsert.q.out
      - copied unchanged from r1536474, hive/trunk/ql/src/test/results/clientpositive/subquery_multiinsert.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/subquery_notexists.q.out
      - copied unchanged from r1536474, hive/trunk/ql/src/test/results/clientpositive/subquery_notexists.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/subquery_notin.q.out
      - copied unchanged from r1536474, hive/trunk/ql/src/test/results/clientpositive/subquery_notin.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/vectorization_0.q.out
      - copied unchanged from r1536474, hive/trunk/ql/src/test/results/clientpositive/vectorization_0.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/vectorization_1.q.out
      - copied unchanged from r1536474, hive/trunk/ql/src/test/results/clientpositive/vectorization_1.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/vectorization_10.q.out
      - copied unchanged from r1536474, hive/trunk/ql/src/test/results/clientpositive/vectorization_10.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/vectorization_11.q.out
      - copied unchanged from r1536474, hive/trunk/ql/src/test/results/clientpositive/vectorization_11.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/vectorization_12.q.out
      - copied unchanged from r1536474, hive/trunk/ql/src/test/results/clientpositive/vectorization_12.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/vectorization_13.q.out
      - copied unchanged from r1536474, hive/trunk/ql/src/test/results/clientpositive/vectorization_13.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/vectorization_14.q.out
      - copied unchanged from r1536474, hive/trunk/ql/src/test/results/clientpositive/vectorization_14.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/vectorization_15.q.out
      - copied unchanged from r1536474, hive/trunk/ql/src/test/results/clientpositive/vectorization_15.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/vectorization_16.q.out
      - copied unchanged from r1536474, hive/trunk/ql/src/test/results/clientpositive/vectorization_16.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/vectorization_2.q.out
      - copied unchanged from r1536474, hive/trunk/ql/src/test/results/clientpositive/vectorization_2.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/vectorization_3.q.out
      - copied unchanged from r1536474, hive/trunk/ql/src/test/results/clientpositive/vectorization_3.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/vectorization_4.q.out
      - copied unchanged from r1536474, hive/trunk/ql/src/test/results/clientpositive/vectorization_4.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/vectorization_5.q.out
      - copied unchanged from r1536474, hive/trunk/ql/src/test/results/clientpositive/vectorization_5.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/vectorization_6.q.out
      - copied unchanged from r1536474, hive/trunk/ql/src/test/results/clientpositive/vectorization_6.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/vectorization_7.q.out
      - copied unchanged from r1536474, hive/trunk/ql/src/test/results/clientpositive/vectorization_7.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/vectorization_8.q.out
      - copied unchanged from r1536474, hive/trunk/ql/src/test/results/clientpositive/vectorization_8.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/vectorization_9.q.out
      - copied unchanged from r1536474, hive/trunk/ql/src/test/results/clientpositive/vectorization_9.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/vectorization_not.q.out
      - copied unchanged from r1536474, hive/trunk/ql/src/test/results/clientpositive/vectorization_not.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/vectorized_shufflejoin.q.out
      - copied unchanged from r1536474, hive/trunk/ql/src/test/results/clientpositive/vectorized_shufflejoin.q.out
    hive/branches/maven/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/DecimalTypeInfo.java
      - copied unchanged from r1536474, hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/DecimalTypeInfo.java
    hive/branches/maven/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/HiveDecimalUtils.java
      - copied unchanged from r1536474, hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/HiveDecimalUtils.java
    hive/branches/maven/serde/src/test/org/apache/hadoop/hive/serde2/objectinspector/primitive/TestPrimitiveObjectInspectorFactory.java
      - copied unchanged from r1536474, hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/objectinspector/primitive/TestPrimitiveObjectInspectorFactory.java
Removed:
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterNotExpr.java
    hive/branches/maven/ql/src/test/org/apache/hadoop/hive/ql/optimizer/listbucketingpruner/DynamicMultiDimeCollectionTest.java
    hive/branches/maven/ql/src/test/org/apache/hadoop/hive/ql/optimizer/listbucketingpruner/ListBucketingPrunnerTest.java
    hive/branches/maven/ql/src/test/queries/clientnegative/script_broken_pipe1.q
    hive/branches/maven/ql/src/test/results/clientnegative/script_broken_pipe1.q.out
    hive/branches/maven/service/src/java/org/apache/hive/service/cli/operation/AddResourceOperation.java
    hive/branches/maven/service/src/java/org/apache/hive/service/cli/operation/DeleteResourceOperation.java
    hive/branches/maven/service/src/java/org/apache/hive/service/cli/operation/DfsOperation.java
    hive/branches/maven/service/src/java/org/apache/hive/service/cli/operation/SetOperation.java
Modified:
    hive/branches/maven/   (props changed)
    hive/branches/maven/ant/src/org/apache/hadoop/hive/ant/GenVectorTestCode.java
    hive/branches/maven/common/src/java/conf/hive-log4j.properties
    hive/branches/maven/common/src/java/org/apache/hadoop/hive/common/type/HiveDecimal.java
    hive/branches/maven/hcatalog/core/src/main/java/org/apache/hive/hcatalog/data/HCatRecord.java
    hive/branches/maven/hcatalog/core/src/main/java/org/apache/hive/hcatalog/data/schema/HCatSchema.java
    hive/branches/maven/hcatalog/core/src/main/java/org/apache/hive/hcatalog/data/transfer/HCatReader.java
    hive/branches/maven/hcatalog/core/src/main/java/org/apache/hive/hcatalog/data/transfer/HCatWriter.java
    hive/branches/maven/hcatalog/core/src/main/java/org/apache/hive/hcatalog/data/transfer/impl/HCatInputFormatReader.java
    hive/branches/maven/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/HCatInputFormat.java
    hive/branches/maven/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/HCatOutputFormat.java
    hive/branches/maven/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/InputJobInfo.java
    hive/branches/maven/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/HCatMapReduceTest.java
    hive/branches/maven/hcatalog/hcatalog-pig-adapter/src/main/java/org/apache/hive/hcatalog/pig/HCatLoader.java
    hive/branches/maven/hcatalog/hcatalog-pig-adapter/src/main/java/org/apache/hive/hcatalog/pig/HCatStorer.java
    hive/branches/maven/hcatalog/src/docs/src/documentation/content/xdocs/inputoutput.xml
    hive/branches/maven/hcatalog/src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/HBaseReadWrite.java
    hive/branches/maven/hcatalog/src/test/e2e/hcatalog/udfs/java/org/apache/hive/hcatalog/utils/GroupByAge.java
    hive/branches/maven/hcatalog/src/test/e2e/hcatalog/udfs/java/org/apache/hive/hcatalog/utils/ReadJson.java
    hive/branches/maven/hcatalog/src/test/e2e/hcatalog/udfs/java/org/apache/hive/hcatalog/utils/ReadRC.java
    hive/branches/maven/hcatalog/src/test/e2e/hcatalog/udfs/java/org/apache/hive/hcatalog/utils/ReadText.java
    hive/branches/maven/hcatalog/src/test/e2e/hcatalog/udfs/java/org/apache/hive/hcatalog/utils/ReadWrite.java
    hive/branches/maven/hcatalog/src/test/e2e/hcatalog/udfs/java/org/apache/hive/hcatalog/utils/SimpleRead.java
    hive/branches/maven/hcatalog/src/test/e2e/hcatalog/udfs/java/org/apache/hive/hcatalog/utils/StoreComplex.java
    hive/branches/maven/hcatalog/src/test/e2e/hcatalog/udfs/java/org/apache/hive/hcatalog/utils/StoreDemo.java
    hive/branches/maven/hcatalog/src/test/e2e/hcatalog/udfs/java/org/apache/hive/hcatalog/utils/StoreNumbers.java
    hive/branches/maven/hcatalog/src/test/e2e/hcatalog/udfs/java/org/apache/hive/hcatalog/utils/SumNumbers.java
    hive/branches/maven/hcatalog/src/test/e2e/hcatalog/udfs/java/org/apache/hive/hcatalog/utils/TypeDataCheck.java
    hive/branches/maven/hcatalog/src/test/e2e/hcatalog/udfs/java/org/apache/hive/hcatalog/utils/WriteJson.java
    hive/branches/maven/hcatalog/src/test/e2e/hcatalog/udfs/java/org/apache/hive/hcatalog/utils/WriteRC.java
    hive/branches/maven/hcatalog/src/test/e2e/hcatalog/udfs/java/org/apache/hive/hcatalog/utils/WriteText.java
    hive/branches/maven/hcatalog/src/test/e2e/hcatalog/udfs/java/org/apache/hive/hcatalog/utils/WriteTextPartitioned.java
    hive/branches/maven/hcatalog/src/test/e2e/templeton/README.txt
    hive/branches/maven/hcatalog/src/test/e2e/templeton/drivers/TestDriverCurl.pm
    hive/branches/maven/hcatalog/src/test/e2e/templeton/tests/jobsubmission.conf
    hive/branches/maven/hcatalog/src/test/e2e/templeton/tests/jobsubmission_streaming.conf
    hive/branches/maven/hcatalog/storage-handlers/hbase/src/test/org/apache/hive/hcatalog/hbase/TestHBaseInputFormat.java
    hive/branches/maven/hcatalog/webhcat/svr/src/main/bin/webhcat_config.sh
    hive/branches/maven/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/AppConfig.java
    hive/branches/maven/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/CompleteDelegator.java
    hive/branches/maven/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/Main.java
    hive/branches/maven/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/PigDelegator.java
    hive/branches/maven/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/HDFSStorage.java
    hive/branches/maven/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/HiveJobIDParser.java
    hive/branches/maven/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/JarJobIDParser.java
    hive/branches/maven/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/PigJobIDParser.java
    hive/branches/maven/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/TempletonControllerJob.java
    hive/branches/maven/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/TempletonUtils.java
    hive/branches/maven/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/tool/TrivialExecService.java
    hive/branches/maven/hcatalog/webhcat/svr/src/test/java/org/apache/hive/hcatalog/templeton/tool/TestTrivialExecService.java
    hive/branches/maven/ivy/libraries.properties
    hive/branches/maven/jdbc/src/java/org/apache/hadoop/hive/jdbc/HiveResultSetMetaData.java
    hive/branches/maven/jdbc/src/java/org/apache/hadoop/hive/jdbc/Utils.java
    hive/branches/maven/jdbc/src/java/org/apache/hive/jdbc/HiveBaseResultSet.java
    hive/branches/maven/jdbc/src/java/org/apache/hive/jdbc/HiveCallableStatement.java
    hive/branches/maven/jdbc/src/java/org/apache/hive/jdbc/HiveConnection.java
    hive/branches/maven/jdbc/src/java/org/apache/hive/jdbc/HiveDatabaseMetaData.java
    hive/branches/maven/jdbc/src/java/org/apache/hive/jdbc/HivePreparedStatement.java
    hive/branches/maven/jdbc/src/java/org/apache/hive/jdbc/HiveQueryResultSet.java
    hive/branches/maven/jdbc/src/java/org/apache/hive/jdbc/HiveStatement.java
    hive/branches/maven/jdbc/src/test/org/apache/hadoop/hive/jdbc/TestJdbcDriver.java
    hive/branches/maven/jdbc/src/test/org/apache/hive/jdbc/TestJdbcDriver2.java
    hive/branches/maven/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
    hive/branches/maven/metastore/src/java/org/apache/hadoop/hive/metastore/Warehouse.java
    hive/branches/maven/metastore/src/test/org/apache/hadoop/hive/metastore/TestMetastoreVersion.java
    hive/branches/maven/ql/src/gen/vectorization/ExpressionTemplates/ColumnArithmeticColumn.txt
    hive/branches/maven/ql/src/gen/vectorization/ExpressionTemplates/ColumnArithmeticScalar.txt
    hive/branches/maven/ql/src/gen/vectorization/ExpressionTemplates/ColumnCompareColumn.txt
    hive/branches/maven/ql/src/gen/vectorization/ExpressionTemplates/ColumnCompareScalar.txt
    hive/branches/maven/ql/src/gen/vectorization/ExpressionTemplates/ColumnUnaryFunc.txt
    hive/branches/maven/ql/src/gen/vectorization/ExpressionTemplates/ColumnUnaryMinus.txt
    hive/branches/maven/ql/src/gen/vectorization/ExpressionTemplates/FilterColumnCompareColumn.txt
    hive/branches/maven/ql/src/gen/vectorization/ExpressionTemplates/FilterColumnCompareScalar.txt
    hive/branches/maven/ql/src/gen/vectorization/ExpressionTemplates/FilterScalarCompareColumn.txt
    hive/branches/maven/ql/src/gen/vectorization/ExpressionTemplates/FilterStringColumnCompareColumn.txt
    hive/branches/maven/ql/src/gen/vectorization/ExpressionTemplates/FilterStringColumnCompareScalar.txt
    hive/branches/maven/ql/src/gen/vectorization/ExpressionTemplates/FilterStringScalarCompareColumn.txt
    hive/branches/maven/ql/src/gen/vectorization/ExpressionTemplates/ScalarArithmeticColumn.txt
    hive/branches/maven/ql/src/gen/vectorization/ExpressionTemplates/ScalarCompareColumn.txt
    hive/branches/maven/ql/src/gen/vectorization/ExpressionTemplates/StringColumnCompareColumn.txt
    hive/branches/maven/ql/src/gen/vectorization/ExpressionTemplates/StringColumnCompareScalar.txt
    hive/branches/maven/ql/src/gen/vectorization/ExpressionTemplates/StringScalarCompareColumn.txt
    hive/branches/maven/ql/src/gen/vectorization/TestTemplates/TestColumnScalarFilterVectorExpressionEvaluation.txt
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/Driver.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/ErrorMsg.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/FunctionRegistry.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/NumericOpMethodResolver.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/OperatorFactory.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/PartitionKeySampler.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecDriver.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorFilterOperator.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorGroupByOperator.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorMapJoinOperator.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorReduceSinkOperator.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorSelectOperator.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorizationContext.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/AbstractFilterStringColLikeStringScalar.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ColAndCol.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ColOrCol.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ConstantVectorExpression.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterExprAndExpr.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterExprOrExpr.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterStringColLikeStringScalar.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterStringColRegExpStringScalar.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncLogWithBaseDoubleToDouble.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncLogWithBaseLongToDouble.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncLongToString.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncPowerDoubleToDouble.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncPowerLongToDouble.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FuncRand.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IdentityExpression.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IsNotNull.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/IsNull.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColDivideLongColumn.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongColDivideLongScalar.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongScalarDivideLongColumn.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/LongToStringUnaryUDF.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/NotCol.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/PosModDoubleToDouble.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/PosModLongToLong.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/RoundWithNumDigitsDoubleToDouble.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectColumnIsFalse.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectColumnIsNotNull.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectColumnIsNull.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/SelectColumnIsTrue.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringConcatColCol.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringConcatColScalar.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringConcatScalarCol.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringLength.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringSubstrColStart.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringSubstrColStartLen.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringUnaryUDF.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringUnaryUDFDirect.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorExpression.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorUDFTimestampFieldLong.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/udf/VectorUDFAdaptor.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcStruct.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/io/orc/WriterImpl.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/Vectorizer.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/parse/DDLSemanticAnalyzer.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveParser.g
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/parse/IdentifiersParser.g
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/parse/ParseUtils.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/parse/QBJoinTree.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/parse/TypeCheckProcFactory.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/plan/ExprNodeConstantDesc.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/session/SessionState.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFAcos.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFAsin.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFAtan.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFBin.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFCeil.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFCos.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFDayOfMonth.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFDegrees.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFExp.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFFloor.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFHex.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFHour.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFLTrim.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFLength.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFLike.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFLn.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFLog.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFLog10.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFLog2.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFMinute.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFOPDivide.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFOPMinus.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFOPMod.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFOPMultiply.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFOPNegative.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFOPPlus.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFPosMod.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFPower.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFRTrim.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFRadians.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFRand.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFRegExp.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFRound.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFSecond.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFSign.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFSin.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFSqrt.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFSubstr.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFTan.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFToBoolean.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFToByte.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFToDouble.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFToFloat.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFToInteger.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFToLong.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFToShort.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFToString.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFTrim.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFWeekOfYear.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFYear.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFAbs.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFBridge.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFConcat.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFLower.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPAnd.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPEqual.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPEqualOrGreaterThan.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPEqualOrLessThan.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPGreaterThan.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPLessThan.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPNot.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPNotEqual.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPNotNull.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPNull.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPOr.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFSplit.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFTimestamp.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFToDecimal.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFToUnixTimeStamp.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFToVarchar.java
    hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFUpper.java
    hive/branches/maven/ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java
    hive/branches/maven/ql/src/test/org/apache/hadoop/hive/ql/exec/TestFunctionRegistry.java
    hive/branches/maven/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/TestVectorFilterOperator.java
    hive/branches/maven/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/TestVectorizationContext.java
    hive/branches/maven/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorFilterExpressions.java
    hive/branches/maven/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorLogicalExpressions.java
    hive/branches/maven/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorMathFunctions.java
    hive/branches/maven/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorStringExpressions.java
    hive/branches/maven/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestOrcFile.java
    hive/branches/maven/ql/src/test/queries/clientpositive/decimal_1.q
    hive/branches/maven/ql/src/test/queries/clientpositive/decimal_2.q
    hive/branches/maven/ql/src/test/queries/clientpositive/decimal_3.q
    hive/branches/maven/ql/src/test/queries/clientpositive/decimal_4.q
    hive/branches/maven/ql/src/test/queries/clientpositive/decimal_join.q
    hive/branches/maven/ql/src/test/queries/clientpositive/decimal_precision.q
    hive/branches/maven/ql/src/test/queries/clientpositive/decimal_udf.q
    hive/branches/maven/ql/src/test/queries/clientpositive/groupby2_map_multi_distinct.q
    hive/branches/maven/ql/src/test/queries/clientpositive/import_exported_table.q
    hive/branches/maven/ql/src/test/queries/clientpositive/orc_predicate_pushdown.q
    hive/branches/maven/ql/src/test/queries/clientpositive/ptf_decimal.q
    hive/branches/maven/ql/src/test/queries/clientpositive/serde_regex.q
    hive/branches/maven/ql/src/test/queries/clientpositive/udf_concat.q
    hive/branches/maven/ql/src/test/queries/clientpositive/udf_pmod.q
    hive/branches/maven/ql/src/test/queries/clientpositive/udf_to_double.q
    hive/branches/maven/ql/src/test/queries/clientpositive/udf_to_float.q
    hive/branches/maven/ql/src/test/queries/clientpositive/udf_to_string.q
    hive/branches/maven/ql/src/test/queries/clientpositive/windowing_expressions.q
    hive/branches/maven/ql/src/test/queries/clientpositive/windowing_multipartitioning.q
    hive/branches/maven/ql/src/test/queries/clientpositive/windowing_navfn.q
    hive/branches/maven/ql/src/test/queries/clientpositive/windowing_ntile.q
    hive/branches/maven/ql/src/test/queries/clientpositive/windowing_rank.q
    hive/branches/maven/ql/src/test/results/clientnegative/invalid_cast_from_binary_1.q.out
    hive/branches/maven/ql/src/test/results/clientnegative/invalid_cast_from_binary_2.q.out
    hive/branches/maven/ql/src/test/results/clientnegative/invalid_cast_from_binary_3.q.out
    hive/branches/maven/ql/src/test/results/clientnegative/invalid_cast_from_binary_4.q.out
    hive/branches/maven/ql/src/test/results/clientnegative/invalid_cast_from_binary_5.q.out
    hive/branches/maven/ql/src/test/results/clientnegative/invalid_cast_from_binary_6.q.out
    hive/branches/maven/ql/src/test/results/clientnegative/wrong_column_type.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/auto_join18_multi_distinct.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/count.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/decimal_1.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/decimal_2.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/decimal_3.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/decimal_4.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/decimal_join.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/decimal_precision.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/decimal_serde.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/decimal_udf.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/groupby2_map_multi_distinct.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/groupby2_noskew_multi_distinct.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/groupby3_map_multi_distinct.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/groupby3_noskew_multi_distinct.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/groupby_distinct_samekey.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/groupby_map_ppr_multi_distinct.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/groupby_multi_single_reducer.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/groupby_ppr_multi_distinct.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/groupby_sort_11.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/join18_multi_distinct.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/limit_pushdown.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/literal_decimal.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/orc_predicate_pushdown.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/ptf_decimal.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/serde_regex.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/udf7.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/udf_concat.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/udf_pmod.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/udf_split.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/udf_to_double.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/udf_to_float.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/udf_to_string.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/windowing_expressions.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/windowing_multipartitioning.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/windowing_navfn.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/windowing_ntile.q.out
    hive/branches/maven/ql/src/test/results/clientpositive/windowing_rank.q.out
    hive/branches/maven/serde/src/java/org/apache/hadoop/hive/serde2/RegexSerDe.java
    hive/branches/maven/serde/src/java/org/apache/hadoop/hive/serde2/io/HiveDecimalWritable.java
    hive/branches/maven/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyHiveDecimal.java
    hive/branches/maven/serde/src/java/org/apache/hadoop/hive/serde2/lazy/objectinspector/primitive/LazyHiveDecimalObjectInspector.java
    hive/branches/maven/serde/src/java/org/apache/hadoop/hive/serde2/lazy/objectinspector/primitive/LazyPrimitiveObjectInspectorFactory.java
    hive/branches/maven/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryHiveDecimal.java
    hive/branches/maven/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinarySerDe.java
    hive/branches/maven/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/JavaHiveDecimalObjectInspector.java
    hive/branches/maven/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/PrimitiveObjectInspectorFactory.java
    hive/branches/maven/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/PrimitiveObjectInspectorUtils.java
    hive/branches/maven/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/WritableConstantHiveDecimalObjectInspector.java
    hive/branches/maven/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/WritableHiveDecimalObjectInspector.java
    hive/branches/maven/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/TypeInfo.java
    hive/branches/maven/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/TypeInfoFactory.java
    hive/branches/maven/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/TypeInfoUtils.java
    hive/branches/maven/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/VarcharTypeInfo.java
    hive/branches/maven/service/src/java/org/apache/hive/service/cli/operation/ExecuteStatementOperation.java
    hive/branches/maven/service/src/java/org/apache/hive/service/cli/operation/SQLOperation.java
    hive/branches/maven/service/src/java/org/apache/hive/service/cli/thrift/ThriftCLIService.java
    hive/branches/maven/service/src/test/org/apache/hive/service/cli/CLIServiceTest.java
    hive/branches/maven/shims/src/0.20S/java/org/apache/hadoop/mapred/WebHCatJTShim20S.java
    hive/branches/maven/shims/src/0.23/java/org/apache/hadoop/mapred/WebHCatJTShim23.java
    hive/branches/maven/shims/src/common/java/org/apache/hadoop/hive/shims/HadoopShims.java

Propchange: hive/branches/maven/
------------------------------------------------------------------------------
  Merged /hive/trunk:r1534709-1536474

Modified: hive/branches/maven/ant/src/org/apache/hadoop/hive/ant/GenVectorTestCode.java
URL: http://svn.apache.org/viewvc/hive/branches/maven/ant/src/org/apache/hadoop/hive/ant/GenVectorTestCode.java?rev=1536480&r1=1536479&r2=1536480&view=diff
==============================================================================
--- hive/branches/maven/ant/src/org/apache/hadoop/hive/ant/GenVectorTestCode.java (original)
+++ hive/branches/maven/ant/src/org/apache/hadoop/hive/ant/GenVectorTestCode.java Mon Oct 28 18:44:01 2013
@@ -134,9 +134,11 @@ public class GenVectorTestCode {
       if(op1IsCol){
         testCase = testCase.replaceAll("<Operand1>","inputColumnVector.vector[i]");
         testCase = testCase.replaceAll("<Operand2>","scalarValue");
+        testCase = testCase.replaceAll("<ConstructorParams>","0, scalarValue");
       }else{
         testCase = testCase.replaceAll("<Operand1>","scalarValue");
         testCase = testCase.replaceAll("<Operand2>","inputColumnVector.vector[i]");
+        testCase = testCase.replaceAll("<ConstructorParams>","scalarValue, 0");
       }
 
       testsuites.get(template).append(testCase);

Modified: hive/branches/maven/common/src/java/conf/hive-log4j.properties
URL: http://svn.apache.org/viewvc/hive/branches/maven/common/src/java/conf/hive-log4j.properties?rev=1536480&r1=1536479&r2=1536480&view=diff
==============================================================================
--- hive/branches/maven/common/src/java/conf/hive-log4j.properties (original)
+++ hive/branches/maven/common/src/java/conf/hive-log4j.properties Mon Oct 28 18:44:01 2013
@@ -16,7 +16,7 @@
 
 # Define some default values that can be overridden by system properties
 hive.log.threshold=ALL
-hive.root.logger=WARN,DRFA
+hive.root.logger=INFO,DRFA
 hive.log.dir=${java.io.tmpdir}/${user.name}
 hive.log.file=hive.log
 

Modified: hive/branches/maven/common/src/java/org/apache/hadoop/hive/common/type/HiveDecimal.java
URL: http://svn.apache.org/viewvc/hive/branches/maven/common/src/java/org/apache/hadoop/hive/common/type/HiveDecimal.java?rev=1536480&r1=1536479&r2=1536480&view=diff
==============================================================================
--- hive/branches/maven/common/src/java/org/apache/hadoop/hive/common/type/HiveDecimal.java (original)
+++ hive/branches/maven/common/src/java/org/apache/hadoop/hive/common/type/HiveDecimal.java Mon Oct 28 18:44:01 2013
@@ -28,17 +28,16 @@ import java.math.RoundingMode;
  *
  */
 public class HiveDecimal implements Comparable<HiveDecimal> {
+  public static final int MAX_PRECISION = 65;
+  public static final int MAX_SCALE = 30;
+  public static final int DEFAULT_PRECISION = 10;
+  public static final int DEFAULT_SCALE = 0;
 
   public static final HiveDecimal ZERO = new HiveDecimal(BigDecimal.ZERO);
-
-  public static final int MAX_PRECISION = 38; // fits into 128 bits
-
   public static final HiveDecimal ONE = new HiveDecimal(BigDecimal.ONE);
 
   public static final int ROUND_FLOOR = BigDecimal.ROUND_FLOOR;
-
   public static final int ROUND_CEILING = BigDecimal.ROUND_CEILING;
-
   public static final int ROUND_HALF_UP = BigDecimal.ROUND_HALF_UP;
 
   private BigDecimal bd = BigDecimal.ZERO;
@@ -48,16 +47,16 @@ public class HiveDecimal implements Comp
   }
 
   public static HiveDecimal create(BigDecimal b) {
-    return create(b, false);
+    return create(b, true);
   }
 
   public static HiveDecimal create(BigDecimal b, boolean allowRounding) {
-    BigDecimal bd = normalize(b, HiveDecimal.MAX_PRECISION, allowRounding);
+    BigDecimal bd = normalize(b, allowRounding);
     return bd == null ? null : new HiveDecimal(bd);
   }
 
   public static HiveDecimal create(BigInteger unscaled, int scale) {
-    BigDecimal bd = normalize(new BigDecimal(unscaled, scale), HiveDecimal.MAX_PRECISION, false);
+    BigDecimal bd = normalize(new BigDecimal(unscaled, scale), true);
     return bd == null ? null : new HiveDecimal(bd);
   }
 
@@ -69,12 +68,12 @@ public class HiveDecimal implements Comp
       return null;
     }
 
-    bd = normalize(bd, HiveDecimal.MAX_PRECISION, false);
+    bd = normalize(bd, true);
     return bd == null ? null : new HiveDecimal(bd);
   }
 
   public static HiveDecimal create(BigInteger bi) {
-    BigDecimal bd = normalize(new BigDecimal(bi), HiveDecimal.MAX_PRECISION, false);
+    BigDecimal bd = normalize(new BigDecimal(bi), true);
     return bd == null ? null : new HiveDecimal(bd);
   }
 
@@ -92,7 +91,7 @@ public class HiveDecimal implements Comp
   }
 
   public HiveDecimal setScale(int i) {
-    return new HiveDecimal(bd.setScale(i));
+    return new HiveDecimal(bd.setScale(i, RoundingMode.HALF_UP));
   }
 
   @Override
@@ -158,7 +157,7 @@ public class HiveDecimal implements Comp
   }
 
   public HiveDecimal multiply(HiveDecimal dec) {
-    return create(bd.multiply(dec.bd));
+    return create(bd.multiply(dec.bd), false);
   }
 
   public BigInteger unscaledValue() {
@@ -182,7 +181,8 @@ public class HiveDecimal implements Comp
   }
 
   public HiveDecimal pow(int n) {
-    return create(bd.pow(n));
+    BigDecimal result = normalize(bd.pow(n), false);
+    return result == null ? null : new HiveDecimal(result);
   }
 
   public HiveDecimal remainder(HiveDecimal dec) {
@@ -190,7 +190,7 @@ public class HiveDecimal implements Comp
   }
 
   public HiveDecimal divide(HiveDecimal dec) {
-    return create(bd.divide(dec.bd, MAX_PRECISION, RoundingMode.HALF_UP), true);
+    return create(bd.divide(dec.bd, MAX_SCALE, RoundingMode.HALF_UP), true);
   }
 
   private static BigDecimal trim(BigDecimal d) {
@@ -207,31 +207,45 @@ public class HiveDecimal implements Comp
     return d;
   }
 
-  private static BigDecimal normalize(BigDecimal d, int precision, boolean allowRounding) {
-    if (d == null) {
+  private static BigDecimal normalize(BigDecimal bd, boolean allowRounding) {
+    if (bd == null) {
       return null;
     }
 
-    d = trim(d);
+    bd = trim(bd);
 
-    // compute the number of digits of the decimal
-    int valuePrecision = d.precision()
-        + Math.max(0, 1 + d.scale() - d.precision());
-
-    if (valuePrecision > precision) {
-      if (allowRounding) {
-        // round "half up" until we hit the decimal point
-        int adjustedScale = d.scale() - (valuePrecision-precision);
-        if (adjustedScale >= 0) {
-          d = d.setScale(adjustedScale, RoundingMode.HALF_UP);
-          d = trim(d);
-        } else {
-          d = null;
-        }
-      } else {
-        d = null;
-      }
+    int intDigits = bd.precision() - bd.scale();
+
+    if (intDigits > MAX_PRECISION) {
+      return null;
     }
-    return d;
+
+    int maxScale = Math.min(MAX_SCALE, Math.min(MAX_PRECISION - intDigits, bd.scale()));
+    if (bd.scale() > maxScale ) {
+      bd = allowRounding ? bd.setScale(maxScale, RoundingMode.HALF_UP) : null;
+    }
+
+    return bd;
   }
+
+  public static BigDecimal enforcePrecisionScale(BigDecimal bd, int maxPrecision, int maxScale) {
+    if (bd == null) {
+      return null;
+    }
+
+    bd = trim(bd);
+
+    int maxIntDigits = maxPrecision - maxScale;
+    int intDigits = bd.precision() - bd.scale();
+    if (intDigits > maxIntDigits) {
+      return null;
+    }
+
+    if (bd.scale() > maxScale) {
+      bd = bd.setScale(maxScale, RoundingMode.HALF_UP);
+    }
+
+    return bd;
+  }
+
 }

Modified: hive/branches/maven/hcatalog/core/src/main/java/org/apache/hive/hcatalog/data/HCatRecord.java
URL: http://svn.apache.org/viewvc/hive/branches/maven/hcatalog/core/src/main/java/org/apache/hive/hcatalog/data/HCatRecord.java?rev=1536480&r1=1536479&r2=1536480&view=diff
==============================================================================
--- hive/branches/maven/hcatalog/core/src/main/java/org/apache/hive/hcatalog/data/HCatRecord.java (original)
+++ hive/branches/maven/hcatalog/core/src/main/java/org/apache/hive/hcatalog/data/HCatRecord.java Mon Oct 28 18:44:01 2013
@@ -22,6 +22,8 @@ package org.apache.hive.hcatalog.data;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.hadoop.hive.common.classification.InterfaceAudience;
+import org.apache.hadoop.hive.common.classification.InterfaceStability;
 import org.apache.hive.hcatalog.common.HCatException;
 import org.apache.hive.hcatalog.data.schema.HCatSchema;
 
@@ -31,6 +33,8 @@ import org.apache.hive.hcatalog.data.sch
  *   HCatRecord is designed only to be used as in-memory representation only.
  *   Don't use it to store data on the physical device.
  */
+@InterfaceAudience.Public
+@InterfaceStability.Evolving
 public abstract class HCatRecord implements HCatRecordable {
 
   public abstract Object get(String fieldName, HCatSchema recordSchema) throws HCatException;

Modified: hive/branches/maven/hcatalog/core/src/main/java/org/apache/hive/hcatalog/data/schema/HCatSchema.java
URL: http://svn.apache.org/viewvc/hive/branches/maven/hcatalog/core/src/main/java/org/apache/hive/hcatalog/data/schema/HCatSchema.java?rev=1536480&r1=1536479&r2=1536480&view=diff
==============================================================================
--- hive/branches/maven/hcatalog/core/src/main/java/org/apache/hive/hcatalog/data/schema/HCatSchema.java (original)
+++ hive/branches/maven/hcatalog/core/src/main/java/org/apache/hive/hcatalog/data/schema/HCatSchema.java Mon Oct 28 18:44:01 2013
@@ -25,12 +25,15 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.hadoop.hive.common.classification.InterfaceAudience;
+import org.apache.hadoop.hive.common.classification.InterfaceStability;
 import org.apache.hive.hcatalog.common.HCatException;
 
 /**
  * HCatSchema. This class is NOT thread-safe.
  */
-
+@InterfaceAudience.Public
+@InterfaceStability.Evolving
 public class HCatSchema implements Serializable {
 
   private static final long serialVersionUID = 1L;

Modified: hive/branches/maven/hcatalog/core/src/main/java/org/apache/hive/hcatalog/data/transfer/HCatReader.java
URL: http://svn.apache.org/viewvc/hive/branches/maven/hcatalog/core/src/main/java/org/apache/hive/hcatalog/data/transfer/HCatReader.java?rev=1536480&r1=1536479&r2=1536480&view=diff
==============================================================================
--- hive/branches/maven/hcatalog/core/src/main/java/org/apache/hive/hcatalog/data/transfer/HCatReader.java (original)
+++ hive/branches/maven/hcatalog/core/src/main/java/org/apache/hive/hcatalog/data/transfer/HCatReader.java Mon Oct 28 18:44:01 2013
@@ -24,6 +24,8 @@ import java.util.Map;
 import java.util.Map.Entry;
 
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hive.common.classification.InterfaceAudience;
+import org.apache.hadoop.hive.common.classification.InterfaceStability;
 import org.apache.hive.hcatalog.common.HCatException;
 import org.apache.hive.hcatalog.data.HCatRecord;
 import org.apache.hive.hcatalog.data.transfer.state.StateProvider;
@@ -32,7 +34,8 @@ import org.apache.hive.hcatalog.data.tra
  * This abstract class is internal to HCatalog and abstracts away the notion of
  * underlying system from which reads will be done.
  */
-
+@InterfaceAudience.Public
+@InterfaceStability.Evolving
 public abstract class HCatReader {
 
   /**

Modified: hive/branches/maven/hcatalog/core/src/main/java/org/apache/hive/hcatalog/data/transfer/HCatWriter.java
URL: http://svn.apache.org/viewvc/hive/branches/maven/hcatalog/core/src/main/java/org/apache/hive/hcatalog/data/transfer/HCatWriter.java?rev=1536480&r1=1536479&r2=1536480&view=diff
==============================================================================
--- hive/branches/maven/hcatalog/core/src/main/java/org/apache/hive/hcatalog/data/transfer/HCatWriter.java (original)
+++ hive/branches/maven/hcatalog/core/src/main/java/org/apache/hive/hcatalog/data/transfer/HCatWriter.java Mon Oct 28 18:44:01 2013
@@ -24,6 +24,8 @@ import java.util.Map;
 import java.util.Map.Entry;
 
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hive.common.classification.InterfaceAudience;
+import org.apache.hadoop.hive.common.classification.InterfaceStability;
 import org.apache.hive.hcatalog.common.HCatException;
 import org.apache.hive.hcatalog.data.HCatRecord;
 import org.apache.hive.hcatalog.data.transfer.state.StateProvider;
@@ -33,7 +35,8 @@ import org.apache.hive.hcatalog.data.tra
  * HCatalog from external systems. Don't try to instantiate this directly.
  * Instead, use {@link DataTransferFactory}
  */
-
+@InterfaceAudience.Public
+@InterfaceStability.Evolving
 public abstract class HCatWriter {
 
   protected Configuration conf;

Modified: hive/branches/maven/hcatalog/core/src/main/java/org/apache/hive/hcatalog/data/transfer/impl/HCatInputFormatReader.java
URL: http://svn.apache.org/viewvc/hive/branches/maven/hcatalog/core/src/main/java/org/apache/hive/hcatalog/data/transfer/impl/HCatInputFormatReader.java?rev=1536480&r1=1536479&r2=1536480&view=diff
==============================================================================
--- hive/branches/maven/hcatalog/core/src/main/java/org/apache/hive/hcatalog/data/transfer/impl/HCatInputFormatReader.java (original)
+++ hive/branches/maven/hcatalog/core/src/main/java/org/apache/hive/hcatalog/data/transfer/impl/HCatInputFormatReader.java Mon Oct 28 18:44:01 2013
@@ -63,7 +63,7 @@ public class HCatInputFormatReader exten
     try {
       Job job = new Job(conf);
       HCatInputFormat hcif = HCatInputFormat.setInput(
-        job, re.getDbName(), re.getTableName()).setFilter(re.getFilterString());
+        job, re.getDbName(), re.getTableName(), re.getFilterString());
       ReaderContext cntxt = new ReaderContext();
       cntxt.setInputSplits(hcif.getSplits(
           ShimLoader.getHadoopShims().getHCatShim().createJobContext(job.getConfiguration(), null)));

Modified: hive/branches/maven/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/HCatInputFormat.java
URL: http://svn.apache.org/viewvc/hive/branches/maven/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/HCatInputFormat.java?rev=1536480&r1=1536479&r2=1536480&view=diff
==============================================================================
--- hive/branches/maven/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/HCatInputFormat.java (original)
+++ hive/branches/maven/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/HCatInputFormat.java Mon Oct 28 18:44:01 2013
@@ -39,28 +39,33 @@ public class HCatInputFormat extends HCa
   private InputJobInfo inputJobInfo;
 
   /**
-   * @deprecated as of release 0.5, and will be removed in a future release
+   * Initializes the input with a null filter.
+   * See {@link #setInput(org.apache.hadoop.conf.Configuration, String, String, String)}
    */
-  @Deprecated
-  public static void setInput(Job job, InputJobInfo inputJobInfo) throws IOException {
-    setInput(job.getConfiguration(), inputJobInfo);
+  public static HCatInputFormat setInput(
+          Job job, String dbName, String tableName)
+    throws IOException {
+    return setInput(job.getConfiguration(), dbName, tableName, null);
   }
 
   /**
-   * @deprecated as of release 0.5, and will be removed in a future release
+   * Initializes the input with a provided filter.
+   * See {@link #setInput(org.apache.hadoop.conf.Configuration, String, String, String)}
    */
-  @Deprecated
-  public static void setInput(Configuration conf, InputJobInfo inputJobInfo) throws IOException {
-    setInput(conf, inputJobInfo.getDatabaseName(), inputJobInfo.getTableName())
-      .setFilter(inputJobInfo.getFilter())
-      .setProperties(inputJobInfo.getProperties());
+  public static HCatInputFormat setInput(
+          Job job, String dbName, String tableName, String filter)
+    throws IOException {
+    return setInput(job.getConfiguration(), dbName, tableName, filter);
   }
 
   /**
-   * See {@link #setInput(org.apache.hadoop.conf.Configuration, String, String)}
+   * Initializes the input with a null filter.
+   * See {@link #setInput(org.apache.hadoop.conf.Configuration, String, String, String)}
    */
-  public static HCatInputFormat setInput(Job job, String dbName, String tableName) throws IOException {
-    return setInput(job.getConfiguration(), dbName, tableName);
+  public static HCatInputFormat setInput(
+          Configuration conf, String dbName, String tableName)
+    throws IOException {
+    return setInput(conf, dbName, tableName, null);
   }
 
   /**
@@ -69,9 +74,11 @@ public class HCatInputFormat extends HCa
    * @param conf the job configuration
    * @param dbName database name, which if null 'default' is used
    * @param tableName table name
+   * @param filter the partition filter to use, can be null for no filter
    * @throws IOException on all errors
    */
-  public static HCatInputFormat setInput(Configuration conf, String dbName, String tableName)
+  public static HCatInputFormat setInput(
+          Configuration conf, String dbName, String tableName, String filter)
     throws IOException {
 
     Preconditions.checkNotNull(conf, "required argument 'conf' is null");
@@ -79,7 +86,7 @@ public class HCatInputFormat extends HCa
 
     HCatInputFormat hCatInputFormat = new HCatInputFormat();
     hCatInputFormat.conf = conf;
-    hCatInputFormat.inputJobInfo = InputJobInfo.create(dbName, tableName, null, null);
+    hCatInputFormat.inputJobInfo = InputJobInfo.create(dbName, tableName, filter, null);
 
     try {
       InitializeInput.setInput(conf, hCatInputFormat.inputJobInfo);
@@ -91,11 +98,11 @@ public class HCatInputFormat extends HCa
   }
 
   /**
-   * Set a filter on the input table.
-   * @param filter the filter specification, which may be null
-   * @return this
-   * @throws IOException on all errors
+   * @deprecated As of 0.13
+   * Use {@link #setInput(org.apache.hadoop.conf.Configuration, String, String, String)} instead,
+   * to specify a partition filter to directly initialize the input with.
    */
+  @Deprecated
   public HCatInputFormat setFilter(String filter) throws IOException {
     // null filters are supported to simplify client code
     if (filter != null) {

Modified: hive/branches/maven/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/HCatOutputFormat.java
URL: http://svn.apache.org/viewvc/hive/branches/maven/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/HCatOutputFormat.java?rev=1536480&r1=1536479&r2=1536480&view=diff
==============================================================================
--- hive/branches/maven/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/HCatOutputFormat.java (original)
+++ hive/branches/maven/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/HCatOutputFormat.java Mon Oct 28 18:44:01 2013
@@ -28,6 +28,8 @@ import java.util.Map;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.permission.FsPermission;
+import org.apache.hadoop.hive.common.classification.InterfaceAudience;
+import org.apache.hadoop.hive.common.classification.InterfaceStability;
 import org.apache.hadoop.hive.conf.HiveConf;
 import org.apache.hadoop.hive.ql.metadata.HiveStorageHandler;
 import org.apache.hadoop.hive.metastore.HiveMetaStoreClient;
@@ -52,6 +54,8 @@ import org.slf4j.LoggerFactory;
 
 /** The OutputFormat to use to write data to HCatalog. The key value is ignored and
  *  should be given as null. The value is the HCatRecord to write.*/
+@InterfaceAudience.Public
+@InterfaceStability.Evolving
 public class HCatOutputFormat extends HCatBaseOutputFormat {
 
   static final private Logger LOG = LoggerFactory.getLogger(HCatOutputFormat.class);

Modified: hive/branches/maven/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/InputJobInfo.java
URL: http://svn.apache.org/viewvc/hive/branches/maven/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/InputJobInfo.java?rev=1536480&r1=1536479&r2=1536480&view=diff
==============================================================================
--- hive/branches/maven/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/InputJobInfo.java (original)
+++ hive/branches/maven/hcatalog/core/src/main/java/org/apache/hive/hcatalog/mapreduce/InputJobInfo.java Mon Oct 28 18:44:01 2013
@@ -36,7 +36,7 @@ import java.util.zip.InflaterInputStream
  * Container for metadata read from the metadata server.
  * Prior to release 0.5, InputJobInfo was a key part of the public API, exposed directly
  * to end-users as an argument to
- * {@link HCatInputFormat#setInput(org.apache.hadoop.mapreduce.Job, InputJobInfo)}.
+ * HCatInputFormat#setInput(org.apache.hadoop.mapreduce.Job, InputJobInfo).
  * Going forward, we plan on treating InputJobInfo as an implementation detail and no longer
  * expose to end-users. Should you have a need to use InputJobInfo outside HCatalog itself,
  * please contact the developer mailing list before depending on this class.

Modified: hive/branches/maven/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/HCatMapReduceTest.java
URL: http://svn.apache.org/viewvc/hive/branches/maven/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/HCatMapReduceTest.java?rev=1536480&r1=1536479&r2=1536480&view=diff
==============================================================================
--- hive/branches/maven/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/HCatMapReduceTest.java (original)
+++ hive/branches/maven/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/HCatMapReduceTest.java Mon Oct 28 18:44:01 2013
@@ -341,7 +341,7 @@ public abstract class HCatMapReduceTest 
     job.setInputFormatClass(HCatInputFormat.class);
     job.setOutputFormatClass(TextOutputFormat.class);
 
-    HCatInputFormat.setInput(job, dbName, tableName).setFilter(filter);
+    HCatInputFormat.setInput(job, dbName, tableName, filter);
 
     job.setMapOutputKeyClass(BytesWritable.class);
     job.setMapOutputValueClass(Text.class);

Modified: hive/branches/maven/hcatalog/hcatalog-pig-adapter/src/main/java/org/apache/hive/hcatalog/pig/HCatLoader.java
URL: http://svn.apache.org/viewvc/hive/branches/maven/hcatalog/hcatalog-pig-adapter/src/main/java/org/apache/hive/hcatalog/pig/HCatLoader.java?rev=1536480&r1=1536479&r2=1536480&view=diff
==============================================================================
--- hive/branches/maven/hcatalog/hcatalog-pig-adapter/src/main/java/org/apache/hive/hcatalog/pig/HCatLoader.java (original)
+++ hive/branches/maven/hcatalog/hcatalog-pig-adapter/src/main/java/org/apache/hive/hcatalog/pig/HCatLoader.java Mon Oct 28 18:44:01 2013
@@ -27,6 +27,8 @@ import java.util.Map.Entry;
 import java.util.Properties;
 
 import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hive.common.classification.InterfaceAudience;
+import org.apache.hadoop.hive.common.classification.InterfaceStability;
 import org.apache.hadoop.hive.metastore.api.FieldSchema;
 import org.apache.hadoop.hive.ql.metadata.Table;
 import org.apache.hadoop.mapreduce.InputFormat;
@@ -49,7 +51,8 @@ import org.apache.pig.impl.util.UDFConte
 /**
  * Pig {@link org.apache.pig.LoadFunc} to read data from HCat
  */
-
+@InterfaceAudience.Public
+@InterfaceStability.Evolving
 public class HCatLoader extends HCatBaseLoader {
 
   private static final String PARTITION_FILTER = "partition.filter"; // for future use
@@ -116,7 +119,7 @@ public class HCatLoader extends HCatBase
       }
     } else {
       Job clone = new Job(job.getConfiguration());
-      HCatInputFormat.setInput(job, dbName, tableName).setFilter(getPartitionFilterString());
+      HCatInputFormat.setInput(job, dbName, tableName, getPartitionFilterString());
 
       // We will store all the new /changed properties in the job in the
       // udf context, so the the HCatInputFormat.setInput method need not

Modified: hive/branches/maven/hcatalog/hcatalog-pig-adapter/src/main/java/org/apache/hive/hcatalog/pig/HCatStorer.java
URL: http://svn.apache.org/viewvc/hive/branches/maven/hcatalog/hcatalog-pig-adapter/src/main/java/org/apache/hive/hcatalog/pig/HCatStorer.java?rev=1536480&r1=1536479&r2=1536480&view=diff
==============================================================================
--- hive/branches/maven/hcatalog/hcatalog-pig-adapter/src/main/java/org/apache/hive/hcatalog/pig/HCatStorer.java (original)
+++ hive/branches/maven/hcatalog/hcatalog-pig-adapter/src/main/java/org/apache/hive/hcatalog/pig/HCatStorer.java Mon Oct 28 18:44:01 2013
@@ -27,6 +27,8 @@ import java.util.Map.Entry;
 import java.util.Properties;
 
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hive.common.classification.InterfaceAudience;
+import org.apache.hadoop.hive.common.classification.InterfaceStability;
 import org.apache.hadoop.hive.shims.ShimLoader;
 import org.apache.hadoop.mapreduce.Job;
 import org.apache.hadoop.mapreduce.OutputFormat;
@@ -48,7 +50,8 @@ import org.apache.pig.impl.util.UDFConte
  * HCatStorer.
  *
  */
-
+@InterfaceAudience.Public
+@InterfaceStability.Evolving
 public class HCatStorer extends HCatBaseStorer {
 
   // Signature for wrapped storer, see comments in LoadFuncBasedInputDriver.initialize

Modified: hive/branches/maven/hcatalog/src/docs/src/documentation/content/xdocs/inputoutput.xml
URL: http://svn.apache.org/viewvc/hive/branches/maven/hcatalog/src/docs/src/documentation/content/xdocs/inputoutput.xml?rev=1536480&r1=1536479&r2=1536480&view=diff
==============================================================================
--- hive/branches/maven/hcatalog/src/docs/src/documentation/content/xdocs/inputoutput.xml (original)
+++ hive/branches/maven/hcatalog/src/docs/src/documentation/content/xdocs/inputoutput.xml Mon Oct 28 18:44:01 2013
@@ -45,9 +45,7 @@
 	    <li><code>getTableSchema</code></li>
 	</ul>
 
-	<p>To use HCatInputFormat to read data, first instantiate an <code>InputJobInfo</code>
-	with the necessary information from the table being read
-	and then call setInput with the <code>InputJobInfo</code>.</p>
+	<p>To use HCatInputFormat to read data, call setInput with the database name, tablename and an optional partition filter.</p>
 
 <p>You can use the <code>setOutputSchema</code> method to include a projection schema, to
 specify the output fields. If a schema is not specified, all the columns in the table
@@ -62,11 +60,13 @@ will be returned.</p>
    * the information in the conf object. The inputInfo object is updated with
    * information needed in the client context
    * @param job the job object
-   * @param inputJobInfo the input info for table to read
+   * @param dbName the database where the table lies
+   * @param tableName the table to read
+   * @param filter the partition filter to use
    * @throws IOException the exception in communicating with the metadata server
    */
   public static void setInput(Job job,
-      InputJobInfo inputJobInfo) throws IOException;
+      String dbName, String tableName, String filter) throws IOException;
 
   /**
    * Set the schema for the HCatRecord data returned by HCatInputFormat.
@@ -354,8 +354,8 @@ public class GroupByAge extends Configur
         String dbName = null;
 
         Job job = new Job(conf, "GroupByAge");
-        HCatInputFormat.setInput(job, InputJobInfo.create(dbName,
-                inputTableName, null));
+        HCatInputFormat.setInput(job, dbName,
+                inputTableName);
         // initialize HCatOutputFormat
 
         job.setInputFormatClass(HCatInputFormat.class);
@@ -388,8 +388,8 @@ public class GroupByAge extends Configur
 <li>The implementation of Map takes HCatRecord as an input and the implementation of Reduce produces it as an output.</li>
 <li>This example program assumes the schema of the input, but it could also retrieve the schema via
 HCatOutputFormat.getOutputSchema() and retrieve fields based on the results of that call.</li>
-<li>The input descriptor for the table to be read is created by calling InputJobInfo.create.  It requires the database name,
-table name, and partition filter.  In this example the partition filter is null, so all partitions of the table
+<li>The input descriptor for the table to be read is created by passing the database name,
+table name, and an optional partition filter to HCatInputFormat.setInput. In this example the partition filter is null, so all partitions of the table
 will be read.</li>
 <li>The output descriptor for the table to be written is created by calling OutputJobInfo.create.  It requires the
 database name, the table name, and a Map of partition keys and values that describe the partition being written.
@@ -397,7 +397,7 @@ In this example it is assumed the table 
 </ol>
 
 <p>To scan just selected partitions of a table, a filter describing the desired partitions can be passed to
-InputJobInfo.create.  To scan a single partition, the filter string should look like: "<code>ds=20120401</code>"
+HCatInputFormat.setInput.  To scan a single partition, the filter string should look like: "<code>ds=20120401</code>"
 where the datestamp "<code>ds</code>" is the partition column name and "<code>20120401</code>" is the value
 you want to read (year, month, and day).</p>
 </section>
@@ -420,14 +420,14 @@ you want to read (year, month, and day).
 
 <p>Assume for example you have a web_logs table that is partitioned by the column "<code>ds</code>".  You could select one partition of the table by changing</p>
 <source>
-HCatInputFormat.setInput(job, InputJobInfo.create(dbName, inputTableName, null));
+HCatInputFormat.setInput(job, dbName, inputTableName);
 </source>
 <p>
 to
 </p>
 <source>
 HCatInputFormat.setInput(job,
-                         InputJobInfo.create(dbName, inputTableName, "ds=\"20110924\""));
+                         dbName, inputTableName, "ds=\"20110924\"");
 </source>
 <p>
 This filter must reference only partition columns.  Values from other columns will cause the job to fail.</p>

Modified: hive/branches/maven/hcatalog/src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/HBaseReadWrite.java
URL: http://svn.apache.org/viewvc/hive/branches/maven/hcatalog/src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/HBaseReadWrite.java?rev=1536480&r1=1536479&r2=1536480&view=diff
==============================================================================
--- hive/branches/maven/hcatalog/src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/HBaseReadWrite.java (original)
+++ hive/branches/maven/hcatalog/src/test/e2e/hcatalog/udfs/java/org/apache/hcatalog/utils/HBaseReadWrite.java Mon Oct 28 18:44:01 2013
@@ -41,7 +41,6 @@ import org.apache.hcatalog.data.DefaultH
 import org.apache.hcatalog.data.HCatRecord;
 import org.apache.hcatalog.mapreduce.HCatInputFormat;
 import org.apache.hcatalog.mapreduce.HCatOutputFormat;
-import org.apache.hcatalog.mapreduce.InputJobInfo;
 import org.apache.hcatalog.mapreduce.OutputJobInfo;
 
 /**
@@ -165,8 +164,7 @@ public class HBaseReadWrite extends Conf
     if (!succ) return 1;
 
     job = new Job(conf, "HBaseRead");
-    HCatInputFormat.setInput(job, InputJobInfo.create(dbName, tableName,
-      null));
+    HCatInputFormat.setInput(job, dbName, tableName);
 
     job.setInputFormatClass(HCatInputFormat.class);
     job.setOutputFormatClass(TextOutputFormat.class);

Modified: hive/branches/maven/hcatalog/src/test/e2e/hcatalog/udfs/java/org/apache/hive/hcatalog/utils/GroupByAge.java
URL: http://svn.apache.org/viewvc/hive/branches/maven/hcatalog/src/test/e2e/hcatalog/udfs/java/org/apache/hive/hcatalog/utils/GroupByAge.java?rev=1536480&r1=1536479&r2=1536480&view=diff
==============================================================================
--- hive/branches/maven/hcatalog/src/test/e2e/hcatalog/udfs/java/org/apache/hive/hcatalog/utils/GroupByAge.java (original)
+++ hive/branches/maven/hcatalog/src/test/e2e/hcatalog/udfs/java/org/apache/hive/hcatalog/utils/GroupByAge.java Mon Oct 28 18:44:01 2013
@@ -38,7 +38,6 @@ import org.apache.hive.hcatalog.data.HCa
 import org.apache.hive.hcatalog.data.schema.HCatSchema;
 import org.apache.hive.hcatalog.mapreduce.HCatInputFormat;
 import org.apache.hive.hcatalog.mapreduce.HCatOutputFormat;
-import org.apache.hive.hcatalog.mapreduce.InputJobInfo;
 import org.apache.hive.hcatalog.mapreduce.OutputJobInfo;
 
 /**
@@ -105,8 +104,8 @@ public class GroupByAge extends Configur
     if (principalID != null)
       conf.set(HCatConstants.HCAT_METASTORE_PRINCIPAL, principalID);
     Job job = new Job(conf, "GroupByAge");
-    HCatInputFormat.setInput(job, InputJobInfo.create(dbName,
-      inputTableName, null));
+    HCatInputFormat.setInput(job, dbName,
+      inputTableName);
     // initialize HCatOutputFormat
 
     job.setInputFormatClass(HCatInputFormat.class);

Modified: hive/branches/maven/hcatalog/src/test/e2e/hcatalog/udfs/java/org/apache/hive/hcatalog/utils/ReadJson.java
URL: http://svn.apache.org/viewvc/hive/branches/maven/hcatalog/src/test/e2e/hcatalog/udfs/java/org/apache/hive/hcatalog/utils/ReadJson.java?rev=1536480&r1=1536479&r2=1536480&view=diff
==============================================================================
--- hive/branches/maven/hcatalog/src/test/e2e/hcatalog/udfs/java/org/apache/hive/hcatalog/utils/ReadJson.java (original)
+++ hive/branches/maven/hcatalog/src/test/e2e/hcatalog/udfs/java/org/apache/hive/hcatalog/utils/ReadJson.java Mon Oct 28 18:44:01 2013
@@ -37,7 +37,6 @@ import org.apache.hive.hcatalog.common.H
 import org.apache.hive.hcatalog.data.DefaultHCatRecord;
 import org.apache.hive.hcatalog.data.HCatRecord;
 import org.apache.hive.hcatalog.mapreduce.HCatInputFormat;
-import org.apache.hive.hcatalog.mapreduce.InputJobInfo;
 
 /**
  * This is a map reduce test for testing hcat which goes against the "numbers"
@@ -90,8 +89,8 @@ public class ReadJson extends Configured
     if (principalID != null)
       conf.set(HCatConstants.HCAT_METASTORE_PRINCIPAL, principalID);
     Job job = new Job(conf, "ReadJson");
-    HCatInputFormat.setInput(job, InputJobInfo.create(
-      dbName, tableName, null));
+    HCatInputFormat.setInput(job,
+      dbName, tableName);
     // initialize HCatOutputFormat
 
     job.setInputFormatClass(HCatInputFormat.class);

Modified: hive/branches/maven/hcatalog/src/test/e2e/hcatalog/udfs/java/org/apache/hive/hcatalog/utils/ReadRC.java
URL: http://svn.apache.org/viewvc/hive/branches/maven/hcatalog/src/test/e2e/hcatalog/udfs/java/org/apache/hive/hcatalog/utils/ReadRC.java?rev=1536480&r1=1536479&r2=1536480&view=diff
==============================================================================
--- hive/branches/maven/hcatalog/src/test/e2e/hcatalog/udfs/java/org/apache/hive/hcatalog/utils/ReadRC.java (original)
+++ hive/branches/maven/hcatalog/src/test/e2e/hcatalog/udfs/java/org/apache/hive/hcatalog/utils/ReadRC.java Mon Oct 28 18:44:01 2013
@@ -37,7 +37,6 @@ import org.apache.hive.hcatalog.common.H
 import org.apache.hive.hcatalog.data.DefaultHCatRecord;
 import org.apache.hive.hcatalog.data.HCatRecord;
 import org.apache.hive.hcatalog.mapreduce.HCatInputFormat;
-import org.apache.hive.hcatalog.mapreduce.InputJobInfo;
 
 /**
  * This is a map reduce test for testing hcat which goes against the "numbers"
@@ -91,8 +90,8 @@ public class ReadRC extends Configured i
     if (principalID != null)
       conf.set(HCatConstants.HCAT_METASTORE_PRINCIPAL, principalID);
     Job job = new Job(conf, "ReadRC");
-    HCatInputFormat.setInput(job, InputJobInfo.create(
-      dbName, tableName, null));
+    HCatInputFormat.setInput(job,
+      dbName, tableName);
     // initialize HCatOutputFormat
 
     job.setInputFormatClass(HCatInputFormat.class);

Modified: hive/branches/maven/hcatalog/src/test/e2e/hcatalog/udfs/java/org/apache/hive/hcatalog/utils/ReadText.java
URL: http://svn.apache.org/viewvc/hive/branches/maven/hcatalog/src/test/e2e/hcatalog/udfs/java/org/apache/hive/hcatalog/utils/ReadText.java?rev=1536480&r1=1536479&r2=1536480&view=diff
==============================================================================
--- hive/branches/maven/hcatalog/src/test/e2e/hcatalog/udfs/java/org/apache/hive/hcatalog/utils/ReadText.java (original)
+++ hive/branches/maven/hcatalog/src/test/e2e/hcatalog/udfs/java/org/apache/hive/hcatalog/utils/ReadText.java Mon Oct 28 18:44:01 2013
@@ -37,7 +37,6 @@ import org.apache.hive.hcatalog.common.H
 import org.apache.hive.hcatalog.data.DefaultHCatRecord;
 import org.apache.hive.hcatalog.data.HCatRecord;
 import org.apache.hive.hcatalog.mapreduce.HCatInputFormat;
-import org.apache.hive.hcatalog.mapreduce.InputJobInfo;
 
 /**
  * This is a map reduce test for testing hcat which goes against the "numbers"
@@ -102,8 +101,8 @@ public class ReadText extends Configured
     if (principalID != null)
       conf.set(HCatConstants.HCAT_METASTORE_PRINCIPAL, principalID);
     Job job = new Job(conf, "ReadText");
-    HCatInputFormat.setInput(job, InputJobInfo.create(
-      dbName, tableName, null));
+    HCatInputFormat.setInput(job,
+      dbName, tableName);
     // initialize HCatOutputFormat
 
     job.setInputFormatClass(HCatInputFormat.class);

Modified: hive/branches/maven/hcatalog/src/test/e2e/hcatalog/udfs/java/org/apache/hive/hcatalog/utils/ReadWrite.java
URL: http://svn.apache.org/viewvc/hive/branches/maven/hcatalog/src/test/e2e/hcatalog/udfs/java/org/apache/hive/hcatalog/utils/ReadWrite.java?rev=1536480&r1=1536479&r2=1536480&view=diff
==============================================================================
--- hive/branches/maven/hcatalog/src/test/e2e/hcatalog/udfs/java/org/apache/hive/hcatalog/utils/ReadWrite.java (original)
+++ hive/branches/maven/hcatalog/src/test/e2e/hcatalog/udfs/java/org/apache/hive/hcatalog/utils/ReadWrite.java Mon Oct 28 18:44:01 2013
@@ -36,7 +36,6 @@ import org.apache.hive.hcatalog.data.HCa
 import org.apache.hive.hcatalog.data.schema.HCatSchema;
 import org.apache.hive.hcatalog.mapreduce.HCatInputFormat;
 import org.apache.hive.hcatalog.mapreduce.HCatOutputFormat;
-import org.apache.hive.hcatalog.mapreduce.InputJobInfo;
 import org.apache.hive.hcatalog.mapreduce.OutputJobInfo;
 
 /**
@@ -86,8 +85,8 @@ public class ReadWrite extends Configure
     if (principalID != null)
       conf.set(HCatConstants.HCAT_METASTORE_PRINCIPAL, principalID);
     Job job = new Job(conf, "ReadWrite");
-    HCatInputFormat.setInput(job, InputJobInfo.create(dbName,
-      inputTableName, null));
+    HCatInputFormat.setInput(job, dbName,
+      inputTableName);
     // initialize HCatOutputFormat
 
     job.setInputFormatClass(HCatInputFormat.class);