HIVE-10998 : LLAP: merge master into branch (Sergey Shelukhin)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/61cfda9c Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/61cfda9c Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/61cfda9c Branch: refs/heads/llap Commit: 61cfda9c3bace84836d9cda464986cef1a714d73 Parents: f8efa6f 5fd1167 Author: Sergey Shelukhin <[email protected]> Authored: Fri Jun 12 18:27:32 2015 -0700 Committer: Sergey Shelukhin <[email protected]> Committed: Fri Jun 12 18:27:32 2015 -0700 ---------------------------------------------------------------------- accumulo-handler/pom.xml | 2 +- .../accumulo/AccumuloConnectionParameters.java | 111 +- .../hive/accumulo/AccumuloStorageHandler.java | 50 + .../hive/accumulo/HiveAccumuloHelper.java | 280 ++++ .../mr/HiveAccumuloTableInputFormat.java | 74 +- .../mr/HiveAccumuloTableOutputFormat.java | 63 +- .../TestAccumuloConnectionParameters.java | 19 + .../hive/accumulo/TestHiveAccumuloHelper.java | 75 + .../mr/TestHiveAccumuloTableInputFormat.java | 8 +- .../mr/TestHiveAccumuloTableOutputFormat.java | 2 +- .../positive/accumulo_predicate_pushdown.q.out | 76 +- .../results/positive/accumulo_queries.q.out | 70 +- ant/pom.xml | 2 +- beeline/pom.xml | 2 +- bin/ext/hiveserver2.cmd | 2 +- cli/pom.xml | 2 +- common/pom.xml | 2 +- .../hadoop/hive/common/JvmPauseMonitor.java | 12 +- .../hive/common/metrics/LegacyMetrics.java | 51 +- .../hive/common/metrics/common/Metrics.java | 8 +- .../common/metrics/common/MetricsFactory.java | 30 +- .../metrics/metrics2/CodahaleMetrics.java | 41 +- .../org/apache/hadoop/hive/conf/HiveConf.java | 4 +- .../hive/common/metrics/TestLegacyMetrics.java | 6 +- .../metrics/metrics2/TestCodahaleMetrics.java | 16 +- contrib/pom.xml | 2 +- data/conf/spark/standalone/hive-site.xml | 6 + data/conf/spark/yarn-client/hive-site.xml | 6 + data/files/customers.txt | 3 + data/files/emp2.txt | 16 + data/files/nested_orders.txt | 8 + data/files/orders.txt | 8 + data/scripts/q_test_cleanup.sql | 2 +- dev-support/jenkins-submit-build.sh | 10 +- hbase-handler/pom.xml | 2 +- hcatalog/core/pom.xml | 2 +- hcatalog/hcatalog-pig-adapter/pom.xml | 2 +- hcatalog/pom.xml | 2 +- hcatalog/server-extensions/pom.xml | 2 +- hcatalog/streaming/pom.xml | 2 +- hcatalog/webhcat/java-client/pom.xml | 2 +- hcatalog/webhcat/svr/pom.xml | 2 +- .../hive/hcatalog/templeton/AppConfig.java | 2 + .../hive/hcatalog/templeton/HiveDelegator.java | 15 +- .../hive/hcatalog/templeton/JarDelegator.java | 8 +- .../hcatalog/templeton/LauncherDelegator.java | 14 + .../hive/hcatalog/templeton/PigDelegator.java | 13 +- .../apache/hive/hcatalog/templeton/Server.java | 34 +- .../hive/hcatalog/templeton/SqoopDelegator.java | 20 +- .../hcatalog/templeton/StreamingDelegator.java | 3 +- .../templeton/tool/JobSubmissionConstants.java | 2 + .../hcatalog/templeton/tool/LaunchMapper.java | 214 ++- hwi/pom.xml | 2 +- itests/custom-serde/pom.xml | 2 +- itests/hcatalog-unit/pom.xml | 2 +- itests/hive-jmh/pom.xml | 2 +- itests/hive-minikdc/pom.xml | 22 +- itests/hive-unit-hadoop2/pom.xml | 2 +- itests/hive-unit/pom.xml | 2 +- itests/pom.xml | 3 +- itests/qtest-accumulo/pom.xml | 508 ++++++ .../test/java/org/apache/hive/TestDummy.java | 31 + itests/qtest-spark/pom.xml | 2 +- itests/qtest/pom.xml | 43 +- .../test/resources/testconfiguration.properties | 4 +- itests/test-serde/pom.xml | 2 +- itests/util/pom.xml | 2 +- jdbc/pom.xml | 2 +- llap-client/pom.xml | 2 +- llap-server/pom.xml | 2 +- metastore/pom.xml | 2 +- .../upgrade/derby/hive-schema-2.0.0.derby.sql | 336 ++++ .../derby/upgrade-1.2.0-to-2.0.0.derby.sql | 3 + .../scripts/upgrade/derby/upgrade.order.derby | 2 +- .../upgrade/mssql/hive-schema-2.0.0.mssql.sql | 947 ++++++++++++ .../mssql/upgrade-1.2.0-to-2.0.0.mssql.sql | 5 + .../scripts/upgrade/mssql/upgrade.order.mssql | 2 +- .../upgrade/mysql/hive-schema-2.0.0.mysql.sql | 840 ++++++++++ .../mysql/upgrade-1.2.0-to-2.0.0.mysql.sql | 4 + .../scripts/upgrade/mysql/upgrade.order.mysql | 2 +- .../upgrade/oracle/hive-schema-2.0.0.oracle.sql | 788 ++++++++++ .../oracle/upgrade-1.2.0-to-2.0.0.oracle.sql | 4 + .../scripts/upgrade/oracle/upgrade.order.oracle | 2 +- .../postgres/hive-schema-2.0.0.postgres.sql | 1457 ++++++++++++++++++ .../upgrade-1.2.0-to-2.0.0.postgres.sql | 12 + .../upgrade/postgres/upgrade.order.postgres | 2 +- .../hadoop/hive/metastore/HiveMetaStore.java | 115 +- .../hive/metastore/HiveMetaStoreClient.java | 13 +- .../hive/metastore/MetaStoreDirectSql.java | 2 + .../hadoop/hive/metastore/ObjectStore.java | 4 +- .../hive/metastore/StatObjectConverter.java | 16 +- odbc/pom.xml | 2 +- packaging/pom.xml | 2 +- pom.xml | 17 +- ql/pom.xml | 2 +- .../java/org/apache/hadoop/hive/ql/Driver.java | 3 + .../hive/ql/exec/PartitionKeySampler.java | 9 +- .../hadoop/hive/ql/exec/mr/ExecDriver.java | 12 +- .../hadoop/hive/ql/exec/tez/TezJobMonitor.java | 2 +- .../hive/ql/exec/tez/TezSessionPoolManager.java | 21 +- .../hive/ql/exec/tez/TezSessionState.java | 10 - .../apache/hadoop/hive/ql/hooks/ATSHook.java | 27 +- .../io/orc/OrcFileStripeMergeRecordReader.java | 11 +- .../apache/hadoop/hive/ql/metadata/Hive.java | 8 +- .../calcite/reloperators/HiveAggregate.java | 58 + .../correlation/ReduceSinkDeDuplication.java | 3 + .../hadoop/hive/ql/parse/CalcitePlanner.java | 6 +- .../hadoop/hive/ql/parse/GenTezUtils.java | 10 +- .../apache/hadoop/hive/ql/parse/HiveParser.g | 4 +- .../hadoop/hive/ql/parse/PTFInvocationSpec.java | 8 + .../hadoop/hive/ql/parse/PTFTranslator.java | 1 + .../hadoop/hive/ql/parse/SemanticAnalyzer.java | 25 + .../hadoop/hive/ql/parse/WindowingSpec.java | 84 +- .../hadoop/hive/ql/processors/SetProcessor.java | 3 + .../AuthorizationPreEventListener.java | 8 +- .../hadoop/hive/ql/session/SessionState.java | 19 + .../apache/hadoop/hive/ql/stats/StatsUtils.java | 3 +- .../ql/udf/generic/GenericUDAFCollectList.java | 15 +- .../ql/udf/generic/GenericUDAFCollectSet.java | 14 +- .../GenericUDAFMkCollectionEvaluator.java | 21 +- .../hive/ql/udf/ptf/WindowingTableFunction.java | 31 + .../hadoop/hive/ql/io/orc/TestFileDump.java | 7 +- .../clientnegative/ptf_negative_NoWindowDefn.q | 9 + .../udaf_collect_set_unsupported.q | 3 + .../clientpositive/alter_table_partition_drop.q | 11 + .../test/queries/clientpositive/cbo_subq_in.q | 1 + .../clientpositive/encryption_drop_partition.q | 18 + ...groupby_complex_types_multi_single_reducer.q | 8 +- ql/src/test/queries/clientpositive/join42.q | 36 + ql/src/test/queries/clientpositive/mergejoin.q | 2 +- .../tez_union_dynamic_partition.q | 21 + .../queries/clientpositive/udaf_collect_set_2.q | 222 +++ .../clientpositive/udf_folder_constants.q | 11 + .../clientpositive/udf_nondeterministic.q | 11 - .../clientpositive/windowing_windowspec3.q | 31 + .../ptf_negative_NoWindowDefn.q.out | 1 + .../udaf_collect_set_unsupported.q.out | 1 + .../alter_table_partition_drop.q.out | 74 + .../results/clientpositive/cbo_subq_in.q.out | 2 + .../encrypted/encryption_drop_partition.q.out | 81 + .../encrypted/encryption_drop_table.q.out | 2 +- .../test/results/clientpositive/groupby10.q.out | 140 +- .../test/results/clientpositive/groupby11.q.out | 70 +- .../test/results/clientpositive/groupby2.q.out | 33 +- .../clientpositive/groupby2_map_skew.q.out | 33 +- .../test/results/clientpositive/groupby8.q.out | 140 +- .../clientpositive/groupby8_map_skew.q.out | 70 +- ...pby_complex_types_multi_single_reducer.q.out | 68 +- .../results/clientpositive/groupby_cube1.q.out | 29 +- .../clientpositive/groupby_rollup1.q.out | 29 +- ql/src/test/results/clientpositive/join42.q.out | 312 ++++ .../spark/annotate_stats_join.q.out | 204 +-- .../clientpositive/spark/auto_join1.q.out | 60 +- .../clientpositive/spark/auto_join10.q.out | 28 +- .../clientpositive/spark/auto_join11.q.out | 32 +- .../clientpositive/spark/auto_join14.q.out | 64 +- .../clientpositive/spark/auto_join16.q.out | 68 +- .../clientpositive/spark/auto_join17.q.out | 60 +- .../clientpositive/spark/auto_join18.q.out | 30 +- .../spark/auto_join18_multi_distinct.q.out | 30 +- .../clientpositive/spark/auto_join19.q.out | 56 +- .../clientpositive/spark/auto_join26.q.out | 68 +- .../clientpositive/spark/auto_join27.q.out | 24 +- .../clientpositive/spark/auto_join4.q.out | 14 +- .../clientpositive/spark/auto_join5.q.out | 24 +- .../clientpositive/spark/auto_join6.q.out | 10 +- .../clientpositive/spark/auto_join8.q.out | 16 +- .../clientpositive/spark/auto_join9.q.out | 56 +- .../spark/auto_join_filters.q.out | 4 +- .../clientpositive/spark/auto_join_nulls.q.out | 6 +- .../spark/auto_join_without_localtask.q.out | 32 +- .../clientpositive/spark/cbo_subq_in.q.out | 2 + .../spark/constprog_partitioner.q.out | 80 +- .../results/clientpositive/spark/count.q.out | 14 +- .../clientpositive/spark/cross_join.q.out | 74 +- .../spark/cross_product_check_1.q.out | 40 +- .../spark/cross_product_check_2.q.out | 38 +- .../results/clientpositive/spark/groupby1.q.out | 8 +- .../clientpositive/spark/groupby10.q.out | 88 +- .../clientpositive/spark/groupby11.q.out | 44 +- .../results/clientpositive/spark/groupby2.q.out | 17 +- .../results/clientpositive/spark/groupby4.q.out | 6 +- .../results/clientpositive/spark/groupby8.q.out | 88 +- .../spark/groupby8_map_skew.q.out | 44 +- ...pby_complex_types_multi_single_reducer.q.out | 90 +- .../clientpositive/spark/groupby_cube1.q.out | 41 +- .../clientpositive/spark/groupby_position.q.out | 130 +- .../clientpositive/spark/groupby_rollup1.q.out | 37 +- .../spark/groupby_sort_1_23.q.out | 82 +- .../spark/groupby_sort_skew_1_23.q.out | 82 +- .../results/clientpositive/spark/having.q.out | 66 +- .../spark/index_auto_self_join.q.out | 116 +- .../spark/infer_bucket_sort_map_operators.q.out | 5 +- .../spark/infer_bucket_sort_merge.q.out | 4 +- .../clientpositive/spark/innerjoin.q.out | 54 +- .../results/clientpositive/spark/join1.q.out | 38 +- .../results/clientpositive/spark/join10.q.out | 28 +- .../results/clientpositive/spark/join11.q.out | 18 +- .../results/clientpositive/spark/join14.q.out | 54 +- .../results/clientpositive/spark/join16.q.out | 36 +- .../results/clientpositive/spark/join17.q.out | 52 +- .../results/clientpositive/spark/join18.q.out | 12 +- .../spark/join18_multi_distinct.q.out | 12 +- .../results/clientpositive/spark/join29.q.out | 66 +- .../results/clientpositive/spark/join31.q.out | 104 +- .../results/clientpositive/spark/join34.q.out | 36 +- .../results/clientpositive/spark/join35.q.out | 92 +- .../results/clientpositive/spark/join4.q.out | 16 +- .../results/clientpositive/spark/join40.q.out | 116 +- .../results/clientpositive/spark/join5.q.out | 20 +- .../results/clientpositive/spark/join6.q.out | 10 +- .../results/clientpositive/spark/join8.q.out | 18 +- .../results/clientpositive/spark/join9.q.out | 42 +- .../clientpositive/spark/join_alt_syntax.q.out | 42 +- .../results/clientpositive/spark/join_vc.q.out | 40 +- .../spark/limit_partition_metadataonly.q.out | 4 +- .../clientpositive/spark/limit_pushdown.q.out | 138 +- .../clientpositive/spark/load_dyn_part13.q.out | 4 +- .../clientpositive/spark/louter_join_ppr.q.out | 514 +++--- .../results/clientpositive/spark/merge1.q.out | 4 +- .../results/clientpositive/spark/merge2.q.out | 4 +- .../spark/metadata_only_queries.q.out | 12 +- .../results/clientpositive/spark/order2.q.out | 2 +- .../spark/outer_join_ppr.q.java1.7.out | 366 ++--- .../spark/outer_join_ppr.q.java1.8.out | 366 ++--- .../clientpositive/spark/parallel_join1.q.out | 38 +- .../test/results/clientpositive/spark/pcr.q.out | 4 +- .../clientpositive/spark/ppd_gby_join.q.out | 132 +- .../results/clientpositive/spark/ppd_join.q.out | 118 +- .../clientpositive/spark/ppd_join_filter.q.out | 442 +++--- .../clientpositive/spark/ppd_outer_join1.q.out | 120 +- .../clientpositive/spark/ppd_outer_join2.q.out | 158 +- .../clientpositive/spark/ppd_outer_join3.q.out | 154 +- .../spark/ql_rewrite_gbtoidx_cbo_1.q.out | 208 +-- .../clientpositive/spark/router_join_ppr.q.out | 582 +++---- .../results/clientpositive/spark/semijoin.q.out | 26 +- .../results/clientpositive/spark/skewjoin.q.out | 160 +- .../clientpositive/spark/skewjoin_noskew.q.out | 32 +- .../results/clientpositive/spark/stats1.q.out | 2 +- .../clientpositive/spark/stats_only_null.q.out | 8 +- .../clientpositive/spark/subquery_exists.q.out | 20 +- .../clientpositive/spark/subquery_in.q.out | 230 +-- .../spark/subquery_multiinsert.q.java1.8.out | 14 +- .../spark/table_access_keys_stats.q.out | 18 +- .../clientpositive/spark/temp_table.q.out | 4 +- .../results/clientpositive/spark/union.q.out | 4 +- .../results/clientpositive/spark/union10.q.out | 6 +- .../results/clientpositive/spark/union11.q.out | 82 +- .../results/clientpositive/spark/union12.q.out | 2 +- .../results/clientpositive/spark/union13.q.out | 2 +- .../results/clientpositive/spark/union14.q.out | 52 +- .../results/clientpositive/spark/union15.q.out | 80 +- .../results/clientpositive/spark/union2.q.out | 2 +- .../results/clientpositive/spark/union20.q.out | 10 +- .../results/clientpositive/spark/union24.q.out | 36 +- .../results/clientpositive/spark/union25.q.out | 38 +- .../results/clientpositive/spark/union28.q.out | 78 +- .../results/clientpositive/spark/union30.q.out | 78 +- .../results/clientpositive/spark/union33.q.out | 12 +- .../results/clientpositive/spark/union4.q.out | 4 +- .../results/clientpositive/spark/union5.q.out | 54 +- .../results/clientpositive/spark/union6.q.out | 2 +- .../results/clientpositive/spark/union7.q.out | 52 +- .../results/clientpositive/spark/union8.q.out | 4 +- .../results/clientpositive/spark/union9.q.out | 4 +- .../clientpositive/spark/union_remove_1.q.out | 8 +- .../clientpositive/spark/union_remove_10.q.out | 8 +- .../clientpositive/spark/union_remove_15.q.out | 8 +- .../clientpositive/spark/union_remove_16.q.out | 8 +- .../clientpositive/spark/union_remove_18.q.out | 8 +- .../clientpositive/spark/union_remove_19.q.out | 192 ++- .../clientpositive/spark/union_remove_2.q.out | 8 +- .../clientpositive/spark/union_remove_20.q.out | 8 +- .../clientpositive/spark/union_remove_21.q.out | 70 +- .../clientpositive/spark/union_remove_22.q.out | 8 +- .../clientpositive/spark/union_remove_24.q.out | 8 +- .../clientpositive/spark/union_remove_25.q.out | 8 +- .../clientpositive/spark/union_remove_4.q.out | 8 +- .../clientpositive/spark/union_remove_5.q.out | 8 +- .../spark/union_remove_6_subq.q.out | 8 +- .../clientpositive/spark/union_remove_7.q.out | 8 +- .../clientpositive/spark/union_remove_8.q.out | 8 +- .../clientpositive/spark/union_remove_9.q.out | 4 +- .../clientpositive/spark/union_top_level.q.out | 24 +- .../spark/vector_cast_constant.q.java1.7.out | 6 +- .../spark/vector_cast_constant.q.java1.8.out | 6 +- .../spark/vector_decimal_aggregate.q.out | 12 +- .../spark/vector_distinct_2.q.out | 4 +- .../clientpositive/spark/vector_elt.q.out | 2 +- .../clientpositive/spark/vector_groupby_3.q.out | 6 +- .../spark/vector_mapjoin_reduce.q.out | 261 ++-- .../clientpositive/spark/vector_orderby_5.q.out | 6 +- .../spark/vector_string_concat.q.out | 6 +- .../clientpositive/spark/vectorization_0.q.out | 20 +- .../clientpositive/spark/vectorization_13.q.out | 20 +- .../clientpositive/spark/vectorization_14.q.out | 12 +- .../clientpositive/spark/vectorization_15.q.out | 10 +- .../clientpositive/spark/vectorization_16.q.out | 8 +- .../clientpositive/spark/vectorization_9.q.out | 8 +- .../spark/vectorization_div0.q.out | 6 +- .../spark/vectorization_part_project.q.out | 2 +- .../spark/vectorization_pushdown.q.out | 8 +- .../spark/vectorization_short_regress.q.out | 112 +- .../clientpositive/spark/vectorized_case.q.out | 2 +- .../spark/vectorized_mapjoin.q.out | 60 +- .../spark/vectorized_shufflejoin.q.out | 52 +- .../spark/vectorized_timestamp_funcs.q.out | 12 +- .../clientpositive/tez/cbo_subq_in.q.out | 2 + .../clientpositive/tez/explainuser_2.q.out | 63 +- .../results/clientpositive/tez/groupby2.q.out | 17 +- .../tez/tez_union_dynamic_partition.q.out | 148 ++ .../results/clientpositive/tez/union4.q.out | 4 + .../results/clientpositive/tez/union6.q.out | 4 + .../tez/vector_leftsemi_mapjoin.q.out | 1032 ++++++------- .../tez/vector_multi_insert.q.out | 20 +- .../clientpositive/tez/vector_outer_join1.q.out | 48 +- .../clientpositive/tez/vector_outer_join2.q.out | 22 +- .../clientpositive/tez/vector_outer_join3.q.out | 60 +- .../clientpositive/tez/vector_outer_join4.q.out | 48 +- .../clientpositive/udaf_collect_set_2.q.out | 742 +++++++++ .../clientpositive/udf_folder_constants.q.out | 120 ++ .../clientpositive/udf_nondeterministic.q.out | 120 -- .../clientpositive/windowing_windowspec3.q.out | 110 ++ serde/pom.xml | 2 +- service/pom.xml | 2 +- .../org/apache/hive/service/cli/CLIService.java | 13 - .../service/cli/operation/SQLOperation.java | 16 +- .../hive/service/cli/session/HiveSession.java | 12 +- .../service/cli/session/HiveSessionImpl.java | 28 +- .../cli/session/HiveSessionImplwithUGI.java | 48 - .../service/cli/thrift/ThriftCLIService.java | 4 + .../apache/hive/service/server/HiveServer2.java | 9 +- shims/0.20S/pom.xml | 2 +- .../apache/hadoop/mapred/WebHCatJTShim20S.java | 10 + shims/0.23/pom.xml | 2 +- .../apache/hadoop/mapred/WebHCatJTShim23.java | 18 +- shims/aggregator/pom.xml | 2 +- shims/common/pom.xml | 2 +- .../apache/hadoop/hive/shims/HadoopShims.java | 5 + shims/pom.xml | 2 +- shims/scheduler/pom.xml | 2 +- spark-client/pom.xml | 4 +- testutils/pom.xml | 2 +- 343 files changed, 14188 insertions(+), 5600 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/61cfda9c/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/61cfda9c/itests/qtest/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/61cfda9c/itests/src/test/resources/testconfiguration.properties ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/61cfda9c/llap-client/pom.xml ---------------------------------------------------------------------- diff --cc llap-client/pom.xml index 87f53b7,0000000..b7b5803 mode 100644,000000..100644 --- a/llap-client/pom.xml +++ b/llap-client/pom.xml @@@ -1,173 -1,0 +1,173 @@@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.hive</groupId> + <artifactId>hive</artifactId> - <version>1.3.0-SNAPSHOT</version> ++ <version>2.0.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <artifactId>hive-llap-client</artifactId> + <packaging>jar</packaging> + <name>Hive Llap Client</name> + + <properties> + <hive.path.to.root>..</hive.path.to.root> + </properties> + + <dependencies> + <!-- dependencies are always listed in sorted order by groupId, artifectId --> + <!-- intra-project --> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-common</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-serde</artifactId> + <version>${project.version}</version> + </dependency> + <!-- inter-project --> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>${commons-codec.version}</version> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>${commons-lang.version}</version> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>${commons-logging.version}</version> + </dependency> + <dependency> + <groupId>org.apache.thrift</groupId> + <artifactId>libthrift</artifactId> + <version>${libthrift.version}</version> + </dependency> + <!-- test inter-project --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junit.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + <version>${mockito-all.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-servlet</artifactId> + <version>${jersey.version}</version> + <scope>test</scope> + </dependency> + </dependencies> + + <profiles> + <profile> + <id>hadoop-1</id> + <dependencies> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-core</artifactId> + <version>${hadoop-20S.version}</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-test</artifactId> + <version>${hadoop-20S.version}</version> + <scope>test</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>hadoop-2</id> + <dependencies> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + <version>${hadoop-23.version}</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + <version>${hadoop-23.version}</version> + <classifier>tests</classifier> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-mapreduce-client-core</artifactId> + <version>${hadoop-23.version}</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdfs</artifactId> + <version>${hadoop-23.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdfs</artifactId> + <version>${hadoop-23.version}</version> + <classifier>tests</classifier> + <scope>test</scope> + </dependency> + </dependencies> + </profile> + </profiles> + + + <build> + <sourceDirectory>${basedir}/src/java</sourceDirectory> + <testSourceDirectory>${basedir}/src/test</testSourceDirectory> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>add-source</id> + <phase>generate-sources</phase> + <goals> + <goal>add-source</goal> + </goals> + <configuration> + <sources> + <source>src/gen/protobuf/gen-java</source> + <source>src/gen/thrift/gen-javabean</source> + </sources> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project> http://git-wip-us.apache.org/repos/asf/hive/blob/61cfda9c/llap-server/pom.xml ---------------------------------------------------------------------- diff --cc llap-server/pom.xml index 19f41fe,0000000..1d64992 mode 100644,000000..100644 --- a/llap-server/pom.xml +++ b/llap-server/pom.xml @@@ -1,272 -1,0 +1,272 @@@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.hive</groupId> + <artifactId>hive</artifactId> - <version>1.3.0-SNAPSHOT</version> ++ <version>2.0.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <artifactId>hive-llap-server</artifactId> + <packaging>jar</packaging> + <name>Hive Llap Server</name> + + <properties> + <hive.path.to.root>..</hive.path.to.root> + </properties> + + <dependencies> + <!-- dependencies are always listed in sorted order by groupId, artifectId --> + <!-- intra-project --> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-exec</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-common</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-llap-client</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-shims</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-serde</artifactId> + <version>${project.version}</version> + </dependency> + <!-- inter-project --> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>${commons-codec.version}</version> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>${commons-lang.version}</version> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>${commons-logging.version}</version> + </dependency> + <dependency> + <groupId>org.apache.avro</groupId> + <artifactId>avro</artifactId> + <version>${avro.version}</version> + </dependency> + <dependency> + <groupId>org.apache.thrift</groupId> + <artifactId>libthrift</artifactId> + <version>${libthrift.version}</version> + </dependency> + <dependency> + <groupId>org.json</groupId> + <artifactId>json</artifactId> + <version>${json.version}</version> + </dependency> + <!-- test inter-project --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junit.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + <version>${mockito-all.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-servlet</artifactId> + <version>${jersey.version}</version> + <scope>test</scope> + </dependency> + </dependencies> + + <profiles> + <profile> + <id>hadoop-1</id> + <dependencies> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-core</artifactId> + <version>${hadoop-20S.version}</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-test</artifactId> + <version>${hadoop-20S.version}</version> + <scope>test</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>hadoop-2</id> + <dependencies> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + <version>${hadoop-23.version}</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + <version>${hadoop-23.version}</version> + <classifier>tests</classifier> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-mapreduce-client-core</artifactId> + <version>${hadoop-23.version}</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdfs</artifactId> + <version>${hadoop-23.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdfs</artifactId> + <version>${hadoop-23.version}</version> + <classifier>tests</classifier> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-yarn-registry</artifactId> + <version>${hadoop-23.version}</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.apache.tez</groupId> + <artifactId>tez-runtime-internals</artifactId> + <version>${tez.version}</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.apache.tez</groupId> + <artifactId>tez-runtime-library</artifactId> + <version>${tez.version}</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.apache.tez</groupId> + <artifactId>tez-mapreduce</artifactId> + <version>${tez.version}</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.apache.tez</groupId> + <artifactId>tez-dag</artifactId> + <version>${tez.version}</version> + <optional>true</optional> + </dependency> + </dependencies> + </profile> + <profile> + <id>protobuf</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>generate-protobuf-sources</id> + <phase>generate-sources</phase> + <configuration> + <target> + <property name="protobuf.src.dir" location="${basedir}/src/protobuf"/> + <property name="protobuf.build.dir" location="${basedir}/src/gen/protobuf/gen-java"/> + <echo>Building LLAP-Server Protobuf</echo> + <mkdir dir="${protobuf.build.dir}"/> + <exec executable="protoc" failonerror="true"> + <arg value="--java_out=${protobuf.build.dir}"/> + <arg value="-I=${protobuf.src.dir}"/> + <arg value="${protobuf.src.dir}/LlapDaemonProtocol.proto"/> + </exec> + </target> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> + + + <build> + <sourceDirectory>${basedir}/src/java</sourceDirectory> + <testSourceDirectory>${basedir}/src/test</testSourceDirectory> + <resources> + <resource> + <directory>src/main/resources</directory> + <excludes> + <exclude>*.py</exclude> + <exclude>*.pyc</exclude> + <exclude>llap-daemon-log4j.properties</exclude> + </excludes> + <filtering>false</filtering> + </resource> + </resources> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>add-source</id> + <phase>generate-sources</phase> + <goals> + <goal>add-source</goal> + </goals> + <configuration> + <sources> + <source>src/gen/protobuf/gen-java</source> + <source>src/gen/thrift/gen-javabean</source> + </sources> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project> http://git-wip-us.apache.org/repos/asf/hive/blob/61cfda9c/packaging/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/61cfda9c/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/61cfda9c/ql/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/61cfda9c/ql/src/java/org/apache/hadoop/hive/ql/Driver.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/61cfda9c/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezJobMonitor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/61cfda9c/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezSessionState.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/61cfda9c/ql/src/java/org/apache/hadoop/hive/ql/parse/GenTezUtils.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/61cfda9c/ql/src/java/org/apache/hadoop/hive/ql/session/SessionState.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/61cfda9c/ql/src/test/results/clientpositive/tez/vector_leftsemi_mapjoin.q.out ---------------------------------------------------------------------- diff --cc ql/src/test/results/clientpositive/tez/vector_leftsemi_mapjoin.q.out index 45933c1,6e4971d..a851100 --- a/ql/src/test/results/clientpositive/tez/vector_leftsemi_mapjoin.q.out +++ b/ql/src/test/results/clientpositive/tez/vector_leftsemi_mapjoin.q.out @@@ -4944,10 -4944,9 +4944,10 @@@ STAGE PLANS key expressions: _col1 (type: int) sort order: + Map-reduce partition columns: _col1 (type: int) - Statistics: Num rows: 59 Data size: 236 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 7 Data size: 651 Basic stats: COMPLETE Column stats: NONE Execution mode: vectorized Reducer 2 + Execution mode: vectorized Reduce Operator Tree: Select Operator expressions: KEY.reducesinkkey0 (type: string) @@@ -5148,10 -5148,9 +5148,10 @@@ STAGE PLANS Reduce Output Operator key expressions: _col0 (type: string) sort order: + - Statistics: Num rows: 64 Data size: 259 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 7 Data size: 716 Basic stats: COMPLETE Column stats: NONE Execution mode: vectorized Reducer 3 + Execution mode: vectorized Reduce Operator Tree: Select Operator expressions: KEY.reducesinkkey0 (type: string) @@@ -5671,10 -5671,9 +5671,10 @@@ STAGE PLANS key expressions: _col0 (type: int) sort order: + Map-reduce partition columns: _col0 (type: int) - Statistics: Num rows: 90 Data size: 360 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 11 Data size: 1023 Basic stats: COMPLETE Column stats: NONE Execution mode: vectorized Reducer 2 + Execution mode: vectorized Reduce Operator Tree: Select Operator expressions: KEY.reducesinkkey0 (type: int), KEY.reducesinkkey1 (type: string), VALUE._col0 (type: int), VALUE._col1 (type: string) @@@ -6164,9 -6164,8 +6164,9 @@@ STAGE PLANS Reduce Output Operator key expressions: _col0 (type: int) sort order: + - Statistics: Num rows: 393 Data size: 1575 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 48 Data size: 4501 Basic stats: COMPLETE Column stats: NONE Reducer 3 + Execution mode: vectorized Reduce Operator Tree: Select Operator expressions: KEY.reducesinkkey0 (type: int) @@@ -6300,9 -6300,8 +6300,9 @@@ STAGE PLANS Reduce Output Operator key expressions: _col0 (type: int) sort order: + - Statistics: Num rows: 393 Data size: 1575 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 48 Data size: 4501 Basic stats: COMPLETE Column stats: NONE Reducer 3 + Execution mode: vectorized Reduce Operator Tree: Select Operator expressions: KEY.reducesinkkey0 (type: int) @@@ -6436,9 -6436,8 +6436,9 @@@ STAGE PLANS Reduce Output Operator key expressions: _col0 (type: int) sort order: + - Statistics: Num rows: 393 Data size: 1575 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 48 Data size: 4501 Basic stats: COMPLETE Column stats: NONE Reducer 3 + Execution mode: vectorized Reduce Operator Tree: Select Operator expressions: KEY.reducesinkkey0 (type: int) @@@ -6574,9 -6574,8 +6574,9 @@@ STAGE PLANS Reduce Output Operator key expressions: _col0 (type: int) sort order: + - Statistics: Num rows: 393 Data size: 1575 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 48 Data size: 4501 Basic stats: COMPLETE Column stats: NONE Reducer 3 + Execution mode: vectorized Reduce Operator Tree: Select Operator expressions: KEY.reducesinkkey0 (type: int) @@@ -7243,10 -7243,9 +7243,10 @@@ STAGE PLANS key expressions: _col1 (type: int) sort order: + Map-reduce partition columns: _col1 (type: int) - Statistics: Num rows: 59 Data size: 236 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 7 Data size: 651 Basic stats: COMPLETE Column stats: NONE Execution mode: vectorized Reducer 2 + Execution mode: vectorized Reduce Operator Tree: Select Operator expressions: KEY.reducesinkkey0 (type: string) @@@ -7449,10 -7449,9 +7449,10 @@@ STAGE PLANS Reduce Output Operator key expressions: _col0 (type: string) sort order: + - Statistics: Num rows: 64 Data size: 259 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 7 Data size: 716 Basic stats: COMPLETE Column stats: NONE Execution mode: vectorized Reducer 3 + Execution mode: vectorized Reduce Operator Tree: Select Operator expressions: KEY.reducesinkkey0 (type: string) @@@ -7977,10 -7977,9 +7977,10 @@@ STAGE PLANS key expressions: _col0 (type: int) sort order: + Map-reduce partition columns: _col0 (type: int) - Statistics: Num rows: 90 Data size: 360 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 11 Data size: 1023 Basic stats: COMPLETE Column stats: NONE Execution mode: vectorized Reducer 2 + Execution mode: vectorized Reduce Operator Tree: Select Operator expressions: KEY.reducesinkkey0 (type: int), KEY.reducesinkkey1 (type: string), VALUE._col0 (type: int), VALUE._col1 (type: string) @@@ -8473,9 -8473,8 +8473,9 @@@ STAGE PLANS Reduce Output Operator key expressions: _col0 (type: int) sort order: + - Statistics: Num rows: 393 Data size: 1575 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 48 Data size: 4501 Basic stats: COMPLETE Column stats: NONE Reducer 3 + Execution mode: vectorized Reduce Operator Tree: Select Operator expressions: KEY.reducesinkkey0 (type: int) @@@ -8609,9 -8609,8 +8609,9 @@@ STAGE PLANS Reduce Output Operator key expressions: _col0 (type: int) sort order: + - Statistics: Num rows: 393 Data size: 1575 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 48 Data size: 4501 Basic stats: COMPLETE Column stats: NONE Reducer 3 + Execution mode: vectorized Reduce Operator Tree: Select Operator expressions: KEY.reducesinkkey0 (type: int) @@@ -8745,9 -8745,8 +8745,9 @@@ STAGE PLANS Reduce Output Operator key expressions: _col0 (type: int) sort order: + - Statistics: Num rows: 393 Data size: 1575 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 48 Data size: 4501 Basic stats: COMPLETE Column stats: NONE Reducer 3 + Execution mode: vectorized Reduce Operator Tree: Select Operator expressions: KEY.reducesinkkey0 (type: int) @@@ -8883,9 -8883,8 +8883,9 @@@ STAGE PLANS Reduce Output Operator key expressions: _col0 (type: int) sort order: + - Statistics: Num rows: 393 Data size: 1575 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 48 Data size: 4501 Basic stats: COMPLETE Column stats: NONE Reducer 3 + Execution mode: vectorized Reduce Operator Tree: Select Operator expressions: KEY.reducesinkkey0 (type: int) @@@ -9551,10 -9551,9 +9551,10 @@@ STAGE PLANS key expressions: _col1 (type: int) sort order: + Map-reduce partition columns: _col1 (type: int) - Statistics: Num rows: 59 Data size: 236 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 7 Data size: 651 Basic stats: COMPLETE Column stats: NONE Execution mode: vectorized Reducer 2 + Execution mode: vectorized Reduce Operator Tree: Select Operator expressions: KEY.reducesinkkey0 (type: string) @@@ -9755,10 -9755,9 +9755,10 @@@ STAGE PLANS Reduce Output Operator key expressions: _col0 (type: string) sort order: + - Statistics: Num rows: 64 Data size: 259 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 7 Data size: 716 Basic stats: COMPLETE Column stats: NONE Execution mode: vectorized Reducer 3 + Execution mode: vectorized Reduce Operator Tree: Select Operator expressions: KEY.reducesinkkey0 (type: string) @@@ -10278,10 -10278,9 +10278,10 @@@ STAGE PLANS key expressions: _col0 (type: int) sort order: + Map-reduce partition columns: _col0 (type: int) - Statistics: Num rows: 90 Data size: 360 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 11 Data size: 1023 Basic stats: COMPLETE Column stats: NONE Execution mode: vectorized Reducer 2 + Execution mode: vectorized Reduce Operator Tree: Select Operator expressions: KEY.reducesinkkey0 (type: int), KEY.reducesinkkey1 (type: string), VALUE._col0 (type: int), VALUE._col1 (type: string) @@@ -10771,9 -10771,8 +10771,9 @@@ STAGE PLANS Reduce Output Operator key expressions: _col0 (type: int) sort order: + - Statistics: Num rows: 393 Data size: 1575 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 48 Data size: 4501 Basic stats: COMPLETE Column stats: NONE Reducer 3 + Execution mode: vectorized Reduce Operator Tree: Select Operator expressions: KEY.reducesinkkey0 (type: int) @@@ -10907,9 -10907,8 +10907,9 @@@ STAGE PLANS Reduce Output Operator key expressions: _col0 (type: int) sort order: + - Statistics: Num rows: 393 Data size: 1575 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 48 Data size: 4501 Basic stats: COMPLETE Column stats: NONE Reducer 3 + Execution mode: vectorized Reduce Operator Tree: Select Operator expressions: KEY.reducesinkkey0 (type: int) @@@ -11043,9 -11043,8 +11043,9 @@@ STAGE PLANS Reduce Output Operator key expressions: _col0 (type: int) sort order: + - Statistics: Num rows: 393 Data size: 1575 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 48 Data size: 4501 Basic stats: COMPLETE Column stats: NONE Reducer 3 + Execution mode: vectorized Reduce Operator Tree: Select Operator expressions: KEY.reducesinkkey0 (type: int) @@@ -11181,9 -11181,8 +11181,9 @@@ STAGE PLANS Reduce Output Operator key expressions: _col0 (type: int) sort order: + - Statistics: Num rows: 393 Data size: 1575 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 48 Data size: 4501 Basic stats: COMPLETE Column stats: NONE Reducer 3 + Execution mode: vectorized Reduce Operator Tree: Select Operator expressions: KEY.reducesinkkey0 (type: int) @@@ -11850,10 -11850,9 +11850,10 @@@ STAGE PLANS key expressions: _col1 (type: int) sort order: + Map-reduce partition columns: _col1 (type: int) - Statistics: Num rows: 59 Data size: 236 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 7 Data size: 651 Basic stats: COMPLETE Column stats: NONE Execution mode: vectorized Reducer 2 + Execution mode: vectorized Reduce Operator Tree: Select Operator expressions: KEY.reducesinkkey0 (type: string) @@@ -12056,10 -12056,9 +12056,10 @@@ STAGE PLANS Reduce Output Operator key expressions: _col0 (type: string) sort order: + - Statistics: Num rows: 64 Data size: 259 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 7 Data size: 716 Basic stats: COMPLETE Column stats: NONE Execution mode: vectorized Reducer 3 + Execution mode: vectorized Reduce Operator Tree: Select Operator expressions: KEY.reducesinkkey0 (type: string) @@@ -12584,10 -12584,9 +12584,10 @@@ STAGE PLANS key expressions: _col0 (type: int) sort order: + Map-reduce partition columns: _col0 (type: int) - Statistics: Num rows: 90 Data size: 360 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 11 Data size: 1023 Basic stats: COMPLETE Column stats: NONE Execution mode: vectorized Reducer 2 + Execution mode: vectorized Reduce Operator Tree: Select Operator expressions: KEY.reducesinkkey0 (type: int), KEY.reducesinkkey1 (type: string), VALUE._col0 (type: int), VALUE._col1 (type: string) @@@ -13080,9 -13080,8 +13080,9 @@@ STAGE PLANS Reduce Output Operator key expressions: _col0 (type: int) sort order: + - Statistics: Num rows: 393 Data size: 1575 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 48 Data size: 4501 Basic stats: COMPLETE Column stats: NONE Reducer 3 + Execution mode: vectorized Reduce Operator Tree: Select Operator expressions: KEY.reducesinkkey0 (type: int) @@@ -13216,9 -13216,8 +13216,9 @@@ STAGE PLANS Reduce Output Operator key expressions: _col0 (type: int) sort order: + - Statistics: Num rows: 393 Data size: 1575 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 48 Data size: 4501 Basic stats: COMPLETE Column stats: NONE Reducer 3 + Execution mode: vectorized Reduce Operator Tree: Select Operator expressions: KEY.reducesinkkey0 (type: int) @@@ -13352,9 -13352,8 +13352,9 @@@ STAGE PLANS Reduce Output Operator key expressions: _col0 (type: int) sort order: + - Statistics: Num rows: 393 Data size: 1575 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 48 Data size: 4501 Basic stats: COMPLETE Column stats: NONE Reducer 3 + Execution mode: vectorized Reduce Operator Tree: Select Operator expressions: KEY.reducesinkkey0 (type: int) @@@ -13490,9 -13490,8 +13490,9 @@@ STAGE PLANS Reduce Output Operator key expressions: _col0 (type: int) sort order: + - Statistics: Num rows: 393 Data size: 1575 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 48 Data size: 4501 Basic stats: COMPLETE Column stats: NONE Reducer 3 + Execution mode: vectorized Reduce Operator Tree: Select Operator expressions: KEY.reducesinkkey0 (type: int) http://git-wip-us.apache.org/repos/asf/hive/blob/61cfda9c/ql/src/test/results/clientpositive/tez/vector_outer_join1.q.out ---------------------------------------------------------------------- diff --cc ql/src/test/results/clientpositive/tez/vector_outer_join1.q.out index fe6767a,4101c35..c0cb106 --- a/ql/src/test/results/clientpositive/tez/vector_outer_join1.q.out +++ b/ql/src/test/results/clientpositive/tez/vector_outer_join1.q.out @@@ -111,11 -111,11 +111,11 @@@ STAGE PLANS Map Operator Tree: TableScan alias: c - Statistics: Num rows: 13 Data size: 4185 Basic stats: COMPLETE Column stats: NONE - Statistics: Num rows: 15 Data size: 3784 Basic stats: COMPLETE Column stats: NONE ++ Statistics: Num rows: 15 Data size: 3789 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ctinyint (type: tinyint), csmallint (type: smallint), cint (type: int), cbigint (type: bigint), cfloat (type: float), cdouble (type: double), cstring1 (type: string), cstring2 (type: string), ctimestamp1 (type: timestamp), ctimestamp2 (type: timestamp), cboolean1 (type: boolean), cboolean2 (type: boolean) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11 - Statistics: Num rows: 13 Data size: 4185 Basic stats: COMPLETE Column stats: NONE - Statistics: Num rows: 15 Data size: 3784 Basic stats: COMPLETE Column stats: NONE ++ Statistics: Num rows: 15 Data size: 3789 Basic stats: COMPLETE Column stats: NONE Map Join Operator condition map: Left Outer Join0 to 1 @@@ -125,11 -125,11 +125,11 @@@ outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, _col15, _col16, _col17, _col18, _col19, _col20, _col21, _col22, _col23 input vertices: 1 Map 2 - Statistics: Num rows: 14 Data size: 4603 Basic stats: COMPLETE Column stats: NONE - Statistics: Num rows: 16 Data size: 4162 Basic stats: COMPLETE Column stats: NONE ++ Statistics: Num rows: 16 Data size: 4167 Basic stats: COMPLETE Column stats: NONE HybridGraceHashJoin: true File Output Operator compressed: false - Statistics: Num rows: 14 Data size: 4603 Basic stats: COMPLETE Column stats: NONE - Statistics: Num rows: 16 Data size: 4162 Basic stats: COMPLETE Column stats: NONE ++ Statistics: Num rows: 16 Data size: 4167 Basic stats: COMPLETE Column stats: NONE table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@@ -139,16 -139,16 +139,16 @@@ Map Operator Tree: TableScan alias: c - Statistics: Num rows: 13 Data size: 4185 Basic stats: COMPLETE Column stats: NONE - Statistics: Num rows: 15 Data size: 3784 Basic stats: COMPLETE Column stats: NONE ++ Statistics: Num rows: 15 Data size: 3789 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ctinyint (type: tinyint), csmallint (type: smallint), cint (type: int), cbigint (type: bigint), cfloat (type: float), cdouble (type: double), cstring1 (type: string), cstring2 (type: string), ctimestamp1 (type: timestamp), ctimestamp2 (type: timestamp), cboolean1 (type: boolean), cboolean2 (type: boolean) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11 - Statistics: Num rows: 13 Data size: 4185 Basic stats: COMPLETE Column stats: NONE - Statistics: Num rows: 15 Data size: 3784 Basic stats: COMPLETE Column stats: NONE ++ Statistics: Num rows: 15 Data size: 3789 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col2 (type: int) sort order: + Map-reduce partition columns: _col2 (type: int) - Statistics: Num rows: 13 Data size: 4185 Basic stats: COMPLETE Column stats: NONE - Statistics: Num rows: 15 Data size: 3784 Basic stats: COMPLETE Column stats: NONE ++ Statistics: Num rows: 15 Data size: 3789 Basic stats: COMPLETE Column stats: NONE value expressions: _col0 (type: tinyint), _col1 (type: smallint), _col3 (type: bigint), _col4 (type: float), _col5 (type: double), _col6 (type: string), _col7 (type: string), _col8 (type: timestamp), _col9 (type: timestamp), _col10 (type: boolean), _col11 (type: boolean) Execution mode: vectorized @@@ -218,11 -218,11 +218,11 @@@ STAGE PLANS Map Operator Tree: TableScan alias: c - Statistics: Num rows: 1046 Data size: 4185 Basic stats: COMPLETE Column stats: NONE - Statistics: Num rows: 15 Data size: 3784 Basic stats: COMPLETE Column stats: NONE ++ Statistics: Num rows: 15 Data size: 3789 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ctinyint (type: tinyint) outputColumnNames: _col0 - Statistics: Num rows: 1046 Data size: 4185 Basic stats: COMPLETE Column stats: NONE - Statistics: Num rows: 15 Data size: 3784 Basic stats: COMPLETE Column stats: NONE ++ Statistics: Num rows: 15 Data size: 3789 Basic stats: COMPLETE Column stats: NONE Map Join Operator condition map: Left Outer Join0 to 1 @@@ -232,11 -232,11 +232,11 @@@ outputColumnNames: _col0 input vertices: 1 Map 2 - Statistics: Num rows: 1150 Data size: 4603 Basic stats: COMPLETE Column stats: NONE - Statistics: Num rows: 16 Data size: 4162 Basic stats: COMPLETE Column stats: NONE ++ Statistics: Num rows: 16 Data size: 4167 Basic stats: COMPLETE Column stats: NONE HybridGraceHashJoin: true File Output Operator compressed: false - Statistics: Num rows: 1150 Data size: 4603 Basic stats: COMPLETE Column stats: NONE - Statistics: Num rows: 16 Data size: 4162 Basic stats: COMPLETE Column stats: NONE ++ Statistics: Num rows: 16 Data size: 4167 Basic stats: COMPLETE Column stats: NONE table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@@ -246,16 -246,16 +246,16 @@@ Map Operator Tree: TableScan alias: c - Statistics: Num rows: 1046 Data size: 4185 Basic stats: COMPLETE Column stats: NONE - Statistics: Num rows: 15 Data size: 3784 Basic stats: COMPLETE Column stats: NONE ++ Statistics: Num rows: 15 Data size: 3789 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ctinyint (type: tinyint) outputColumnNames: _col0 - Statistics: Num rows: 1046 Data size: 4185 Basic stats: COMPLETE Column stats: NONE - Statistics: Num rows: 15 Data size: 3784 Basic stats: COMPLETE Column stats: NONE ++ Statistics: Num rows: 15 Data size: 3789 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: tinyint) sort order: + Map-reduce partition columns: _col0 (type: tinyint) - Statistics: Num rows: 1046 Data size: 4185 Basic stats: COMPLETE Column stats: NONE - Statistics: Num rows: 15 Data size: 3784 Basic stats: COMPLETE Column stats: NONE ++ Statistics: Num rows: 15 Data size: 3789 Basic stats: COMPLETE Column stats: NONE Execution mode: vectorized Stage: Stage-0 @@@ -357,11 -357,11 +357,11 @@@ STAGE PLANS Map Operator Tree: TableScan alias: c - Statistics: Num rows: 523 Data size: 4185 Basic stats: COMPLETE Column stats: NONE - Statistics: Num rows: 15 Data size: 3784 Basic stats: COMPLETE Column stats: NONE ++ Statistics: Num rows: 15 Data size: 3789 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ctinyint (type: tinyint), cint (type: int) outputColumnNames: _col0, _col1 - Statistics: Num rows: 523 Data size: 4185 Basic stats: COMPLETE Column stats: NONE - Statistics: Num rows: 15 Data size: 3784 Basic stats: COMPLETE Column stats: NONE ++ Statistics: Num rows: 15 Data size: 3789 Basic stats: COMPLETE Column stats: NONE Map Join Operator condition map: Left Outer Join0 to 1 @@@ -371,7 -371,7 +371,7 @@@ outputColumnNames: _col0 input vertices: 1 Map 3 - Statistics: Num rows: 1150 Data size: 4603 Basic stats: COMPLETE Column stats: NONE - Statistics: Num rows: 16 Data size: 4162 Basic stats: COMPLETE Column stats: NONE ++ Statistics: Num rows: 16 Data size: 4167 Basic stats: COMPLETE Column stats: NONE HybridGraceHashJoin: true Map Join Operator condition map: @@@ -382,7 -382,7 +382,7 @@@ outputColumnNames: _col0 input vertices: 1 Map 4 - Statistics: Num rows: 1265 Data size: 5063 Basic stats: COMPLETE Column stats: NONE - Statistics: Num rows: 17 Data size: 4578 Basic stats: COMPLETE Column stats: NONE ++ Statistics: Num rows: 17 Data size: 4583 Basic stats: COMPLETE Column stats: NONE HybridGraceHashJoin: true Group By Operator aggregations: count(), sum(_col0) @@@ -398,34 -398,33 +398,34 @@@ Map Operator Tree: TableScan alias: c - Statistics: Num rows: 1046 Data size: 4185 Basic stats: COMPLETE Column stats: NONE - Statistics: Num rows: 15 Data size: 3784 Basic stats: COMPLETE Column stats: NONE ++ Statistics: Num rows: 15 Data size: 3789 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cint (type: int) outputColumnNames: _col0 - Statistics: Num rows: 1046 Data size: 4185 Basic stats: COMPLETE Column stats: NONE - Statistics: Num rows: 15 Data size: 3784 Basic stats: COMPLETE Column stats: NONE ++ Statistics: Num rows: 15 Data size: 3789 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: int) sort order: + Map-reduce partition columns: _col0 (type: int) - Statistics: Num rows: 1046 Data size: 4185 Basic stats: COMPLETE Column stats: NONE - Statistics: Num rows: 15 Data size: 3784 Basic stats: COMPLETE Column stats: NONE ++ Statistics: Num rows: 15 Data size: 3789 Basic stats: COMPLETE Column stats: NONE Execution mode: vectorized Map 4 Map Operator Tree: TableScan alias: c - Statistics: Num rows: 1046 Data size: 4185 Basic stats: COMPLETE Column stats: NONE - Statistics: Num rows: 15 Data size: 3784 Basic stats: COMPLETE Column stats: NONE ++ Statistics: Num rows: 15 Data size: 3789 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ctinyint (type: tinyint) outputColumnNames: _col0 - Statistics: Num rows: 1046 Data size: 4185 Basic stats: COMPLETE Column stats: NONE - Statistics: Num rows: 15 Data size: 3784 Basic stats: COMPLETE Column stats: NONE ++ Statistics: Num rows: 15 Data size: 3789 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: tinyint) sort order: + Map-reduce partition columns: _col0 (type: tinyint) - Statistics: Num rows: 1046 Data size: 4185 Basic stats: COMPLETE Column stats: NONE - Statistics: Num rows: 15 Data size: 3784 Basic stats: COMPLETE Column stats: NONE ++ Statistics: Num rows: 15 Data size: 3789 Basic stats: COMPLETE Column stats: NONE Execution mode: vectorized Reducer 2 + Execution mode: vectorized Reduce Operator Tree: Group By Operator aggregations: count(VALUE._col0), sum(VALUE._col1) http://git-wip-us.apache.org/repos/asf/hive/blob/61cfda9c/ql/src/test/results/clientpositive/tez/vector_outer_join2.q.out ---------------------------------------------------------------------- diff --cc ql/src/test/results/clientpositive/tez/vector_outer_join2.q.out index 48872d3,b8e18e0..5096b44 --- a/ql/src/test/results/clientpositive/tez/vector_outer_join2.q.out +++ b/ql/src/test/results/clientpositive/tez/vector_outer_join2.q.out @@@ -118,11 -118,11 +118,11 @@@ STAGE PLANS Map Operator Tree: TableScan alias: c - Statistics: Num rows: 348 Data size: 4185 Basic stats: COMPLETE Column stats: NONE - Statistics: Num rows: 15 Data size: 3784 Basic stats: COMPLETE Column stats: NONE ++ Statistics: Num rows: 15 Data size: 3789 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cint (type: int), cbigint (type: bigint) outputColumnNames: _col0, _col1 - Statistics: Num rows: 348 Data size: 4185 Basic stats: COMPLETE Column stats: NONE - Statistics: Num rows: 15 Data size: 3784 Basic stats: COMPLETE Column stats: NONE ++ Statistics: Num rows: 15 Data size: 3789 Basic stats: COMPLETE Column stats: NONE Map Join Operator condition map: Left Outer Join0 to 1 @@@ -132,7 -132,7 +132,7 @@@ outputColumnNames: _col1 input vertices: 1 Map 3 - Statistics: Num rows: 1150 Data size: 4603 Basic stats: COMPLETE Column stats: NONE - Statistics: Num rows: 16 Data size: 4162 Basic stats: COMPLETE Column stats: NONE ++ Statistics: Num rows: 16 Data size: 4167 Basic stats: COMPLETE Column stats: NONE HybridGraceHashJoin: true Map Join Operator condition map: @@@ -143,12 -143,12 +143,12 @@@ outputColumnNames: _col1 input vertices: 1 Map 4 - Statistics: Num rows: 1265 Data size: 5063 Basic stats: COMPLETE Column stats: NONE - Statistics: Num rows: 17 Data size: 4578 Basic stats: COMPLETE Column stats: NONE ++ Statistics: Num rows: 17 Data size: 4583 Basic stats: COMPLETE Column stats: NONE HybridGraceHashJoin: true Select Operator expressions: _col1 (type: bigint) outputColumnNames: _col0 - Statistics: Num rows: 1265 Data size: 5063 Basic stats: COMPLETE Column stats: NONE - Statistics: Num rows: 17 Data size: 4578 Basic stats: COMPLETE Column stats: NONE ++ Statistics: Num rows: 17 Data size: 4583 Basic stats: COMPLETE Column stats: NONE Group By Operator aggregations: count(), sum(_col0) mode: hash @@@ -163,34 -163,33 +163,34 @@@ Map Operator Tree: TableScan alias: c - Statistics: Num rows: 1046 Data size: 4185 Basic stats: COMPLETE Column stats: NONE - Statistics: Num rows: 15 Data size: 3784 Basic stats: COMPLETE Column stats: NONE ++ Statistics: Num rows: 15 Data size: 3789 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cint (type: int) outputColumnNames: _col0 - Statistics: Num rows: 1046 Data size: 4185 Basic stats: COMPLETE Column stats: NONE - Statistics: Num rows: 15 Data size: 3784 Basic stats: COMPLETE Column stats: NONE ++ Statistics: Num rows: 15 Data size: 3789 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: int) sort order: + Map-reduce partition columns: _col0 (type: int) - Statistics: Num rows: 1046 Data size: 4185 Basic stats: COMPLETE Column stats: NONE - Statistics: Num rows: 15 Data size: 3784 Basic stats: COMPLETE Column stats: NONE ++ Statistics: Num rows: 15 Data size: 3789 Basic stats: COMPLETE Column stats: NONE Execution mode: vectorized Map 4 Map Operator Tree: TableScan alias: c - Statistics: Num rows: 523 Data size: 4185 Basic stats: COMPLETE Column stats: NONE - Statistics: Num rows: 15 Data size: 3784 Basic stats: COMPLETE Column stats: NONE ++ Statistics: Num rows: 15 Data size: 3789 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: cbigint (type: bigint) outputColumnNames: _col0 - Statistics: Num rows: 523 Data size: 4185 Basic stats: COMPLETE Column stats: NONE - Statistics: Num rows: 15 Data size: 3784 Basic stats: COMPLETE Column stats: NONE ++ Statistics: Num rows: 15 Data size: 3789 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: bigint) sort order: + Map-reduce partition columns: _col0 (type: bigint) - Statistics: Num rows: 523 Data size: 4185 Basic stats: COMPLETE Column stats: NONE - Statistics: Num rows: 15 Data size: 3784 Basic stats: COMPLETE Column stats: NONE ++ Statistics: Num rows: 15 Data size: 3789 Basic stats: COMPLETE Column stats: NONE Execution mode: vectorized Reducer 2 + Execution mode: vectorized Reduce Operator Tree: Group By Operator aggregations: count(VALUE._col0), sum(VALUE._col1)
