HIVE-12433: Merge master into spark 11/17/2015
Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/50b62ca6 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/50b62ca6 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/50b62ca6 Branch: refs/heads/master Commit: 50b62ca6b3b52c56c030d24ee93e457765221c2a Parents: c771306 2ff433f Author: Xuefu Zhang <[email protected]> Authored: Tue Nov 17 08:01:45 2015 -0800 Committer: Xuefu Zhang <[email protected]> Committed: Tue Nov 17 08:01:45 2015 -0800 ---------------------------------------------------------------------- accumulo-handler/pom.xml | 12 +- .../apache/hive/beeline/cli/TestHiveCli.java | 7 +- beeline/src/test/resources/hive-site.xml | 11 + .../hadoop/hive/cli/OptionsProcessor.java | 22 +- common/pom.xml | 24 +- .../apache/hadoop/hive/common/JavaUtils.java | 11 +- .../org/apache/hadoop/hive/conf/HiveConf.java | 10 +- data/conf/hive-site.xml | 10 + data/conf/llap/hive-site.xml | 10 + data/conf/spark/standalone/hive-site.xml | 10 + data/conf/spark/yarn-client/hive-site.xml | 11 + data/conf/tez/hive-site.xml | 10 + data/files/parquet_type_promotion.txt | 4 + hbase-handler/pom.xml | 44 +- .../test/queries/positive/hbase_binary_binary.q | 12 + .../results/positive/hbase_binary_binary.q.out | 54 + hcatalog/core/pom.xml | 64 +- hcatalog/hcatalog-pig-adapter/pom.xml | 24 +- hcatalog/streaming/pom.xml | 20 + hcatalog/webhcat/svr/pom.xml | 12 +- hwi/pom.xml | 12 +- itests/hcatalog-unit/pom.xml | 48 +- itests/hive-minikdc/pom.xml | 48 +- itests/hive-unit-hadoop2/pom.xml | 42 +- itests/hive-unit/pom.xml | 96 +- .../metastore/hbase/TestHBaseSchemaTool.java | 6 +- .../metastore/hbase/TestHBaseSchemaTool2.java | 4 +- .../cli/session/TestHiveSessionImpl.java | 1 + itests/qtest-accumulo/pom.xml | 84 +- itests/qtest-spark/pom.xml | 50 + itests/qtest/pom.xml | 72 +- itests/util/pom.xml | 24 +- llap-client/pom.xml | 24 +- llap-server/pom.xml | 58 +- metastore/pom.xml | 36 +- .../upgrade/mysql/022-HIVE-11970.mysql.sql | 12 +- .../upgrade/mysql/hive-schema-1.3.0.mysql.sql | 2 +- .../upgrade/mysql/hive-schema-2.0.0.mysql.sql | 2 +- .../hive/metastore/hbase/HBaseSchemaTool.java | 4 - pom.xml | 46 +- ql/pom.xml | 76 +- .../java/org/apache/hadoop/hive/ql/Driver.java | 10 +- .../apache/hadoop/hive/ql/exec/MoveTask.java | 63 +- .../apache/hadoop/hive/ql/exec/Utilities.java | 28 + .../hive/ql/exec/mr/HadoopJobExecHelper.java | 11 +- .../hive/ql/exec/tez/HiveSplitGenerator.java | 28 +- .../hadoop/hive/ql/io/HiveFileFormatUtils.java | 166 +- .../ql/io/SequenceFileInputFormatChecker.java | 3 +- .../hadoop/hive/ql/io/orc/OrcInputFormat.java | 4 + .../convert/DataWritableRecordConverter.java | 6 +- .../ql/io/parquet/convert/ETypeConverter.java | 78 +- .../convert/HiveCollectionConverter.java | 38 +- .../io/parquet/convert/HiveGroupConverter.java | 21 +- .../io/parquet/convert/HiveStructConverter.java | 86 +- .../hive/ql/io/parquet/convert/Repeated.java | 9 +- .../parquet/read/DataWritableReadSupport.java | 11 +- .../BucketingSortingReduceSinkOptimizer.java | 3 + .../optimizer/FixedBucketPruningOptimizer.java | 319 +++ .../hadoop/hive/ql/optimizer/Optimizer.java | 7 + .../hive/ql/optimizer/SkewJoinOptimizer.java | 27 +- .../ql/optimizer/calcite/HiveCalciteUtil.java | 20 +- .../rules/HiveAggregateJoinTransposeRule.java | 8 + .../translator/PlanModifierForASTConv.java | 10 +- .../hadoop/hive/ql/parse/GenTezUtils.java | 4 + .../hive/ql/parse/LoadSemanticAnalyzer.java | 49 +- .../org/apache/hadoop/hive/ql/plan/MapWork.java | 14 + .../hadoop/hive/ql/plan/TableScanDesc.java | 39 + .../udf/generic/GenericUDFFromUtcTimestamp.java | 11 +- .../queries/clientpositive/bucketpruning1.q | 97 + .../clientpositive/insertoverwrite_bucket.q | 12 + .../queries/clientpositive/parquet_columnar.q | 4 + .../clientpositive/parquet_type_promotion.q | 72 + .../test/queries/clientpositive/skewjoinopt21.q | 30 + .../special_character_in_tabnames_1.q | 2 +- .../special_character_in_tabnames_2.q | 2 + .../clientpositive/udf_from_utc_timestamp.q | 5 + .../clientnegative/archive_corrupt.q.out | 14 +- .../clientnegative/load_orc_negative1.q.out | 2 +- .../clientnegative/load_orc_negative2.q.out | 2 +- .../clientnegative/load_orc_negative3.q.out | 2 +- .../clientnegative/load_orc_negative_part.q.out | 2 +- .../clientnegative/load_wrong_fileformat.q.out | 7 +- .../load_wrong_fileformat_rc_seq.q.out | 7 +- .../load_wrong_fileformat_txt_seq.q.out | 7 +- .../results/clientpositive/bucketpruning1.q.out | 2282 +++++++++++++++++ .../clientpositive/insertoverwrite_bucket.q.out | 87 + .../clientpositive/parquet_columnar.q.out | 37 + .../clientpositive/parquet_type_promotion.q.out | 232 ++ .../results/clientpositive/skewjoinopt21.q.out | 230 ++ .../special_character_in_tabnames_2.q.out | 10 +- .../clientpositive/tez/bucketpruning1.q.out | 2360 ++++++++++++++++++ .../clientpositive/udf_from_utc_timestamp.q.out | 13 + serde/pom.xml | 24 +- .../hadoop/hive/serde2/lazy/LazyBinary.java | 2 +- .../hadoop/hive/serde2/lazy/LazyFactory.java | 3 + .../hadoop/hive/serde2/lazy/LazyUtils.java | 6 + .../hive/serde2/lazydio/LazyDioBinary.java | 51 + service/pom.xml | 12 +- .../hive/service/cli/operation/Operation.java | 23 + .../service/cli/operation/SQLOperation.java | 2 + .../service/cli/session/HiveSessionBase.java | 3 - .../service/cli/session/HiveSessionImpl.java | 14 + shims/0.23/pom.xml | 48 +- shims/common/pom.xml | 11 +- spark-client/pom.xml | 12 +- storage-api/pom.xml | 12 +- 106 files changed, 7542 insertions(+), 401 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/50b62ca6/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/50b62ca6/pom.xml ----------------------------------------------------------------------
