hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gunt...@apache.org
Subject svn commit: r1545564 [1/22] - in /hive/branches/tez: ./ ant/ beeline/ bin/ cli/ common/ common/src/java/org/apache/hadoop/hive/common/ common/src/java/org/apache/hadoop/hive/common/type/ common/src/java/org/apache/hadoop/hive/conf/ common/src/test/org/...
Date Tue, 26 Nov 2013 08:19:34 GMT
Author: gunther
Date: Tue Nov 26 08:19:25 2013
New Revision: 1545564

URL: http://svn.apache.org/r1545564
Log:
Merge latest trunk into branch. (Gunther Hagleitner)

Added:
    hive/branches/tez/data/files/alltypes.txt
      - copied unchanged from r1545525, hive/trunk/data/files/alltypes.txt
    hive/branches/tez/data/files/dept.txt
      - copied unchanged from r1545525, hive/trunk/data/files/dept.txt
    hive/branches/tez/data/files/emp.txt
      - copied unchanged from r1545525, hive/trunk/data/files/emp.txt
    hive/branches/tez/data/files/loc.txt
      - copied unchanged from r1545525, hive/trunk/data/files/loc.txt
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/metadata/HiveFatalException.java
      - copied unchanged from r1545525, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/HiveFatalException.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/optimizer/stats/
      - copied from r1545525, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/stats/
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/plan/ColStatistics.java
      - copied unchanged from r1545525, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ColStatistics.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/plan/Statistics.java
      - copied unchanged from r1545525, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/Statistics.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/stats/CounterStatsAggregator.java
      - copied, changed from r1545525, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/stats/CounterStatsAggregator.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/stats/CounterStatsPublisher.java
      - copied unchanged from r1545525, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/stats/CounterStatsPublisher.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/stats/StatsUtils.java
      - copied unchanged from r1545525, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/stats/StatsUtils.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFBaseNumeric.java
      - copied unchanged from r1545525, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFBaseNumeric.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPDivide.java
      - copied unchanged from r1545525, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPDivide.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPMinus.java
      - copied unchanged from r1545525, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPMinus.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPMod.java
      - copied unchanged from r1545525, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPMod.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPMultiply.java
      - copied unchanged from r1545525, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPMultiply.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPPlus.java
      - copied unchanged from r1545525, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOPPlus.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFPosMod.java
      - copied unchanged from r1545525, hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFPosMod.java
    hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFOPDivide.java
      - copied unchanged from r1545525, hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFOPDivide.java
    hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFOPMinus.java
      - copied unchanged from r1545525, hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFOPMinus.java
    hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFOPMod.java
      - copied unchanged from r1545525, hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFOPMod.java
    hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFOPMultiply.java
      - copied unchanged from r1545525, hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFOPMultiply.java
    hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFOPPlus.java
      - copied unchanged from r1545525, hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFOPPlus.java
    hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFPosMod.java
      - copied unchanged from r1545525, hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFPosMod.java
    hive/branches/tez/ql/src/test/queries/clientnegative/illegal_partition_type3.q
      - copied unchanged from r1545525, hive/trunk/ql/src/test/queries/clientnegative/illegal_partition_type3.q
    hive/branches/tez/ql/src/test/queries/clientpositive/annotate_stats_filter.q
      - copied unchanged from r1545525, hive/trunk/ql/src/test/queries/clientpositive/annotate_stats_filter.q
    hive/branches/tez/ql/src/test/queries/clientpositive/annotate_stats_groupby.q
      - copied unchanged from r1545525, hive/trunk/ql/src/test/queries/clientpositive/annotate_stats_groupby.q
    hive/branches/tez/ql/src/test/queries/clientpositive/annotate_stats_join.q
      - copied unchanged from r1545525, hive/trunk/ql/src/test/queries/clientpositive/annotate_stats_join.q
    hive/branches/tez/ql/src/test/queries/clientpositive/annotate_stats_limit.q
      - copied unchanged from r1545525, hive/trunk/ql/src/test/queries/clientpositive/annotate_stats_limit.q
    hive/branches/tez/ql/src/test/queries/clientpositive/annotate_stats_part.q
      - copied unchanged from r1545525, hive/trunk/ql/src/test/queries/clientpositive/annotate_stats_part.q
    hive/branches/tez/ql/src/test/queries/clientpositive/annotate_stats_select.q
      - copied unchanged from r1545525, hive/trunk/ql/src/test/queries/clientpositive/annotate_stats_select.q
    hive/branches/tez/ql/src/test/queries/clientpositive/annotate_stats_table.q
      - copied unchanged from r1545525, hive/trunk/ql/src/test/queries/clientpositive/annotate_stats_table.q
    hive/branches/tez/ql/src/test/queries/clientpositive/annotate_stats_union.q
      - copied unchanged from r1545525, hive/trunk/ql/src/test/queries/clientpositive/annotate_stats_union.q
    hive/branches/tez/ql/src/test/queries/clientpositive/groupby_resolution.q
      - copied unchanged from r1545525, hive/trunk/ql/src/test/queries/clientpositive/groupby_resolution.q
    hive/branches/tez/ql/src/test/queries/clientpositive/notable_alias3.q
      - copied unchanged from r1545525, hive/trunk/ql/src/test/queries/clientpositive/notable_alias3.q
    hive/branches/tez/ql/src/test/queries/clientpositive/stats_counter.q
      - copied unchanged from r1545525, hive/trunk/ql/src/test/queries/clientpositive/stats_counter.q
    hive/branches/tez/ql/src/test/queries/clientpositive/subquery_exists_having.q
      - copied unchanged from r1545525, hive/trunk/ql/src/test/queries/clientpositive/subquery_exists_having.q
    hive/branches/tez/ql/src/test/queries/clientpositive/subquery_in_having.q
      - copied unchanged from r1545525, hive/trunk/ql/src/test/queries/clientpositive/subquery_in_having.q
    hive/branches/tez/ql/src/test/queries/clientpositive/subquery_notexists_having.q
      - copied unchanged from r1545525, hive/trunk/ql/src/test/queries/clientpositive/subquery_notexists_having.q
    hive/branches/tez/ql/src/test/queries/clientpositive/subquery_notin_having.q
      - copied unchanged from r1545525, hive/trunk/ql/src/test/queries/clientpositive/subquery_notin_having.q
    hive/branches/tez/ql/src/test/queries/clientpositive/vector_left_outer_join.q
      - copied unchanged from r1545525, hive/trunk/ql/src/test/queries/clientpositive/vector_left_outer_join.q
    hive/branches/tez/ql/src/test/results/clientnegative/illegal_partition_type3.q.out
      - copied unchanged from r1545525, hive/trunk/ql/src/test/results/clientnegative/illegal_partition_type3.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/annotate_stats_filter.q.out
      - copied unchanged from r1545525, hive/trunk/ql/src/test/results/clientpositive/annotate_stats_filter.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/annotate_stats_groupby.q.out
      - copied unchanged from r1545525, hive/trunk/ql/src/test/results/clientpositive/annotate_stats_groupby.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/annotate_stats_join.q.out
      - copied unchanged from r1545525, hive/trunk/ql/src/test/results/clientpositive/annotate_stats_join.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/annotate_stats_limit.q.out
      - copied unchanged from r1545525, hive/trunk/ql/src/test/results/clientpositive/annotate_stats_limit.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/annotate_stats_part.q.out
      - copied unchanged from r1545525, hive/trunk/ql/src/test/results/clientpositive/annotate_stats_part.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/annotate_stats_select.q.out
      - copied unchanged from r1545525, hive/trunk/ql/src/test/results/clientpositive/annotate_stats_select.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/annotate_stats_table.q.out
      - copied unchanged from r1545525, hive/trunk/ql/src/test/results/clientpositive/annotate_stats_table.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/annotate_stats_union.q.out
      - copied unchanged from r1545525, hive/trunk/ql/src/test/results/clientpositive/annotate_stats_union.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/groupby_resolution.q.out
      - copied unchanged from r1545525, hive/trunk/ql/src/test/results/clientpositive/groupby_resolution.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/notable_alias3.q.out
      - copied unchanged from r1545525, hive/trunk/ql/src/test/results/clientpositive/notable_alias3.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/stats_counter.q.out
      - copied unchanged from r1545525, hive/trunk/ql/src/test/results/clientpositive/stats_counter.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/subquery_exists_having.q.out
      - copied unchanged from r1545525, hive/trunk/ql/src/test/results/clientpositive/subquery_exists_having.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/subquery_in_having.q.out
      - copied unchanged from r1545525, hive/trunk/ql/src/test/results/clientpositive/subquery_in_having.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/subquery_notexists_having.q.out
      - copied unchanged from r1545525, hive/trunk/ql/src/test/results/clientpositive/subquery_notexists_having.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/subquery_notin_having.q.out
      - copied unchanged from r1545525, hive/trunk/ql/src/test/results/clientpositive/subquery_notin_having.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/vector_left_outer_join.q.out
      - copied unchanged from r1545525, hive/trunk/ql/src/test/results/clientpositive/vector_left_outer_join.q.out
    hive/branches/tez/serde/src/test/org/apache/hadoop/hive/serde2/columnar/TestBytesRefArrayWritable.java
      - copied unchanged from r1545525, hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/columnar/TestBytesRefArrayWritable.java
    hive/branches/tez/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/context/TestCloudComputeService.java
      - copied unchanged from r1545525, hive/trunk/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/context/TestCloudComputeService.java
