Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/hive
Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/9763c9dd Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/9763c9dd Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/9763c9dd Branch: refs/heads/llap Commit: 9763c9dd31bd5939db3ca50e75bb97955b411f6d Parents: da95f63 8f930e5 Author: Dmitry Tolpeko <dmtolp...@gmail.com> Authored: Tue Sep 1 05:00:33 2015 -0700 Committer: Dmitry Tolpeko <dmtolp...@gmail.com> Committed: Tue Sep 1 05:00:33 2015 -0700 ---------------------------------------------------------------------- .../java/org/apache/hive/beeline/BeeLine.java | 13 +- .../org/apache/hive/beeline/BeeLineOpts.java | 12 +- .../org/apache/hive/beeline/HiveSchemaTool.java | 14 +- .../org/apache/hadoop/hive/conf/HiveConf.java | 76 +- data/conf/tez/hive-site.xml | 9 + .../hive/hbase/HiveHBaseInputFormatUtil.java | 50 +- .../queries/positive/hbase_null_first_col.q | 22 + .../results/positive/hbase_null_first_col.q.out | 109 ++ .../vectorization/VectorizationBench.java | 93 + .../org/apache/hive/jdbc/HiveConnection.java | 30 +- jdbc/src/java/org/apache/hive/jdbc/Utils.java | 117 +- .../hive/jdbc/ZooKeeperHiveClientHelper.java | 104 +- .../hadoop/hive/metastore/HiveAlterHandler.java | 2 +- .../hadoop/hive/metastore/HiveMetaStore.java | 6 +- .../hive/metastore/MetaStoreDirectSql.java | 40 +- .../hadoop/hive/metastore/MetaStoreUtils.java | 17 +- .../hadoop/hive/ql/exec/FunctionRegistry.java | 61 +- .../hadoop/hive/ql/exec/ScriptOperator.java | 85 +- .../hive/ql/exec/tez/TezSessionState.java | 2 + .../ql/exec/vector/VectorHashKeyWrapper.java | 2 +- .../ql/exec/vector/VectorizationContext.java | 7 +- .../expressions/CastStringGroupToString.java | 40 + .../ql/exec/vector/expressions/ColAndCol.java | 34 +- .../ql/exec/vector/expressions/ColOrCol.java | 42 +- .../exec/vector/expressions/CuckooSetBytes.java | 2 +- .../hive/ql/exec/vector/expressions/NotCol.java | 14 +- ...VectorMapJoinInnerBigOnlyStringOperator.java | 4 +- .../VectorMapJoinInnerStringOperator.java | 4 +- .../VectorMapJoinLeftSemiStringOperator.java | 4 +- .../VectorMapJoinOuterStringOperator.java | 4 +- .../apache/hadoop/hive/ql/io/orc/FileDump.java | 48 +- .../hadoop/hive/ql/io/orc/OrcInputFormat.java | 18 +- .../apache/hadoop/hive/ql/io/orc/Reader.java | 6 + .../hadoop/hive/ql/io/orc/ReaderImpl.java | 281 ++- .../hadoop/hive/ql/io/orc/RecordReaderImpl.java | 2 - .../hive/ql/io/orc/TreeReaderFactory.java | 18 +- .../hive/ql/io/parquet/LeafFilterFactory.java | 43 +- .../read/ParquetFilterPredicateConverter.java | 35 +- .../hive/ql/io/sarg/ConvertAstToSearchArg.java | 3 - .../hadoop/hive/ql/lib/DefaultGraphWalker.java | 80 +- .../hadoop/hive/ql/lib/ForwardWalker.java | 33 +- .../ql/metadata/SessionHiveMetaStoreClient.java | 2 +- .../hadoop/hive/ql/optimizer/ColumnPruner.java | 6 +- .../hive/ql/optimizer/ConstantPropagate.java | 10 +- .../optimizer/ConstantPropagateProcFactory.java | 100 +- .../hadoop/hive/ql/optimizer/IndexUtils.java | 13 +- .../hadoop/hive/ql/optimizer/Optimizer.java | 17 +- .../hive/ql/optimizer/PointLookupOptimizer.java | 102 +- .../calcite/translator/HiveOpConverter.java | 53 +- .../ql/parse/ColumnStatsSemanticAnalyzer.java | 6 +- .../hadoop/hive/ql/parse/LeadLagInfo.java | 4 +- .../hive/ql/parse/LoadSemanticAnalyzer.java | 38 +- .../hadoop/hive/ql/plan/ExprNodeDesc.java | 23 +- .../hadoop/hive/ql/ppd/ExprWalkerInfo.java | 136 +- .../hive/ql/ppd/ExprWalkerProcFactory.java | 92 +- .../hadoop/hive/ql/ppd/OpProcFactory.java | 11 +- .../hadoop/hive/ql/udf/generic/GenericUDF.java | 14 +- .../ql/udf/generic/GenericUDFBaseNumeric.java | 4 +- .../hive/ql/udf/generic/GenericUDFBasePad.java | 8 +- .../hive/ql/udf/generic/GenericUDFNvl.java | 2 +- .../hive/ql/udf/generic/GenericUDFOPAnd.java | 4 + .../hive/ql/udf/generic/GenericUDFOPEqual.java | 4 + .../generic/GenericUDFOPEqualOrGreaterThan.java | 4 + .../generic/GenericUDFOPEqualOrLessThan.java | 4 + .../ql/udf/generic/GenericUDFOPGreaterThan.java | 4 + .../ql/udf/generic/GenericUDFOPLessThan.java | 4 + .../ql/udf/generic/GenericUDFOPNotEqual.java | 5 + .../ql/udf/generic/GenericUDFOPNotNull.java | 4 + .../hive/ql/udf/generic/GenericUDFOPNull.java | 4 + .../hive/ql/udf/generic/GenericUDFOPOr.java | 4 + ql/src/main/resources/tez-container-log4j2.xml | 49 + .../apache/hadoop/hive/ql/TestTxnCommands2.java | 85 +- .../hadoop/hive/ql/exec/TestOperators.java | 16 + .../hive/ql/io/orc/TestInputOutputFormat.java | 4 +- .../hadoop/hive/ql/io/orc/TestOrcFile.java | 10 +- .../hive/ql/io/orc/TestRecordReaderImpl.java | 42 +- .../parquet/TestParquetRecordReaderWrapper.java | 50 +- .../read/TestParquetFilterPredicate.java | 27 +- .../ql/io/sarg/TestConvertAstToSearchArg.java | 128 +- .../hive/ql/io/sarg/TestSearchArgumentImpl.java | 22 +- .../queries/clientnegative/load_orc_negative3.q | 6 + .../queries/clientnegative/nvl_mismatch_type.q | 20 + .../clientpositive/cbo_rp_outer_join_ppr.q | 40 + .../clientpositive/columnstats_quoting.q | 8 + .../queries/clientpositive/flatten_and_or.q | 4 +- .../queries/clientpositive/folder_predicate.q | 32 + .../test/queries/clientpositive/load_orc_part.q | 4 + .../clientpositive/parquet_ppd_partition.q | 9 + .../clientpositive/parquet_predicate_pushdown.q | 297 +++- .../test/queries/clientpositive/pointlookup.q | 59 + .../test/queries/clientpositive/pointlookup2.q | 51 + .../queries/clientpositive/selectDistinctStar.q | 2 + ql/src/test/queries/clientpositive/structin.q | 6 + .../clientpositive/unionall_unbalancedppd.q | 3 + .../clientpositive/vector_cast_constant.q | 4 +- .../queries/clientpositive/vectorized_casts.q | 6 + .../clientnegative/char_pad_convert_fail0.q.out | 2 +- .../clientnegative/char_pad_convert_fail1.q.out | 2 +- .../clientnegative/char_pad_convert_fail3.q.out | 2 +- .../clientnegative/load_orc_negative3.q.out | 25 + .../clientnegative/nvl_mismatch_type.q.out | 43 + .../alter_partition_coltype.q.out | 12 +- .../clientpositive/annotate_stats_filter.q.out | 18 +- .../cbo_rp_outer_join_ppr.q.java1.7.out | 855 +++++++++ .../clientpositive/columnstats_quoting.q.out | 114 ++ .../results/clientpositive/decimal_udf.q.out | 18 +- .../clientpositive/filter_cond_pushdown.q.out | 32 +- .../clientpositive/filter_join_breaktask.q.out | 12 +- .../results/clientpositive/flatten_and_or.q.out | 8 +- .../test/results/clientpositive/fold_when.q.out | 16 +- .../clientpositive/folder_predicate.q.out | 368 ++++ .../clientpositive/input_testxpath2.q.out | 2 +- .../list_bucket_query_oneskew_3.q.out | 6 +- .../results/clientpositive/load_orc_part.q.out | 18 + .../clientpositive/parquet_ppd_partition.q.out | 47 + .../parquet_predicate_pushdown.q.out | 1309 +++++++++++++- ql/src/test/results/clientpositive/pcr.q.out | 12 +- .../results/clientpositive/pointlookup.q.out | 198 +++ .../results/clientpositive/pointlookup2.q.out | 1647 ++++++++++++++++++ .../results/clientpositive/ppd_transform.q.out | 12 +- .../clientpositive/rand_partitionpruner3.q.out | 12 +- .../clientpositive/selectDistinctStar.q.out | 8 +- .../clientpositive/select_unquote_not.q.out | 8 +- .../spark/filter_join_breaktask.q.out | 12 +- .../test/results/clientpositive/spark/pcr.q.out | 12 +- .../clientpositive/spark/ppd_transform.q.out | 12 +- .../spark/vector_cast_constant.q.java1.7.out | 41 +- .../clientpositive/spark/vectorized_case.q.out | 2 +- .../test/results/clientpositive/structin.q.out | 44 + .../clientpositive/tez/explainuser_1.q.out | 2 +- .../tez/filter_join_breaktask.q.out | 12 +- .../clientpositive/tez/selectDistinctStar.q.out | 8 +- .../tez/vector_cast_constant.q.java1.7.out | 21 +- .../tez/vector_char_mapjoin1.q.out | 1 + .../clientpositive/tez/vector_decimal_udf.q.out | 24 +- .../tez/vector_varchar_mapjoin1.q.out | 1 + .../clientpositive/tez/vectorized_case.q.out | 2 +- .../clientpositive/tez/vectorized_casts.q.out | 99 +- .../clientpositive/udf_isnull_isnotnull.q.out | 2 +- .../test/results/clientpositive/udf_size.q.out | 2 +- .../clientpositive/unionall_unbalancedppd.q.out | 14 +- .../vector_cast_constant.q.java1.7.out | 32 +- .../clientpositive/vector_char_mapjoin1.q.out | 1 + .../clientpositive/vector_decimal_udf.q.out | 24 +- .../vector_varchar_mapjoin1.q.out | 1 + .../clientpositive/vectorized_case.q.out | 9 +- .../clientpositive/vectorized_casts.q.out | 66 +- .../serde2/avro/AvroLazyObjectInspector.java | 19 +- .../hadoop/hive/serde2/avro/InstanceCache.java | 17 +- .../objectinspector/ObjectInspectorFactory.java | 61 +- .../ReflectionStructObjectInspector.java | 60 +- .../StandardStructObjectInspector.java | 7 +- .../ThriftUnionObjectInspector.java | 28 +- .../avro/TestAvroLazyObjectInspector.java | 59 + .../TestReflectionObjectInspectors.java | 71 +- .../apache/hive/service/server/HiveServer2.java | 74 +- shims/0.20S/pom.xml | 8 +- .../hadoop/hive/shims/Hadoop20SShims.java | 35 +- shims/0.23/pom.xml | 21 +- .../apache/hadoop/hive/shims/Hadoop23Shims.java | 79 +- .../apache/hadoop/hive/shims/HadoopShims.java | 22 + .../hadoop/hive/shims/HadoopShimsSecure.java | 32 + .../hadoop/hive/ql/io/sarg/PredicateLeaf.java | 3 +- 163 files changed, 7857 insertions(+), 1241 deletions(-) ----------------------------------------------------------------------