Removed:
    hive/branches/tez/itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/OptrStatGroupByHook.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/SetStatistics.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFBaseNumericOp.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFOPDivide.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFOPMinus.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFOPMod.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFOPMultiply.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFOPPlus.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFPosMod.java
    hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/udf/TestUDFOPDivide.java
    hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/udf/TestUDFOPMod.java
    hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/udf/TestUDFPosMod.java
    hive/branches/tez/ql/src/test/queries/clientnegative/clustern1.q
    hive/branches/tez/ql/src/test/queries/clientnegative/notable_alias3.q
    hive/branches/tez/ql/src/test/queries/clientnegative/udf_case_type_wrong.q
    hive/branches/tez/ql/src/test/queries/clientnegative/udf_case_type_wrong2.q
    hive/branches/tez/ql/src/test/queries/clientnegative/udf_case_type_wrong3.q
    hive/branches/tez/ql/src/test/queries/clientnegative/udf_when_type_wrong2.q
    hive/branches/tez/ql/src/test/queries/clientnegative/udf_when_type_wrong3.q
    hive/branches/tez/ql/src/test/queries/clientpositive/optrstat_groupby.q
    hive/branches/tez/ql/src/test/results/clientnegative/clustern1.q.out
    hive/branches/tez/ql/src/test/results/clientnegative/notable_alias3.q.out
    hive/branches/tez/ql/src/test/results/clientnegative/udf_case_type_wrong.q.out
    hive/branches/tez/ql/src/test/results/clientnegative/udf_case_type_wrong2.q.out
    hive/branches/tez/ql/src/test/results/clientnegative/udf_case_type_wrong3.q.out
    hive/branches/tez/ql/src/test/results/clientnegative/udf_when_type_wrong2.q.out
    hive/branches/tez/ql/src/test/results/clientnegative/udf_when_type_wrong3.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/optrstat_groupby.q.out
Modified:
    hive/branches/tez/   (props changed)
    hive/branches/tez/ant/pom.xml
    hive/branches/tez/beeline/pom.xml
    hive/branches/tez/bin/hive
    hive/branches/tez/cli/pom.xml
    hive/branches/tez/common/pom.xml
    hive/branches/tez/common/src/java/org/apache/hadoop/hive/common/StatsSetupConst.java
    hive/branches/tez/common/src/java/org/apache/hadoop/hive/common/type/HiveDecimal.java
    hive/branches/tez/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
    hive/branches/tez/common/src/test/org/apache/hadoop/hive/common/type/TestHiveDecimal.java
    hive/branches/tez/conf/hive-default.xml.template
    hive/branches/tez/contrib/pom.xml
    hive/branches/tez/data/conf/hive-site.xml
    hive/branches/tez/hbase-handler/pom.xml
    hive/branches/tez/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseStatsAggregator.java
    hive/branches/tez/hcatalog/bin/hcat
    hive/branches/tez/hcatalog/bin/hcat.py
    hive/branches/tez/hcatalog/bin/hcat_server.py
    hive/branches/tez/hcatalog/bin/hcat_server.sh
    hive/branches/tez/hcatalog/bin/hcatcfg.py
    hive/branches/tez/hcatalog/core/pom.xml
    hive/branches/tez/hcatalog/core/src/test/java/org/apache/hcatalog/cli/TestUseDatabase.java
    hive/branches/tez/hcatalog/core/src/test/java/org/apache/hive/hcatalog/cli/TestUseDatabase.java
    hive/branches/tez/hcatalog/hcatalog-pig-adapter/pom.xml
    hive/branches/tez/hcatalog/server-extensions/pom.xml
    hive/branches/tez/hcatalog/storage-handlers/hbase/pom.xml
    hive/branches/tez/hcatalog/webhcat/java-client/pom.xml
    hive/branches/tez/hcatalog/webhcat/svr/pom.xml
    hive/branches/tez/hcatalog/webhcat/svr/src/main/bin/webhcat_config.sh
    hive/branches/tez/hcatalog/webhcat/svr/src/main/bin/webhcat_server.sh
    hive/branches/tez/hwi/pom.xml
    hive/branches/tez/itests/hcatalog-unit/pom.xml
    hive/branches/tez/itests/hive-unit/pom.xml
    hive/branches/tez/itests/qtest/pom.xml
    hive/branches/tez/itests/test-serde/pom.xml
    hive/branches/tez/itests/util/pom.xml
    hive/branches/tez/itests/util/src/main/java/org/apache/hadoop/hive/ql/stats/DummyStatsAggregator.java
    hive/branches/tez/itests/util/src/main/java/org/apache/hadoop/hive/ql/stats/KeyVerifyingStatsAggregator.java
    hive/branches/tez/jdbc/pom.xml
    hive/branches/tez/jdbc/src/java/org/apache/hive/jdbc/HiveQueryResultSet.java
    hive/branches/tez/metastore/pom.xml
    hive/branches/tez/metastore/src/java/org/apache/hadoop/hive/metastore/HiveAlterHandler.java
    hive/branches/tez/odbc/pom.xml
    hive/branches/tez/packaging/pom.xml
    hive/branches/tez/packaging/src/main/assembly/bin.xml
    hive/branches/tez/pom.xml
    hive/branches/tez/ql/pom.xml
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/ErrorMsg.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/QueryPlan.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/AbstractMapJoinOperator.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/CommonJoinOperator.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/DemuxOperator.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/FetchOperator.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/FileSinkOperator.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/FunctionRegistry.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/GroupByOperator.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/MapJoinOperator.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/MuxOperator.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/Operator.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/OperatorFactory.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/ReduceSinkOperator.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/SMBMapJoinOperator.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/StatsTask.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/TableScanOperator.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecDriver.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecReducer.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/HadoopJobExecHelper.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/HadoopJobExecHook.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/MapredLocalTask.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/DagUtils.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/ReduceRecordProcessor.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorFileSinkOperator.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorGroupByOperator.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorExpressionWriter.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorExpressionWriterFactory.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/io/orc/InStream.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcSerde.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcStruct.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/io/orc/RecordReaderImpl.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/io/orc/VectorizedOrcSerde.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/merge/BlockMergeTask.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/stats/PartialScanTask.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/truncate/ColumnTruncateTask.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/lockmgr/zookeeper/ZooKeeperHiveLockManager.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/optimizer/ConvertJoinMapJoin.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/optimizer/MapJoinProcessor.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/optimizer/Optimizer.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/optimizer/SetReducerParallelism.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/Vectorizer.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/BaseSemanticAnalyzer.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/MapReduceCompiler.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/PTFTranslator.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/ParseUtils.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/QB.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/QBSubQuery.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/RowResolver.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/TaskCompiler.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/TezCompiler.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/parse/TypeCheckProcFactory.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/plan/AbstractOperatorDesc.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/plan/ExprNodeGenericFuncDesc.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/plan/JoinDesc.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/plan/StatsWork.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/stats/StatsAggregator.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/stats/StatsFactory.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/stats/jdbc/JDBCStatsAggregator.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFBridge.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFCase.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFUtils.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFWhen.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/util/JavaDataModel.java
    hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/exec/TestFunctionRegistry.java
    hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/exec/TestOperators.java
    hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/exec/TestStatsPublisherEnhanced.java
    hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/TestVectorGroupByOperator.java
    hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/TestVectorSelectOperator.java
    hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/TestVectorizationContext.java
    hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorExpressionWriters.java
    hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/io/TestRCFile.java
    hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestOrcFile.java
    hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/lockmgr/zookeeper/TestZookeeperLockManager.java
    hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/parse/TestHiveDecimalParse.java
    hive/branches/tez/ql/src/test/org/apache/hadoop/hive/ql/testutil/OperatorTestUtils.java
    hive/branches/tez/ql/src/test/queries/clientnegative/stats_aggregator_error_1.q
    hive/branches/tez/ql/src/test/queries/clientnegative/stats_aggregator_error_2.q
    hive/branches/tez/ql/src/test/queries/clientnegative/stats_publisher_error_1.q
    hive/branches/tez/ql/src/test/queries/clientnegative/stats_publisher_error_2.q
    hive/branches/tez/ql/src/test/queries/clientpositive/decimal_1.q
    hive/branches/tez/ql/src/test/queries/clientpositive/decimal_3.q
    hive/branches/tez/ql/src/test/queries/clientpositive/decimal_precision.q
    hive/branches/tez/ql/src/test/queries/clientpositive/decimal_udf.q
    hive/branches/tez/ql/src/test/queries/clientpositive/insert_into3.q
    hive/branches/tez/ql/src/test/queries/clientpositive/serde_regex.q
    hive/branches/tez/ql/src/test/queries/clientpositive/stats19.q
    hive/branches/tez/ql/src/test/queries/clientpositive/stats_aggregator_error_1.q
    hive/branches/tez/ql/src/test/queries/clientpositive/stats_publisher_error_1.q
    hive/branches/tez/ql/src/test/queries/clientpositive/udf_case.q
    hive/branches/tez/ql/src/test/queries/clientpositive/udf_when.q
    hive/branches/tez/ql/src/test/results/clientnegative/invalid_arithmetic_type.q.out
    hive/branches/tez/ql/src/test/results/clientnegative/invalid_cast_from_binary_1.q.out
    hive/branches/tez/ql/src/test/results/clientnegative/invalid_cast_from_binary_2.q.out
    hive/branches/tez/ql/src/test/results/clientnegative/invalid_cast_from_binary_3.q.out
    hive/branches/tez/ql/src/test/results/clientnegative/invalid_cast_from_binary_4.q.out
    hive/branches/tez/ql/src/test/results/clientnegative/invalid_cast_from_binary_5.q.out
    hive/branches/tez/ql/src/test/results/clientnegative/invalid_cast_from_binary_6.q.out
    hive/branches/tez/ql/src/test/results/clientnegative/udf_assert_true2.q.out
    hive/branches/tez/ql/src/test/results/clientnegative/wrong_column_type.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/alter_partition_coltype.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/auto_join13.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/auto_join2.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/auto_join_reordering_values.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/auto_sortmerge_join_1.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/auto_sortmerge_join_11.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/auto_sortmerge_join_12.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/auto_sortmerge_join_2.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/auto_sortmerge_join_3.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/auto_sortmerge_join_4.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/auto_sortmerge_join_5.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/auto_sortmerge_join_6.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/auto_sortmerge_join_7.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/auto_sortmerge_join_8.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/binary_output_format.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/bucket1.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/bucket2.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/bucket3.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/bucket4.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/bucket5.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/bucket_map_join_1.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/bucket_map_join_2.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/bucketcontext_1.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/bucketcontext_2.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/bucketcontext_3.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/bucketcontext_4.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/bucketcontext_5.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/bucketcontext_6.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/bucketcontext_7.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/bucketcontext_8.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/bucketmapjoin1.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/bucketmapjoin10.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/bucketmapjoin11.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/bucketmapjoin12.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/bucketmapjoin13.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/bucketmapjoin2.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/bucketmapjoin3.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/bucketmapjoin4.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/bucketmapjoin5.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/bucketmapjoin7.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/bucketmapjoin8.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/bucketmapjoin9.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/bucketmapjoin_negative.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/bucketmapjoin_negative2.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/bucketmapjoin_negative3.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/combine2_hadoop20.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/ctas_hadoop20.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/decimal_1.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/decimal_3.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/decimal_6.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/decimal_precision.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/decimal_udf.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/disable_merge_for_bucketing.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/dynamic_partition_skip_default.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/filter_join_breaktask.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/groupby_map_ppr.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/groupby_map_ppr_multi_distinct.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/groupby_ppr.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/groupby_ppr_multi_distinct.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/groupby_sort_1.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/groupby_sort_6.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/groupby_sort_skew_1.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/input23.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/input42.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/input8.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/input_part1.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/input_part2.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/input_part7.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/input_part9.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/insert_into3.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/join17.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/join26.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/join32.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/join32_lessSize.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/join33.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/join34.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/join35.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/join9.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/join_filters_overlap.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/join_map_ppr.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/list_bucket_dml_10.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/literal_decimal.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/load_dyn_part8.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/louter_join_ppr.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/macro.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/merge3.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/metadata_only_queries.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/metadataonly1.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/num_op_type_conv.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/orc_createas1.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/outer_join_ppr.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/pcr.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/ppd_constant_expr.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/ppd_join_filter.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/ppd_union_view.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/ppd_vc.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/ppr_allchildsarenull.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/push_or.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/ql_rewrite_gbtoidx.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/rand_partitionpruner1.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/rand_partitionpruner2.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/rand_partitionpruner3.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/rcfile_createas1.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/rcfile_merge1.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/rcfile_merge2.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/reduce_deduplicate.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/regexp_extract.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/router_join_ppr.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/sample1.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/sample10.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/sample2.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/sample4.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/sample5.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/sample6.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/sample7.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/sample8.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/sample9.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/serde_regex.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/serde_user_properties.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/skewjoin.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/smb_mapjoin9.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/smb_mapjoin_11.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/smb_mapjoin_12.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/smb_mapjoin_13.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/smb_mapjoin_15.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/sort_merge_join_desc_5.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/sort_merge_join_desc_6.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/sort_merge_join_desc_7.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/stats0.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/stats11.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/stats12.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/stats13.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/stats_aggregator_error_1.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/stats_only_null.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/subquery_multiinsert.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/transform_ppr1.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/transform_ppr2.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/udf7.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/udf_case.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/udf_explode.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/udf_java_method.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/udf_pmod.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/udf_reflect.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/udf_reflect2.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/udf_when.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/udtf_explode.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/union22.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/union24.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/union_ppr.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/vectorization_15.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/vectorization_5.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/vectorization_short_regress.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/vectorized_math_funcs.q.out
    hive/branches/tez/ql/src/test/results/clientpositive/windowing_expressions.q.out
    hive/branches/tez/ql/src/test/results/compiler/errors/nonkey_groupby.q.out
    hive/branches/tez/ql/src/test/results/compiler/plan/case_sensitivity.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/cast1.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/groupby1.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/groupby2.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/groupby3.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/groupby4.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/groupby5.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/groupby6.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/input1.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/input2.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/input20.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/input3.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/input4.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/input5.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/input6.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/input7.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/input8.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/input9.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/input_part1.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/input_testsequencefile.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/input_testxpath.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/input_testxpath2.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/join1.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/join2.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/join3.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/join4.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/join5.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/join6.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/join7.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/join8.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/sample1.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/sample2.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/sample3.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/sample4.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/sample5.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/sample6.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/sample7.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/subq.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/udf1.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/udf4.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/udf6.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/udf_case.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/udf_when.q.xml
    hive/branches/tez/ql/src/test/results/compiler/plan/union.q.xml
    hive/branches/tez/serde/pom.xml
    hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/columnar/BytesRefArrayWritable.java
    hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/columnar/ColumnarStructBase.java
    hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/PrimitiveObjectInspector.java
    hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/AbstractPrimitiveObjectInspector.java
    hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/WritableConstantByteObjectInspector.java
    hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/WritableConstantHiveDecimalObjectInspector.java
    hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/WritableConstantIntObjectInspector.java
    hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/WritableConstantLongObjectInspector.java
    hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/WritableConstantShortObjectInspector.java
    hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/HiveDecimalUtils.java
    hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/TypeInfoFactory.java
    hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/typeinfo/TypeInfoUtils.java
    hive/branches/tez/serde/src/test/org/apache/hadoop/hive/serde2/columnar/TestLazyBinaryColumnarSerDe.java
    hive/branches/tez/service/pom.xml
    hive/branches/tez/service/src/java/org/apache/hive/service/cli/session/SessionManager.java
    hive/branches/tez/shims/0.20/pom.xml
    hive/branches/tez/shims/0.20/src/main/java/org/apache/hadoop/hive/shims/Hadoop20Shims.java
    hive/branches/tez/shims/0.20S/pom.xml
    hive/branches/tez/shims/0.23/pom.xml
    hive/branches/tez/shims/0.23/src/main/java/org/apache/hadoop/mapred/WebHCatJTShim23.java
    hive/branches/tez/shims/assembly/pom.xml
    hive/branches/tez/shims/common-secure/pom.xml
    hive/branches/tez/shims/common-secure/src/main/java/org/apache/hadoop/hive/shims/HadoopShimsSecure.java
    hive/branches/tez/shims/common/pom.xml
    hive/branches/tez/shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java
    hive/branches/tez/testutils/pom.xml
    hive/branches/tez/testutils/ptest2/pom.xml
    hive/branches/tez/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/context/CloudComputeService.java
    hive/branches/tez/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/context/CloudExecutionContextProvider.java
    hive/branches/tez/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/context/TestCloudExecutionContextProvider.java

Propchange: hive/branches/tez/
------------------------------------------------------------------------------
  Merged /hive/trunk:r1541726-1545525

Modified: hive/branches/tez/ant/pom.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/ant/pom.xml?rev=1545564&r1=1545563&r2=1545564&view=diff
==============================================================================
--- hive/branches/tez/ant/pom.xml (original)
+++ hive/branches/tez/ant/pom.xml Tue Nov 26 08:19:25 2013
@@ -32,6 +32,7 @@
   </properties>
 
   <dependencies>
+    <!-- dependencies are always listed in sorted order by groupId, artifectId -->
     <!-- inter-project -->
     <dependency>
       <groupId>commons-lang</groupId>

Modified: hive/branches/tez/beeline/pom.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/beeline/pom.xml?rev=1545564&r1=1545563&r2=1545564&view=diff
==============================================================================
--- hive/branches/tez/beeline/pom.xml (original)
+++ hive/branches/tez/beeline/pom.xml Tue Nov 26 08:19:25 2013
@@ -32,6 +32,7 @@
   </properties>
 
   <dependencies>
+    <!-- dependencies are always listed in sorted order by groupId, artifectId -->
     <!-- intra-project -->
     <dependency>
       <groupId>org.apache.hive</groupId>

Modified: hive/branches/tez/bin/hive
URL: http://svn.apache.org/viewvc/hive/branches/tez/bin/hive?rev=1545564&r1=1545563&r2=1545564&view=diff
==============================================================================
--- hive/branches/tez/bin/hive (original)
+++ hive/branches/tez/bin/hive Tue Nov 26 08:19:25 2013
@@ -196,6 +196,39 @@ if [ "$hadoop_major_ver" -lt "1" -a  "$h
     exit 6
 fi
 
+# HBase detection. Need bin/hbase and a conf dir for building classpath entries.
+# Start with BigTop defaults for HBASE_HOME and HBASE_CONF_DIR.
+HBASE_HOME=${HBASE_HOME:-"/usr/lib/hbase"}
+HBASE_CONF_DIR=${HBASE_CONF_DIR:-"/etc/hbase/conf"}
+if [[ ! -d $HBASE_CONF_DIR ]] ; then
+  # not explicitly set, nor in BigTop location. Try looking in HBASE_HOME.
+  HBASE_CONF_DIR="$HBASE_HOME/conf"
+fi
+
+# perhaps we've located the HBase config. if so, include it on classpath.
+if [[ -d $HBASE_CONF_DIR ]] ; then
+  export HADOOP_CLASSPATH="${HADOOP_CLASSPATH}:${HBASE_CONF_DIR}"
+fi
+
+# look for the hbase script. First check HBASE_HOME and then ask PATH.
+if [[ -e $HBASE_HOME/bin/hbase ]] ; then
+  HBASE_BIN="$HBASE_HOME/bin/hbase"
+fi
+HBASE_BIN=${HBASE_BIN:-"$(which hbase 2>/dev/null)"}
+
+# perhaps we've located HBase. If so, include its details on the classpath
+if [[ -n $HBASE_BIN ]] ; then
+  # exclude ZK, PB, and Guava (See HIVE-2055)
+  # depends on HBASE-8438 (hbase-0.94.14+, hbase-0.96.1+) for `hbase mapredcp` command
+  for x in $($HBASE_BIN mapredcp 2>/dev/null | tr ':' '\n') ; do
+    if [[ $x == *zookeeper* || $x == *protobuf-java* || $x == *guava* ]] ; then
+      continue
+    fi
+    # TODO: should these should be added to AUX_PARAM as well?
+    export HADOOP_CLASSPATH="${HADOOP_CLASSPATH}:${x}"
+  done
+fi
+
 if [ "${AUX_PARAM}" != "" ]; then
   HIVE_OPTS="$HIVE_OPTS -hiveconf hive.aux.jars.path=${AUX_PARAM}"
   AUX_JARS_CMD_LINE="-libjars ${AUX_PARAM}"

Modified: hive/branches/tez/cli/pom.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/cli/pom.xml?rev=1545564&r1=1545563&r2=1545564&view=diff
==============================================================================
--- hive/branches/tez/cli/pom.xml (original)
+++ hive/branches/tez/cli/pom.xml Tue Nov 26 08:19:25 2013
@@ -32,6 +32,7 @@
   </properties>
 
   <dependencies>
+    <!-- dependencies are always listed in sorted order by groupId, artifectId -->
     <!-- intra-project -->
     <dependency>
       <groupId>org.apache.hive</groupId>

Modified: hive/branches/tez/common/pom.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/common/pom.xml?rev=1545564&r1=1545563&r2=1545564&view=diff
==============================================================================
--- hive/branches/tez/common/pom.xml (original)
+++ hive/branches/tez/common/pom.xml Tue Nov 26 08:19:25 2013
@@ -32,6 +32,7 @@
   </properties>
 
   <dependencies>
+    <!-- dependencies are always listed in sorted order by groupId, artifectId -->
     <!-- intra-proect -->
     <dependency>
       <groupId>org.apache.hive</groupId>

Modified: hive/branches/tez/common/src/java/org/apache/hadoop/hive/common/StatsSetupConst.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/common/src/java/org/apache/hadoop/hive/common/StatsSetupConst.java?rev=1545564&r1=1545563&r2=1545564&view=diff
==============================================================================
--- hive/branches/tez/common/src/java/org/apache/hadoop/hive/common/StatsSetupConst.java (original)
+++ hive/branches/tez/common/src/java/org/apache/hadoop/hive/common/StatsSetupConst.java Tue Nov 26 08:19:25 2013
@@ -17,6 +17,9 @@
  */
 package org.apache.hadoop.hive.common;
 
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hive.conf.HiveConf;
+
 import java.util.Map;
 
 
@@ -27,15 +30,34 @@ import java.util.Map;
 
 public class StatsSetupConst {
 
-  /**
-   * The value of the user variable "hive.stats.dbclass" to use HBase implementation.
-   */
-  public static final String HBASE_IMPL_CLASS_VAL = "hbase";
-
-  /**
-   * The value of the user variable "hive.stats.dbclass" to use JDBC implementation.
-   */
-  public static final String JDBC_IMPL_CLASS_VAL = "jdbc";
+  public enum StatDB {
+    hbase {
+      public String getPublisher(Configuration conf) {
+        return "org.apache.hadoop.hive.hbase.HBaseStatsPublisher"; }
+      public String getAggregator(Configuration conf) {
+        return "org.apache.hadoop.hive.hbase.HBaseStatsAggregator"; }
+    },
+    jdbc {
+      public String getPublisher(Configuration conf) {
+        return "org.apache.hadoop.hive.ql.stats.jdbc.JDBCStatsPublisher"; }
+      public String getAggregator(Configuration conf) {
+        return "org.apache.hadoop.hive.ql.stats.jdbc.JDBCStatsAggregator"; }
+    },
+    counter {
+      public String getPublisher(Configuration conf) {
+        return "org.apache.hadoop.hive.ql.stats.CounterStatsPublisher"; }
+      public String getAggregator(Configuration conf) {
+        return "org.apache.hadoop.hive.ql.stats.CounterStatsAggregator"; }
+    },
+    custom {
+      public String getPublisher(Configuration conf) {
+        return HiveConf.getVar(conf, HiveConf.ConfVars.HIVE_STATS_DEFAULT_PUBLISHER); }
+      public String getAggregator(Configuration conf) {
+        return HiveConf.getVar(conf,  HiveConf.ConfVars.HIVE_STATS_DEFAULT_AGGREGATOR); }
+    };
+    public abstract String getPublisher(Configuration conf);
+    public abstract String getAggregator(Configuration conf);
+  }
 
   // statistics stored in metastore
   /**

Modified: hive/branches/tez/common/src/java/org/apache/hadoop/hive/common/type/HiveDecimal.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/common/src/java/org/apache/hadoop/hive/common/type/HiveDecimal.java?rev=1545564&r1=1545563&r2=1545564&view=diff
==============================================================================
--- hive/branches/tez/common/src/java/org/apache/hadoop/hive/common/type/HiveDecimal.java (original)
+++ hive/branches/tez/common/src/java/org/apache/hadoop/hive/common/type/HiveDecimal.java Tue Nov 26 08:19:25 2013
@@ -28,10 +28,22 @@ 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 int MAX_PRECISION = 38;
+  public static final int MAX_SCALE = 38;
+
+  /**
+   * Default precision/scale when user doesn't specify in the column metadata, such as
+   * decimal and decimal(8).
+   */
+  public static final int USER_DEFAULT_PRECISION = 10;
+  public static final int USER_DEFAULT_SCALE = 0;
+
+  /**
+   *  Default precision/scale when system is not able to determine them, such as in case
+   *  of a non-generic udf.
+   */
+  public static final int SYSTEM_DEFAULT_PRECISION = 38;
+  public static final int SYSTEM_DEFAULT_SCALE = 18;
 
   public static final HiveDecimal ZERO = new HiveDecimal(BigDecimal.ZERO);
   public static final HiveDecimal ONE = new HiveDecimal(BigDecimal.ONE);

Modified: hive/branches/tez/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java?rev=1545564&r1=1545563&r2=1545564&view=diff
==============================================================================
--- hive/branches/tez/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java (original)
+++ hive/branches/tez/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java Tue Nov 26 08:19:25 2013
@@ -542,8 +542,6 @@ public class HiveConf extends Configurat
 
     HIVEDEBUGLOCALTASK("hive.debug.localtask",false),
 
-    HIVEJOBPROGRESS("hive.task.progress", false),
-
     HIVEINPUTFORMAT("hive.input.format", "org.apache.hadoop.hive.ql.io.CombineHiveInputFormat"),
 
     HIVEENFORCEBUCKETING("hive.enforce.bucketing", false),
@@ -607,8 +605,8 @@ public class HiveConf extends Configurat
 
     // Statistics
     HIVESTATSAUTOGATHER("hive.stats.autogather", true),
-    HIVESTATSDBCLASS("hive.stats.dbclass",
-        "jdbc:derby"), // other options are jdbc:mysql and hbase as defined in StatsSetupConst.java
+    HIVESTATSDBCLASS("hive.stats.dbclass", "counter",
+        new PatternValidator("jdbc(:.*)", "hbase", "counter", "custom")), // StatsSetupConst.StatDB
     HIVESTATSJDBCDRIVER("hive.stats.jdbcdriver",
         "org.apache.derby.jdbc.EmbeddedDriver"), // JDBC driver specific to the dbclass
     HIVESTATSDBCONNECTIONSTRING("hive.stats.dbconnectionstring",
@@ -639,6 +637,14 @@ public class HiveConf extends Configurat
     HIVE_STATS_NDV_ERROR("hive.stats.ndv.error", (float)20.0),
     HIVE_STATS_KEY_PREFIX_MAX_LENGTH("hive.stats.key.prefix.max.length", 150),
     HIVE_STATS_KEY_PREFIX("hive.stats.key.prefix", ""), // internal usage only
+    // if length of variable length data type cannot be determined this length will be used.
+    HIVE_STATS_MAX_VARIABLE_LENGTH("hive.stats.max.variable.length", 100),
+    // if number of elements in list cannot be determined, this value will be used
+    HIVE_STATS_LIST_NUM_ENTRIES("hive.stats.list.num.entries", 10),
+    // if number of elements in map cannot be determined, this value will be used
+    HIVE_STATS_MAP_NUM_ENTRIES("hive.stats.map.num.entries", 10),
+    // to accurately compute statistics for GROUPBY map side parallelism needs to be known
+    HIVE_STATS_MAP_SIDE_PARALLELISM("hive.stats.map.parallelism", 1),
 
     // Concurrency
     HIVE_SUPPORT_CONCURRENCY("hive.support.concurrency", false),
@@ -841,6 +847,10 @@ public class HiveConf extends Configurat
 
     // Vectorization enabled
     HIVE_VECTORIZATION_ENABLED("hive.vectorized.execution.enabled", false),
+    HIVE_VECTORIZATION_GROUPBY_CHECKINTERVAL("hive.vectorized.groupby.checkinterval", 100000),
+    HIVE_VECTORIZATION_GROUPBY_MAXENTRIES("hive.vectorized.groupby.maxentries", 1000000),
+    HIVE_VECTORIZATION_GROUPBY_FLUSH_PERCENT("hive.vectorized.groupby.flush.percent", (float) 0.1),
+    
 
     HIVE_TYPE_CHECK_ON_INSERT("hive.typecheck.on.insert", true),
 
@@ -853,6 +863,8 @@ public class HiveConf extends Configurat
     // none, idonly, traverse, execution
     HIVESTAGEIDREARRANGE("hive.stageid.rearrange", "none"),
     HIVEEXPLAINDEPENDENCYAPPENDTASKTYPES("hive.explain.dependency.append.tasktype", false),
+
+    HIVECOUNTERGROUP("hive.counters.group.name", "HIVE")
     ;
 
     public final String varname;
@@ -1373,6 +1385,27 @@ public class HiveConf extends Configurat
     }
   }
 
+  public static class PatternValidator implements Validator {
+    private final List<Pattern> expected = new ArrayList<Pattern>();
+    private PatternValidator(String... values) {
+      for (String value : values) {
+        expected.add(Pattern.compile(value));
+      }
+    }
+    @Override
+    public String validate(String value) {
+      if (value == null) {
+        return "Invalid value.. expects one of patterns " + expected;
+      }
+      for (Pattern pattern : expected) {
+        if (pattern.matcher(value).matches()) {
+          return null;
+        }
+      }
+      return "Invalid value.. expects one of patterns " + expected;
+    }
+  }
+
   public static class RatioValidator implements Validator {
     @Override
     public String validate(String value) {

Modified: hive/branches/tez/common/src/test/org/apache/hadoop/hive/common/type/TestHiveDecimal.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/common/src/test/org/apache/hadoop/hive/common/type/TestHiveDecimal.java?rev=1545564&r1=1545563&r2=1545564&view=diff
==============================================================================
--- hive/branches/tez/common/src/test/org/apache/hadoop/hive/common/type/TestHiveDecimal.java (original)
+++ hive/branches/tez/common/src/test/org/apache/hadoop/hive/common/type/TestHiveDecimal.java Tue Nov 26 08:19:25 2013
@@ -28,16 +28,17 @@ public class TestHiveDecimal {
   public void testPrecisionScaleEnforcement() {
     String decStr = "1786135888657847525803324040144343378.09799306448796128931113691624";
     HiveDecimal dec = HiveDecimal.create(decStr);
-    Assert.assertEquals("1786135888657847525803324040144343378.0979930644879612893111369162", dec.toString());
+    Assert.assertEquals("1786135888657847525803324040144343378.1", dec.toString());
     Assert.assertTrue("Decimal precision should not go above maximum",
         dec.precision() <= HiveDecimal.MAX_PRECISION);
     Assert.assertTrue("Decimal scale should not go above maximum", dec.scale() <= HiveDecimal.MAX_SCALE);
 
+    decStr = "57847525803324040144343378.09799306448796128931113691624";
     BigDecimal bd = new BigDecimal(decStr);
     BigDecimal bd1 = HiveDecimal.enforcePrecisionScale(bd, 20, 5);
     Assert.assertNull(bd1);
-    bd1 = HiveDecimal.enforcePrecisionScale(bd, 45, 5);
-    Assert.assertEquals("1786135888657847525803324040144343378.09799", bd1.toString());
+    bd1 = HiveDecimal.enforcePrecisionScale(bd, 35, 5);
+    Assert.assertEquals("57847525803324040144343378.09799", bd1.toString());
     bd1 = HiveDecimal.enforcePrecisionScale(bd, 45, 20);
     Assert.assertNull(bd1);
 
@@ -45,7 +46,7 @@ public class TestHiveDecimal {
     Assert.assertNull(dec);
 
     dec = HiveDecimal.create("-1786135888657847525803324040144343378.09799306448796128931113691624");
-    Assert.assertEquals("-1786135888657847525803324040144343378.0979930644879612893111369162", dec.toString());
+    Assert.assertEquals("-1786135888657847525803324040144343378.1", dec.toString());
 
     dec = HiveDecimal.create("005.34000");
     Assert.assertEquals(dec.precision(), 3);
@@ -54,21 +55,21 @@ public class TestHiveDecimal {
     dec = HiveDecimal.create("178613588865784752580332404014434337809799306448796128931113691624");
     Assert.assertNull(dec);
   }
-  
+
   @Test
   public void testTrailingZeroRemovalAfterEnforcement() {
-    String decStr = "8.0900000000000000000000000000000123456";
+    String decStr = "8.090000000000000000000000000000000000000123456";
     HiveDecimal dec = HiveDecimal.create(decStr);
     Assert.assertEquals("8.09", dec.toString());
   }
-  
+
   @Test
   public void testMultiply() {
-    HiveDecimal dec1 = HiveDecimal.create("0.1786135888657847525803");
-    HiveDecimal dec2 = HiveDecimal.create("3.123456789");
+    HiveDecimal dec1 = HiveDecimal.create("0.00001786135888657847525803");
+    HiveDecimal dec2 = HiveDecimal.create("3.0000123456789");
     Assert.assertNull(dec1.multiply(dec2));
 
-    dec1 = HiveDecimal.create("1786135888657847525803232322323234442321.4");
+    dec1 = HiveDecimal.create("178613588865784752580323232232323444.4");
     dec2 = HiveDecimal.create("178613588865784752580302323232.3");
     Assert.assertNull(dec1.multiply(dec2));
 
@@ -79,10 +80,10 @@ public class TestHiveDecimal {
 
   @Test
   public void testPow() {
-    HiveDecimal dec = HiveDecimal.create("3.1415926");
+    HiveDecimal dec = HiveDecimal.create("3.00001415926");
     Assert.assertEquals(dec.pow(2), dec.multiply(dec));
 
-    HiveDecimal dec1 = HiveDecimal.create("0.17861358882");
+    HiveDecimal dec1 = HiveDecimal.create("0.000017861358882");
     dec1 = dec1.pow(3);
     Assert.assertNull(dec1);
   }
@@ -102,6 +103,14 @@ public class TestHiveDecimal {
   }
 
   @Test
+  public void testPosMod() {
+    HiveDecimal hd1 = HiveDecimal.create("-100.91");
+    HiveDecimal hd2 = HiveDecimal.create("9.8");
+    HiveDecimal dec = hd1.remainder(hd2).add(hd2).remainder(hd2);
+    Assert.assertEquals("6.89", dec.toString());
+  }
+
+  @Test
   public void testException() {
     HiveDecimal dec = HiveDecimal.create("3.1415.926");
     Assert.assertNull(dec);

Modified: hive/branches/tez/conf/hive-default.xml.template
URL: http://svn.apache.org/viewvc/hive/branches/tez/conf/hive-default.xml.template?rev=1545564&r1=1545563&r2=1545564&view=diff
==============================================================================
--- hive/branches/tez/conf/hive-default.xml.template (original)
+++ hive/branches/tez/conf/hive-default.xml.template Tue Nov 26 08:19:25 2013
@@ -716,9 +716,9 @@
 </property>
 
 <property>
-  <name>hive.task.progress</name>
-  <value>false</value>
-  <description>Whether Hive should periodically update task progress counters during execution.  Enabling this allows task progress to be monitored more closely in the job tracker, but may impose a performance penalty.  This flag is automatically set to true for jobs with hive.exec.dynamic.partition set to true.</description>
+  <name>hive.counters.group.name</name>
+  <value>HIVE</value>
+  <description>The name of counter group for internal hive variables(CREATED_FILE, FATAL_ERROR, etc.)</description>
 </property>
 
 <property>
@@ -1203,8 +1203,8 @@
 
 <property>
   <name>hive.stats.dbclass</name>
-  <value>jdbc:derby</value>
-  <description>The default database that stores temporary hive statistics.</description>
+  <value>counter</value>
+  <description>The storage that stores temporary hive statistics. Currently, jdbc, hbase, counter and custom type is supported</description>
 </property>
 
 <property>
@@ -1228,13 +1228,13 @@
 <property>
   <name>hive.stats.default.publisher</name>
   <value></value>
-  <description>The Java class (implementing the StatsPublisher interface) that is used by default if hive.stats.dbclass is not JDBC or HBase.</description>
+  <description>The Java class (implementing the StatsPublisher interface) that is used by default if hive.stats.dbclass is custom type.</description>
 </property>
 
 <property>
   <name>hive.stats.default.aggregator</name>
   <value></value>
-  <description>The Java class (implementing the StatsAggregator interface) that is used by default if hive.stats.dbclass is not JDBC or HBase.</description>
+  <description>The Java class (implementing the StatsAggregator interface) that is used by default if hive.stats.dbclass is custom type.</description>
 </property>
 
 <property>
@@ -1786,6 +1786,26 @@
 </property>
 
 <property>
+  <name>hive.fetch.task.conversion.threshold</name>
+  <value>-1</value>
+  <description>
+    Input threshold for applying hive.fetch.task.conversion. If target table is native, input length
+    is calculated by summation of file lengths. If it's not native, storage handler for the table
+    can optionally implement org.apache.hadoop.hive.ql.metadata.InputEstimator interface.
+  </description>
+</property>
+
+<property>
+  <name>hive.fetch.task.aggr</name>
+  <value>false</value>
+  <description>
+    Aggregation queries with no group-by clause (for example, select count(*) from src) executes
+    final aggregations in single reduce task. If this is set true, hive delegates final aggregation
+    stage to fetch task, possibly decreasing the query time.
+  </description>
+</property>
+
+<property>
   <name>hive.cache.expr.evaluation</name>
   <value>true</value>
   <description>
@@ -1797,17 +1817,6 @@
 </property>
 
 
-
-<property>
-  <name>hive.fetch.task.conversion.threshold</name>
-  <value>-1</value>
-  <description>
-    Input threshold for applying hive.fetch.task.conversion. If target table is native, input length
-    is calculated by summation of file lengths. If it's not native, storage handler for the table
-    can optionally implement org.apache.hadoop.hive.ql.metadata.InputEstimator interface.
-  </description>
-</property>
-
 <property>
   <name>hive.hmshandler.retry.attempts</name>
   <value>1</value>
@@ -2065,6 +2074,24 @@
 </property>
 
 <property>
+  <name>hive.vectorized.groupby.maxentries</name>
+  <value>1000000</value>
+  <description>Max number of entries in the vector group by aggregation hashtables. Exceeding this will trigger a flush irrelevant of memory pressure condition.</description>
+</property>
+
+<property>
+  <name>hive.vectorized.groupby.checkinterval</name>
+  <value>100000</value>
+  <description>Number of entries added to the group by aggregation hash before a reocmputation of average entry size is performed.</description>
+</property>
+
+<property>
+  <name>hive.vectorized.groupby.flush.percent</name>
+  <value>0.1</value>
+  <description>Percent of entries in the group by aggregation hash flushed when the memory treshold is exceeded.</description>
+</property>
+
+<property>
   <name>hive.compute.query.using.stats</name>
   <value>false</value>
   <description>
@@ -2074,7 +2101,6 @@
   </description>
 </property>
 
-
 <property>
   <name>hive.metastore.schema.verification</name>
   <value>false</value>

Modified: hive/branches/tez/contrib/pom.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/contrib/pom.xml?rev=1545564&r1=1545563&r2=1545564&view=diff
==============================================================================
--- hive/branches/tez/contrib/pom.xml (original)
+++ hive/branches/tez/contrib/pom.xml Tue Nov 26 08:19:25 2013
@@ -32,6 +32,7 @@
   </properties>
 
   <dependencies>
+    <!-- dependencies are always listed in sorted order by groupId, artifectId -->
     <!-- intra-project -->
     <dependency>
       <groupId>org.apache.hive</groupId>

Modified: hive/branches/tez/data/conf/hive-site.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/data/conf/hive-site.xml?rev=1545564&r1=1545563&r2=1545564&view=diff
==============================================================================
--- hive/branches/tez/data/conf/hive-site.xml (original)
+++ hive/branches/tez/data/conf/hive-site.xml Tue Nov 26 08:19:25 2013
@@ -136,12 +136,6 @@
 </property>
 
 <property>
-  <name>hive.task.progress</name>
-  <value>false</value>
-  <description>Track progress of a task</description>
-</property>
-
-<property>
   <name>hive.support.concurrency</name>
   <value>true</value>
   <description>Whether hive supports concurrency or not. A zookeeper instance must be up and running for the default hive lock manager to support read-write locks.</description>
@@ -186,4 +180,9 @@
   <description>The default SerDe hive will use for the rcfile format</description>
 </property>
 
+<property>
+  <name>hive.stats.dbclass</name>
+  <value>jdbc:derby</value>
+  <description>The default storatge that stores temporary hive statistics. Currently, jdbc, hbase and counter type is supported</description>
+</property>
 </configuration>

Modified: hive/branches/tez/hbase-handler/pom.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/hbase-handler/pom.xml?rev=1545564&r1=1545563&r2=1545564&view=diff
==============================================================================
--- hive/branches/tez/hbase-handler/pom.xml (original)
+++ hive/branches/tez/hbase-handler/pom.xml Tue Nov 26 08:19:25 2013
@@ -32,6 +32,7 @@
   </properties>
 
   <dependencies>
+    <!-- dependencies are always listed in sorted order by groupId, artifectId -->
     <!-- intra-project -->
     <dependency>
       <groupId>org.apache.hive</groupId>

Modified: hive/branches/tez/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseStatsAggregator.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseStatsAggregator.java?rev=1545564&r1=1545563&r2=1545564&view=diff
==============================================================================
--- hive/branches/tez/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseStatsAggregator.java (original)
+++ hive/branches/tez/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseStatsAggregator.java Tue Nov 26 08:19:25 2013
@@ -32,6 +32,7 @@ import org.apache.hadoop.hbase.client.Re
 import org.apache.hadoop.hbase.client.Scan;
 import org.apache.hadoop.hbase.filter.PrefixFilter;
 import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.hadoop.hive.ql.exec.Task;
 import org.apache.hadoop.hive.ql.stats.StatsAggregator;
 
 
@@ -46,7 +47,7 @@ public class HBaseStatsAggregator implem
   /**
    * Does the necessary HBase initializations.
    */
-  public boolean connect(Configuration hiveconf) {
+  public boolean connect(Configuration hiveconf, Task<?> sourceTask) {
 
     try {
       htable = new HTable(HBaseConfiguration.create(hiveconf),

Modified: hive/branches/tez/hcatalog/bin/hcat
URL: http://svn.apache.org/viewvc/hive/branches/tez/hcatalog/bin/hcat?rev=1545564&r1=1545563&r2=1545564&view=diff
==============================================================================
--- hive/branches/tez/hcatalog/bin/hcat (original)
+++ hive/branches/tez/hcatalog/bin/hcat Tue Nov 26 08:19:25 2013
@@ -17,23 +17,23 @@
 # specific language governing permissions and limitations
 # under the License.
 
-# Resolve our absolute path                                                      
-# resolve links - $0 may be a softlink                                           
-this="${BASH_SOURCE-$0}"                                                         
-while [ -h "$this" ]; do                                                         
-    ls=`ls -ld "$this"`                                                          
-    link=`expr "$ls" : '.*-> \(.*\)$'`                                           
-    if expr "$link" : '.*/.*' > /dev/null; then                                  
-        this="$link"                                                             
-    else                                                                         
-        this=`dirname "$this"`/"$link"                                           
-    fi                                                                           
-done                                                                             
-                                                                                 
-# convert relative path to absolute path                                         
-bin=`dirname "$this"`                                                            
-script=`basename "$this"`                                                        
-bin=`unset CDPATH; cd "$bin"; pwd`                                               
+# Resolve our absolute path
+# resolve links - $0 may be a softlink
+this="${BASH_SOURCE-$0}"
+while [ -h "$this" ]; do
+    ls=`ls -ld "$this"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '.*/.*' > /dev/null; then
+        this="$link"
+    else
+        this=`dirname "$this"`/"$link"
+    fi
+done
+
+# convert relative path to absolute path
+bin=`dirname "$this"`
+script=`basename "$this"`
+bin=`unset CDPATH; cd "$bin"; pwd`
 this="$bin/$script"
 #to preserve value of 'this' since any other file that defines 'this' and is sourced
 #here (e.g. hcat-config.sh) will overwrite it
@@ -113,11 +113,11 @@ fi
 
 # Find our hcatalog jar
 shopt -s extglob
-if [ "$(ls -1 $HCAT_PREFIX/share/hcatalog/hcatalog-core-[0-9]*.jar | wc -l)" -ne 1 ]; then
-    echo "Error: did not find exactly one hcatalog-core jar in $HCAT_PREFIX/share/hcatalog"
+if [ "$(ls -1 $HCAT_PREFIX/share/hcatalog/hive-hcatalog-core-[0-9]*.jar | wc -l)" -ne 1 ]; then
+    echo "Error: did not find exactly one hive-hcatalog-core jar in $HCAT_PREFIX/share/hcatalog"
     exit 1
 fi
-HCAT_JAR=`ls $HCAT_PREFIX/share/hcatalog/hcatalog-core-[0-9]*.jar`
+HCAT_JAR=`ls $HCAT_PREFIX/share/hcatalog/hive-hcatalog-core-[0-9]*.jar`
 
 # Find the storage-handler jars.
 for jar in ${HCAT_PREFIX}/share/hcatalog/storage-handlers/*/lib/*.jar ; do
@@ -137,7 +137,7 @@ if [ -d "${HIVE_AUX_JARS_PATH}" ]; then
     fi
     HADOOP_CLASSPATH=${HADOOP_CLASSPATH}:$f
   done
-elif [ "${HIVE_AUX_JARS_PATH}" != "" ]; then 
+elif [ "${HIVE_AUX_JARS_PATH}" != "" ]; then
   HIVE_AUX_JARS_PATH=`echo $HIVE_AUX_JARS_PATH | sed 's/,/:/g'`
   HADOOP_CLASSPATH=$HADOOP_CLASSPATH:$HIVE_AUX_JARS_PATH
 fi

Modified: hive/branches/tez/hcatalog/bin/hcat.py
URL: http://svn.apache.org/viewvc/hive/branches/tez/hcatalog/bin/hcat.py?rev=1545564&r1=1545563&r2=1545564&view=diff
==============================================================================
--- hive/branches/tez/hcatalog/bin/hcat.py (original)
+++ hive/branches/tez/hcatalog/bin/hcat.py Tue Nov 26 08:19:25 2013
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -15,8 +16,8 @@
 # specific language governing permissions and limitations
 # under the License.
 
-# Resolve our absolute path                                                      
-# resolve links - $0 may be a softlink                                           
+# Resolve our absolute path
+# resolve links - $0 may be a softlink
 
 import os
 import sys
@@ -55,7 +56,7 @@ except ValueError:
 hcatcfg.findHive()
 if 'HIVE_HOME' not in os.environ:
   sys.exit("Hive not found.  Set HIVE_HOME to directory containing Hive.")
-    
+
 if 'HIVE_LIB_DIR' not in os.environ:
   sys.exit("Cannot find lib dir within HIVE_HOME %s" % (os.environ['HIVE_HOME'] + os.path.sep + "lib"))
 
@@ -66,13 +67,13 @@ if 'HIVE_CONF_DIR' not in os.environ:
 # find the hcatalog jar and add it to hadoop classpath
 hcatPrefix = hcatcfg.findHCatPrefix(bindir)
 
-hcatJars = glob.glob(os.path.join(hcatPrefix, 'share', 'hcatalog', 'hcatalog-core-*.jar'))
+hcatJars = glob.glob(os.path.join(hcatPrefix, 'share', 'hcatalog', 'hive-hcatalog-core-*.jar'))
 
 if len(hcatJars) > 1:
   sys.exit("Found more than one hcatalog jar in the prefix path")
 
 if len(hcatJars) < 1:
-  sys.exit("HCatalog jar not found in directory %s" % (os.path.join(hcatPrefix, 'share', 'hcatalog', 'hcatalog-core-*.jar')))
+  sys.exit("HCatalog jar not found in directory %s" % (os.path.join(hcatPrefix, 'share', 'hcatalog', 'hive-hcatalog-core-*.jar')))
 
 if 'HADOOP_CLASSPATH' not in os.environ:
   os.putenv('HADOOP_CLASSPATH', '')
@@ -100,7 +101,7 @@ os.environ['HADOOP_CLASSPATH'] += os.pat
 
 # if the hbase conf dir is present in the environment, add it.
 # there are no checks to see if that path exists
-# FIXME add check - original shell script does not do much if the path 
+# FIXME add check - original shell script does not do much if the path
 # does not exist either
 try:
   if os.environ['HBASE_CONF_DIR'] != "":

Modified: hive/branches/tez/hcatalog/bin/hcat_server.py
URL: http://svn.apache.org/viewvc/hive/branches/tez/hcatalog/bin/hcat_server.py?rev=1545564&r1=1545563&r2=1545564&view=diff
==============================================================================
--- hive/branches/tez/hcatalog/bin/hcat_server.py (original)
+++ hive/branches/tez/hcatalog/bin/hcat_server.py Tue Nov 26 08:19:25 2013
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -40,7 +41,6 @@ def start_hcat():
       pidWords = line.split()
       for pidStr in pidWords:
         pid = int(pidStr.rstrip('\n'))
-        
     pidFileDesc.close()
   # check if service is already running, if so exit
     os.kill(pid, 0)
@@ -57,7 +57,7 @@ def start_hcat():
   #      n
   #      s/.*<value>\(.*\)<\/value>.*/\1/p
   #      }' $HIVE_SITE_XML`
-  #  HADOOP_OPTS="$HADOOP_OPTS -Dhive.metastore.warehouse.dir=$WAREHOUSE_DIR " 
+  #  HADOOP_OPTS="$HADOOP_OPTS -Dhive.metastore.warehouse.dir=$WAREHOUSE_DIR "
 
   # add in hive-site.xml to classpath
   if 'AUX_CLASSPATH' not in os.environ:
@@ -115,7 +115,7 @@ def start_hcat():
   except Exception as inst:
     print inst
     sys.exit("Metastore startup failed, see %s" % (errFile))
-  
+
   return
 
 def stop_hcat():
@@ -139,7 +139,6 @@ def stop_hcat():
   if kill == True:
     try:
       os.kill(pid, 9)
-      
     except:
       sys.exit("Failed to stop metastore server")
 

Modified: hive/branches/tez/hcatalog/bin/hcat_server.sh
URL: http://svn.apache.org/viewvc/hive/branches/tez/hcatalog/bin/hcat_server.sh?rev=1545564&r1=1545563&r2=1545564&view=diff
==============================================================================
--- hive/branches/tez/hcatalog/bin/hcat_server.sh (original)
+++ hive/branches/tez/hcatalog/bin/hcat_server.sh Tue Nov 26 08:19:25 2013
@@ -61,7 +61,7 @@ function start_hcat() {
 #      n
 #      s/.*<value>\(.*\)<\/value>.*/\1/p
 #      }' $HIVE_SITE_XML`
-#  HADOOP_OPTS="$HADOOP_OPTS -Dhive.metastore.warehouse.dir=$WAREHOUSE_DIR " 
+#  HADOOP_OPTS="$HADOOP_OPTS -Dhive.metastore.warehouse.dir=$WAREHOUSE_DIR "
 
   # add in hive-site.xml to classpath
   AUX_CLASSPATH=${AUX_CLASSPATH}:`dirname ${HIVE_SITE_XML}`
@@ -100,7 +100,7 @@ function start_hcat() {
   echo Started metastore server init, testing if initialized correctly...
   sleep $SLEEP_TIME_AFTER_START
 
-  if ps -p $PID > /dev/null 
+  if ps -p $PID > /dev/null
   then
     echo $PID > $PID_FILE
     echo "Metastore initialized successfully on port[${METASTORE_PORT}]."

Modified: hive/branches/tez/hcatalog/bin/hcatcfg.py
URL: http://svn.apache.org/viewvc/hive/branches/tez/hcatalog/bin/hcatcfg.py?rev=1545564&r1=1545563&r2=1545564&view=diff
==============================================================================
--- hive/branches/tez/hcatalog/bin/hcatcfg.py (original)
+++ hive/branches/tez/hcatalog/bin/hcatcfg.py Tue Nov 26 08:19:25 2013
@@ -15,8 +15,8 @@
 # specific language governing permissions and limitations
 # under the License.
 
-# Resolve our absolute path                                                      
-# resolve links - $0 may be a softlink                                           
+# Resolve our absolute path
+# resolve links - $0 may be a softlink
 
 import os.path
 import sys

Modified: hive/branches/tez/hcatalog/core/pom.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/hcatalog/core/pom.xml?rev=1545564&r1=1545563&r2=1545564&view=diff
==============================================================================
--- hive/branches/tez/hcatalog/core/pom.xml (original)
+++ hive/branches/tez/hcatalog/core/pom.xml Tue Nov 26 08:19:25 2013
@@ -38,6 +38,7 @@
   </properties>
 
   <dependencies>
+    <!-- dependencies are always listed in sorted order by groupId, artifectId -->
     <!-- intra-project -->
     <dependency>
       <groupId>org.apache.hive</groupId>

Modified: hive/branches/tez/hcatalog/core/src/test/java/org/apache/hcatalog/cli/TestUseDatabase.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/hcatalog/core/src/test/java/org/apache/hcatalog/cli/TestUseDatabase.java?rev=1545564&r1=1545563&r2=1545564&view=diff
==============================================================================
--- hive/branches/tez/hcatalog/core/src/test/java/org/apache/hcatalog/cli/TestUseDatabase.java (original)
+++ hive/branches/tez/hcatalog/core/src/test/java/org/apache/hcatalog/cli/TestUseDatabase.java Tue Nov 26 08:19:25 2013
@@ -18,6 +18,7 @@
  */
 package org.apache.hcatalog.cli;
 
+import java.io.File;
 import java.io.IOException;
 
 import junit.framework.TestCase;
@@ -63,7 +64,10 @@ public class TestUseDatabase extends Tes
 
     CommandProcessorResponse response;
 
-    response = hcatDriver.run("alter table " + tblName + " add partition (b='2') location '/tmp'");
+    String tmpDir = System.getProperty("test.tmp.dir");
+    File dir = new File(tmpDir + "/hive-junit-" + System.nanoTime());
+    dir.mkdir();
+    response = hcatDriver.run("alter table " + tblName + " add partition (b='2') location '" + dir.getAbsolutePath() + "'");
     assertEquals(0, response.getResponseCode());
     assertNull(response.getErrorMessage());
 

Modified: hive/branches/tez/hcatalog/core/src/test/java/org/apache/hive/hcatalog/cli/TestUseDatabase.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/hcatalog/core/src/test/java/org/apache/hive/hcatalog/cli/TestUseDatabase.java?rev=1545564&r1=1545563&r2=1545564&view=diff
==============================================================================
--- hive/branches/tez/hcatalog/core/src/test/java/org/apache/hive/hcatalog/cli/TestUseDatabase.java (original)
+++ hive/branches/tez/hcatalog/core/src/test/java/org/apache/hive/hcatalog/cli/TestUseDatabase.java Tue Nov 26 08:19:25 2013
@@ -18,6 +18,7 @@
  */
 package org.apache.hive.hcatalog.cli;
 
+import java.io.File;
 import java.io.IOException;
 
 import junit.framework.TestCase;
@@ -61,7 +62,9 @@ public class TestUseDatabase extends Tes
 
     CommandProcessorResponse response;
 
-    response = hcatDriver.run("alter table " + tblName + " add partition (b='2') location '/tmp'");
+    String tmpDir = System.getProperty("test.tmp.dir");
+    File dir = new File(tmpDir + "/hive-junit-" + System.nanoTime());
+    response = hcatDriver.run("alter table " + tblName + " add partition (b='2') location '" + dir.getAbsolutePath() + "'");
     assertEquals(0, response.getResponseCode());
     assertNull(response.getErrorMessage());
 

Modified: hive/branches/tez/hcatalog/hcatalog-pig-adapter/pom.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/hcatalog/hcatalog-pig-adapter/pom.xml?rev=1545564&r1=1545563&r2=1545564&view=diff
==============================================================================
--- hive/branches/tez/hcatalog/hcatalog-pig-adapter/pom.xml (original)
+++ hive/branches/tez/hcatalog/hcatalog-pig-adapter/pom.xml Tue Nov 26 08:19:25 2013
@@ -38,6 +38,7 @@
   </properties>
 
   <dependencies>
+    <!-- dependencies are always listed in sorted order by groupId, artifectId -->
     <!-- intra-project -->
     <dependency>
       <groupId>org.apache.hive.hcatalog</groupId>

Modified: hive/branches/tez/hcatalog/server-extensions/pom.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/hcatalog/server-extensions/pom.xml?rev=1545564&r1=1545563&r2=1545564&view=diff
==============================================================================
--- hive/branches/tez/hcatalog/server-extensions/pom.xml (original)
+++ hive/branches/tez/hcatalog/server-extensions/pom.xml Tue Nov 26 08:19:25 2013
@@ -38,6 +38,7 @@
   </properties>
 
   <dependencies>
+    <!-- dependencies are always listed in sorted order by groupId, artifectId -->
     <!-- intra-project -->
     <dependency>
       <groupId>org.apache.hive.hcatalog</groupId>

Modified: hive/branches/tez/hcatalog/storage-handlers/hbase/pom.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/hcatalog/storage-handlers/hbase/pom.xml?rev=1545564&r1=1545563&r2=1545564&view=diff
==============================================================================
--- hive/branches/tez/hcatalog/storage-handlers/hbase/pom.xml (original)
+++ hive/branches/tez/hcatalog/storage-handlers/hbase/pom.xml Tue Nov 26 08:19:25 2013
@@ -38,6 +38,7 @@
   </properties>
 
   <dependencies>
+    <!-- dependencies are always listed in sorted order by groupId, artifectId -->
     <!-- intra-project -->
     <dependency>
       <groupId>org.apache.hive</groupId>
@@ -85,12 +86,6 @@
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-core</artifactId>
-      <version>1.3</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <profiles>
@@ -256,6 +251,7 @@
       </resource>
     </resources>
     <plugins>
+      <!-- plugins are always listed in sorted order by groupId, artifectId -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>

Modified: hive/branches/tez/hcatalog/webhcat/java-client/pom.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/hcatalog/webhcat/java-client/pom.xml?rev=1545564&r1=1545563&r2=1545564&view=diff
==============================================================================
--- hive/branches/tez/hcatalog/webhcat/java-client/pom.xml (original)
+++ hive/branches/tez/hcatalog/webhcat/java-client/pom.xml Tue Nov 26 08:19:25 2013
@@ -38,6 +38,7 @@
   </properties>
 
   <dependencies>
+    <!-- dependencies are always listed in sorted order by groupId, artifectId -->
     <!-- intra-project -->
     <dependency>
       <groupId>org.apache.hive.hcatalog</groupId>

Modified: hive/branches/tez/hcatalog/webhcat/svr/pom.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/hcatalog/webhcat/svr/pom.xml?rev=1545564&r1=1545563&r2=1545564&view=diff
==============================================================================
--- hive/branches/tez/hcatalog/webhcat/svr/pom.xml (original)
+++ hive/branches/tez/hcatalog/webhcat/svr/pom.xml Tue Nov 26 08:19:25 2013
@@ -38,7 +38,7 @@
   </properties>
 
   <dependencies>
-
+    <!-- dependencies are always listed in sorted order by groupId, artifectId -->
     <!-- intra-project -->
     <dependency>
       <groupId>org.apache.hive.hcatalog</groupId>

Modified: hive/branches/tez/hcatalog/webhcat/svr/src/main/bin/webhcat_config.sh
URL: http://svn.apache.org/viewvc/hive/branches/tez/hcatalog/webhcat/svr/src/main/bin/webhcat_config.sh?rev=1545564&r1=1545563&r2=1545564&view=diff
==============================================================================
--- hive/branches/tez/hcatalog/webhcat/svr/src/main/bin/webhcat_config.sh (original)
+++ hive/branches/tez/hcatalog/webhcat/svr/src/main/bin/webhcat_config.sh Tue Nov 26 08:19:25 2013
@@ -42,7 +42,7 @@ ERROR_LOG=${WEBHCAT_LOG_DIR}/webhcat-con
 CONSOLE_LOG=${WEBHCAT_LOG_DIR}/webhcat-console.log
 
 # The name of the webhcat jar file
-WEBHCAT_JAR='webhcat-*.jar'
+WEBHCAT_JAR='hive-webhcat-*.jar'
 
 # How long to wait before testing that the process started correctly
 SLEEP_TIME_AFTER_START=10

Modified: hive/branches/tez/hcatalog/webhcat/svr/src/main/bin/webhcat_server.sh
URL: http://svn.apache.org/viewvc/hive/branches/tez/hcatalog/webhcat/svr/src/main/bin/webhcat_server.sh?rev=1545564&r1=1545563&r2=1545564&view=diff
==============================================================================
--- hive/branches/tez/hcatalog/webhcat/svr/src/main/bin/webhcat_server.sh (original)
+++ hive/branches/tez/hcatalog/webhcat/svr/src/main/bin/webhcat_server.sh Tue Nov 26 08:19:25 2013
@@ -58,7 +58,7 @@ function log() {
 
 # return(print) the webhcat jar
 function find_jar_path() {
-         for dir in "." "build" "share/webhcat/svr/"; do
+         for dir in "." "build" "share/webhcat/svr/lib"; do
                 if (( `ls -1 $base_dir/$dir/$WEBHCAT_JAR 2>/dev/null| wc -l ` > 1 )) ; then
                        echo "Error:  found more than one hcatalog jar in $base_dir/$dir/$WEBHCAT_JAR"
                        exit 1

Modified: hive/branches/tez/hwi/pom.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/hwi/pom.xml?rev=1545564&r1=1545563&r2=1545564&view=diff
==============================================================================
--- hive/branches/tez/hwi/pom.xml (original)
+++ hive/branches/tez/hwi/pom.xml Tue Nov 26 08:19:25 2013
@@ -32,6 +32,7 @@
   </properties>
 
   <dependencies>
+    <!-- dependencies are always listed in sorted order by groupId, artifectId -->
     <!-- intra-project -->
     <dependency>
       <groupId>org.apache.hive</groupId>
@@ -99,6 +100,7 @@
         <activeByDefault>true</activeByDefault>
       </activation>
       <dependencies>
+    <!-- dependencies are always listed in sorted order by groupId, artifectId -->
         <dependency>
           <groupId>org.apache.hadoop</groupId>
           <artifactId>hadoop-core</artifactId>
@@ -110,6 +112,7 @@
    <profile>
       <id>hadoop-2</id>
       <dependencies>
+    <!-- dependencies are always listed in sorted order by groupId, artifectId -->
         <dependency>
           <groupId>org.apache.hadoop</groupId>
           <artifactId>hadoop-common</artifactId>
@@ -124,6 +127,7 @@
     <sourceDirectory>${basedir}/src/java</sourceDirectory>
     <testSourceDirectory>${basedir}/src/test</testSourceDirectory>
     <plugins>
+    <!-- plugins are always listed in sorted order by groupId, artifectId -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>

Modified: hive/branches/tez/itests/hcatalog-unit/pom.xml
URL: http://svn.apache.org/viewvc/hive/branches/tez/itests/hcatalog-unit/pom.xml?rev=1545564&r1=1545563&r2=1545564&view=diff
==============================================================================
--- hive/branches/tez/itests/hcatalog-unit/pom.xml (original)
+++ hive/branches/tez/itests/hcatalog-unit/pom.xml Tue Nov 26 08:19:25 2013
@@ -38,6 +38,7 @@
   </properties>
 
   <dependencies>
+    <!-- dependencies are always listed in sorted order by groupId, artifectId -->
     <!-- test intra-project -->
     <dependency>
       <groupId>org.apache.hive.hcatalog</groupId>



Mime
View raw message