HIVE-10899 : 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/a35f1adb Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/a35f1adb Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/a35f1adb Branch: refs/heads/llap Commit: a35f1adb76f45ed2cb933f895a177e3474664d20 Parents: 8d8940a 7556361 Author: Sergey Shelukhin <[email protected]> Authored: Tue Jun 2 16:18:38 2015 -0700 Committer: Sergey Shelukhin <[email protected]> Committed: Tue Jun 2 16:18:38 2015 -0700 ---------------------------------------------------------------------- RELEASE_NOTES.txt | 439 +++- .../common/jsonexplain/tez/TezJsonParser.java | 2 +- .../org/apache/hadoop/hive/conf/HiveConf.java | 37 +- .../hive/common/type/TestHiveBaseChar.java | 2 +- .../hive/common/type/TestHiveVarchar.java | 22 +- .../test/results/clientpositive/url_hook.q.out | 4 + .../hive/hcatalog/common/HCatException.java | 2 +- .../hive/hcatalog/data/TestJsonSerDe.java | 2 +- .../apache/hive/hcatalog/pig/HCatLoader.java | 8 - .../hive/hcatalog/pig/TestHCatLoader.java | 44 - .../hcatalog/pig/TestHCatLoaderEncryption.java | 9 +- .../streaming/DelimitedInputWriter.java | 2 +- .../hive/hcatalog/streaming/HiveEndPoint.java | 2 +- .../hive/hcatalog/streaming/TestStreaming.java | 2 +- .../templeton/tool/JobSubmissionConstants.java | 1 + .../hcatalog/templeton/tool/LaunchMapper.java | 27 +- .../hive/minikdc/TestHs2HooksWithMiniKdc.java | 2 +- .../org/apache/hadoop/hive/UtilsForTest.java | 41 + .../apache/hadoop/hive/hooks/TestHs2Hooks.java | 10 +- .../TestHiveAuthorizerCheckInvocation.java | 34 +- .../plugin/TestHiveAuthorizerShowFilters.java | 6 +- .../apache/hive/jdbc/TestJdbcWithMiniHS2.java | 123 ++ .../authorization/TestJdbcMetadataApiAuth.java | 260 +++ .../TestJdbcWithSQLAuthorization.java | 18 + .../test/resources/testconfiguration.properties | 2 + .../org/apache/hive/jdbc/HiveConnection.java | 45 +- .../apache/hive/jdbc/HivePreparedStatement.java | 2 +- .../apache/hive/jdbc/HiveQueryResultSet.java | 25 +- .../org/apache/hive/jdbc/HiveStatement.java | 24 +- .../apache/hadoop/hive/metastore/Warehouse.java | 12 +- .../metastore/txn/CompactionTxnHandler.java | 9 +- pom.xml | 2 +- .../org/apache/hadoop/hive/ql/exec/DDLTask.java | 37 +- .../apache/hadoop/hive/ql/exec/ExplainTask.java | 4 +- .../hadoop/hive/ql/exec/FunctionRegistry.java | 1 + .../hadoop/hive/ql/exec/MapJoinOperator.java | 6 +- .../apache/hadoop/hive/ql/exec/Utilities.java | 9 +- .../hadoop/hive/ql/exec/spark/CacheTran.java | 54 + .../hive/ql/exec/spark/GroupByShuffler.java | 4 + .../hive/ql/exec/spark/HashTableLoader.java | 23 +- .../ql/exec/spark/HivePairFlatMapFunction.java | 1 + .../ql/exec/spark/HiveSparkClientFactory.java | 1 + .../ql/exec/spark/LocalHiveSparkClient.java | 8 +- .../hadoop/hive/ql/exec/spark/MapInput.java | 16 + .../hadoop/hive/ql/exec/spark/MapTran.java | 22 +- .../hadoop/hive/ql/exec/spark/ReduceTran.java | 23 +- .../ql/exec/spark/RemoteHiveSparkClient.java | 16 +- .../hadoop/hive/ql/exec/spark/ShuffleTran.java | 24 + .../hive/ql/exec/spark/SmallTableCache.java | 73 + .../hive/ql/exec/spark/SortByShuffler.java | 5 + .../hadoop/hive/ql/exec/spark/SparkPlan.java | 150 ++ .../hive/ql/exec/spark/SparkPlanGenerator.java | 25 +- .../hive/ql/exec/spark/SparkShuffler.java | 2 + .../hadoop/hive/ql/exec/spark/SparkTran.java | 6 + .../hive/ql/exec/spark/SparkUtilities.java | 53 +- .../ql/exec/spark/session/SparkSessionImpl.java | 2 +- .../spark/session/SparkSessionManagerImpl.java | 63 +- .../ql/exec/spark/status/SparkJobMonitor.java | 2 +- .../hadoop/hive/ql/exec/tez/TezJobMonitor.java | 10 +- .../ql/exec/vector/VectorizedBatchUtil.java | 2 +- .../hive/ql/io/sarg/SearchArgumentImpl.java | 6 + .../formatting/JsonMetaDataFormatter.java | 2 +- .../metadata/formatting/MetaDataFormatter.java | 2 +- .../formatting/TextMetaDataFormatter.java | 76 +- .../optimizer/ConstantPropagateProcFactory.java | 57 +- .../hive/ql/optimizer/GenMRTableScan1.java | 2 +- .../hive/ql/optimizer/GenMapRedUtils.java | 5 +- .../ql/optimizer/ReduceSinkMapJoinProc.java | 2 +- .../ql/optimizer/calcite/HiveCalciteUtil.java | 2 +- .../ql/optimizer/calcite/HiveRelOptUtil.java | 414 ---- .../ql/optimizer/calcite/RelOptHiveTable.java | 2 +- .../calcite/reloperators/HiveProject.java | 5 +- .../calcite/reloperators/HiveSemiJoin.java | 79 + .../rules/HiveInsertExchange4JoinRule.java | 2 +- .../calcite/translator/HiveOpConverter.java | 6 +- .../correlation/ReduceSinkDeDuplication.java | 12 +- .../spark/SetSparkReducerParallelism.java | 30 +- .../spark/SparkReduceSinkMapJoinProc.java | 2 +- .../hadoop/hive/ql/parse/CalcitePlanner.java | 10 +- .../hive/ql/parse/DDLSemanticAnalyzer.java | 3 +- .../apache/hadoop/hive/ql/parse/HiveParser.g | 4 +- .../hive/ql/parse/ProcessAnalyzeTable.java | 4 +- .../hadoop/hive/ql/parse/SemanticAnalyzer.java | 68 +- .../hive/ql/parse/spark/GenSparkUtils.java | 2 +- .../parse/spark/SparkProcessAnalyzeTable.java | 2 +- .../apache/hadoop/hive/ql/plan/FilterDesc.java | 4 +- .../apache/hadoop/hive/ql/plan/PlanUtils.java | 25 +- .../hadoop/hive/ql/plan/ReduceSinkDesc.java | 15 +- .../hadoop/hive/ql/plan/TableScanDesc.java | 2 +- .../AuthorizationMetaStoreFilterHook.java | 9 +- .../authorization/plugin/HiveOperationType.java | 19 +- .../plugin/HivePrivilegeObjectUtils.java | 51 + .../plugin/sqlstd/Operation2Privilege.java | 17 +- .../SQLStdHiveAuthorizationValidator.java | 5 + .../hive/ql/txn/compactor/CompactorMR.java | 9 +- .../hadoop/hive/ql/txn/compactor/Initiator.java | 2 +- .../hadoop/hive/ql/txn/compactor/Worker.java | 3 +- .../ql/udf/generic/GenericUDAFFirstValue.java | 41 +- .../ql/udf/generic/GenericUDAFLastValue.java | 33 +- .../generic/GenericUDAFStreamingEvaluator.java | 22 - .../hadoop/hive/ql/udf/generic/GenericUDF.java | 23 - .../ql/udf/generic/GenericUDFSortArray.java | 17 +- .../udf/generic/GenericUDFSubstringIndex.java | 159 ++ .../hive/ql/io/sarg/TestSearchArgumentImpl.java | 27 + .../hadoop/hive/ql/plan/TestViewEntity.java | 53 +- .../hive/ql/session/TestSessionState.java | 62 +- .../ql/udf/generic/TestGenericUDFSortArray.java | 158 ++ .../generic/TestGenericUDFSubstringIndex.java | 97 + .../table_nonprintable_negative.q | 11 + .../clientnegative/udf_sort_array_wrong3.q | 2 +- .../queries/clientpositive/alter_merge_2_orc.q | 6 +- .../clientpositive/authorization_view_sqlstd.q | 4 + ql/src/test/queries/clientpositive/auto_join0.q | 11 +- ql/src/test/queries/clientpositive/auto_join1.q | 2 + .../clientpositive/auto_sortmerge_join_5.q | 3 + ql/src/test/queries/clientpositive/cbo_gby.q | 3 + .../test/queries/clientpositive/cbo_udf_udaf.q | 2 + .../test/queries/clientpositive/cbo_windowing.q | 2 + .../clientpositive/cross_product_check_1.q | 9 +- .../clientpositive/cross_product_check_2.q | 6 +- ql/src/test/queries/clientpositive/ctas.q | 1 + ql/src/test/queries/clientpositive/cteViews.q | 41 + .../clientpositive/dynpart_sort_optimization2.q | 7 +- .../test/queries/clientpositive/explainuser_2.q | 7 +- .../clientpositive/filter_join_breaktask2.q | 2 + .../test/queries/clientpositive/insert_into1.q | 15 +- .../test/queries/clientpositive/insert_into2.q | 14 +- .../clientpositive/insert_nonacid_from_acid.q | 2 + .../join_merge_multi_expressions.q | 1 + .../test/queries/clientpositive/join_nullsafe.q | 2 + .../queries/clientpositive/mapjoin_decimal.q | 6 +- ql/src/test/queries/clientpositive/mrr.q | 6 +- ql/src/test/queries/clientpositive/orc_merge1.q | 2 + .../queries/clientpositive/partition_date2.q | 2 + .../queries/clientpositive/script_env_var1.q | 4 +- .../queries/clientpositive/selectDistinctStar.q | 2 + ql/src/test/queries/clientpositive/skewjoin.q | 11 +- .../queries/clientpositive/subquery_exists.q | 1 + .../queries/clientpositive/table_nonprintable.q | 30 + ql/src/test/queries/clientpositive/temp_table.q | 6 +- ql/src/test/queries/clientpositive/tez_dml.q | 2 + .../test/queries/clientpositive/tez_join_hash.q | 2 + .../queries/clientpositive/tez_joins_explain.q | 1 - .../queries/clientpositive/tez_multi_union.q | 1 + .../clientpositive/tez_schema_evolution.q | 12 +- .../clientpositive/udf_nondeterministic.q | 11 + .../queries/clientpositive/udf_sort_array.q | 10 + .../clientpositive/udf_substring_index.q | 32 + .../clientpositive/update_all_partitioned.q | 4 +- .../clientpositive/update_where_partitioned.q | 4 +- .../queries/clientpositive/vector_data_types.q | 12 +- .../clientpositive/vector_null_projection.q | 2 + .../queries/clientpositive/vector_outer_join1.q | 8 +- .../queries/clientpositive/vector_outer_join2.q | 8 +- .../queries/clientpositive/vector_outer_join3.q | 8 +- .../clientpositive/vectorization_part_project.q | 4 +- .../clientpositive/vectorized_distinct_gby.q | 2 +- .../queries/clientpositive/vectorized_mapjoin.q | 2 + .../clientpositive/vectorized_nested_mapjoin.q | 2 + .../clientpositive/vectorized_rcfile_columnar.q | 2 +- .../clientpositive/vectorized_shufflejoin.q | 10 +- .../clientpositive/vectorized_timestamp_funcs.q | 5 +- .../clientpositive/windowing_windowspec2.q | 18 + ql/src/test/resources/RefreshedJarClassV1.txt | 26 + ql/src/test/resources/RefreshedJarClassV2.txt | 26 + ql/src/test/resources/SessionStateTest.jar.v1 | Bin 2176 -> 0 bytes ql/src/test/resources/SessionStateTest.jar.v2 | Bin 2177 -> 0 bytes .../clientnegative/authorization_ctas2.q.out | 2 + .../table_nonprintable_negative.q.out | 19 + .../clientnegative/udf_sort_array_wrong1.q.out | 2 +- .../clientnegative/udf_sort_array_wrong2.q.out | 2 +- .../clientnegative/udf_sort_array_wrong3.q.out | 2 +- .../results/clientpositive/add_part_exist.q.out | 2 + ql/src/test/results/clientpositive/alter1.q.out | 4 + ql/src/test/results/clientpositive/alter2.q.out | 4 + ql/src/test/results/clientpositive/alter3.q.out | 4 + ql/src/test/results/clientpositive/alter4.q.out | 4 + ql/src/test/results/clientpositive/alter5.q.out | 4 + .../alter_change_db_location.q.out | 2 + .../results/clientpositive/alter_db_owner.q.out | 6 + .../results/clientpositive/alter_index.q.out | 2 + .../clientpositive/alter_merge_2_orc.q.out | 16 +- .../clientpositive/alter_rename_partition.q.out | 6 + .../authorization_owner_actions_db.q.out | 2 + .../authorization_view_sqlstd.q.out | 14 + .../results/clientpositive/auto_join0.q.out | 235 +- .../results/clientpositive/auto_join1.q.out | 8 +- .../clientpositive/auto_sortmerge_join_5.q.out | 6 + .../test/results/clientpositive/cbo_gby.q.out | 18 +- .../results/clientpositive/cbo_udf_udaf.q.out | 18 +- .../results/clientpositive/cbo_windowing.q.out | 66 +- .../results/clientpositive/create_view.q.out | 2 + .../clientpositive/cross_product_check_1.q.out | 20 +- .../clientpositive/cross_product_check_2.q.out | 72 +- ql/src/test/results/clientpositive/ctas.q.out | 2 + .../test/results/clientpositive/cteViews.q.out | 242 +++ .../test/results/clientpositive/database.q.out | 12 + .../clientpositive/database_location.q.out | 8 + .../clientpositive/database_properties.q.out | 6 + .../clientpositive/dbtxnmgr_query5.q.out | 2 + .../clientpositive/describe_database.q.out | 4 + .../clientpositive/describe_database_json.q.out | 12 + .../clientpositive/describe_table_json.q.out | 4 + .../dynpart_sort_optimization2.q.out | 166 +- .../encrypted/encryption_drop_table.q.out | 6 + .../encryption_join_unencrypted_tbl.q.out | 8 +- .../encrypted/encryption_move_tbl.q.out | 4 + .../clientpositive/filter_join_breaktask2.q.out | 8 +- .../test/results/clientpositive/fold_case.q.out | 8 +- .../results/clientpositive/index_creation.q.out | 2 + ql/src/test/results/clientpositive/input2.q.out | 4 + ql/src/test/results/clientpositive/input3.q.out | 4 + .../results/clientpositive/insert_into1.q.out | 86 +- .../results/clientpositive/insert_into2.q.out | 82 +- .../insert_nonacid_from_acid.q.out | 20 +- .../join_merge_multi_expressions.q.out | 6 +- .../results/clientpositive/join_nullsafe.q.out | 6 +- .../results/clientpositive/orc_merge1.q.out | 8 +- .../clientpositive/partition_date2.q.out | 8 +- .../results/clientpositive/rename_column.q.out | 4 + .../clientpositive/script_env_var1.q.out | 8 +- .../clientpositive/selectDistinctStar.q.out | 92 +- .../results/clientpositive/show_functions.q.out | 1 + .../results/clientpositive/show_tables.q.out | 18 + .../test/results/clientpositive/skewjoin.q.out | 8 +- .../clientpositive/spark/auto_join0.q.out | 97 +- .../clientpositive/spark/auto_join1.q.out | 8 +- .../spark/auto_sortmerge_join_5.q.out | 6 + .../results/clientpositive/spark/cbo_gby.q.out | 24 +- .../clientpositive/spark/cbo_udf_udaf.q.out | 18 +- .../spark/cross_product_check_1.q.out | 20 +- .../spark/cross_product_check_2.q.out | 68 +- .../results/clientpositive/spark/ctas.q.out | 2 + .../spark/filter_join_breaktask2.q.out | 8 +- .../clientpositive/spark/insert_into1.q.out | 92 +- .../clientpositive/spark/insert_into2.q.out | 88 +- .../spark/join_merge_multi_expressions.q.out | 6 +- .../clientpositive/spark/join_nullsafe.q.out | 6 +- .../clientpositive/spark/mapjoin_decimal.q.out | 41 +- .../clientpositive/spark/parallel_orderby.q.out | 6 +- .../clientpositive/spark/script_env_var1.q.out | 8 +- .../results/clientpositive/spark/skewjoin.q.out | 8 +- .../clientpositive/spark/stats_noscan_2.q.out | 8 +- .../clientpositive/spark/subquery_exists.q.out | 2 + .../clientpositive/spark/temp_table.q.out | 90 +- .../spark/tez_joins_explain.q.out | 2 - .../clientpositive/spark/udf_in_file.q.out | 2 +- .../spark/vector_data_types.q.out | 116 +- .../spark/vectorization_part_project.q.out | 40 +- .../spark/vectorized_mapjoin.q.out | 8 +- .../spark/vectorized_nested_mapjoin.q.out | 8 +- .../spark/vectorized_rcfile_columnar.q.out | 24 +- .../spark/vectorized_shufflejoin.q.out | 37 +- .../spark/vectorized_timestamp_funcs.q.out | 292 +-- .../results/clientpositive/stats_noscan_2.q.out | 8 +- .../clientpositive/subquery_exists.q.out | 2 + .../clientpositive/table_nonprintable.q.out | 72 + .../results/clientpositive/temp_table.q.out | 84 +- .../clientpositive/temp_table_names.q.out | 8 + .../clientpositive/tez/alter_merge_2_orc.q.out | 16 +- .../results/clientpositive/tez/auto_join0.q.out | 91 +- .../results/clientpositive/tez/auto_join1.q.out | 8 +- .../tez/auto_sortmerge_join_5.q.out | 6 + .../results/clientpositive/tez/cbo_gby.q.out | 18 +- .../clientpositive/tez/cbo_udf_udaf.q.out | 18 +- .../clientpositive/tez/cbo_windowing.q.out | 66 +- .../tez/cross_product_check_1.q.out | 20 +- .../tez/cross_product_check_2.q.out | 88 +- .../test/results/clientpositive/tez/ctas.q.out | 2 + .../tez/dynpart_sort_optimization2.q.out | 166 +- .../clientpositive/tez/explainuser_2.q.out | 8 +- .../tez/filter_join_breaktask2.q.out | 8 +- .../clientpositive/tez/insert_into1.q.out | 86 +- .../clientpositive/tez/insert_into2.q.out | 82 +- .../clientpositive/tez/join_nullsafe.q.out | 6 +- .../clientpositive/tez/mapjoin_decimal.q.out | 42 +- .../test/results/clientpositive/tez/mrr.q.out | 287 +-- .../results/clientpositive/tez/orc_merge1.q.out | 8 +- .../clientpositive/tez/script_env_var1.q.out | 8 +- .../clientpositive/tez/selectDistinctStar.q.out | 92 +- .../results/clientpositive/tez/skewjoin.q.out | 8 +- .../clientpositive/tez/subquery_exists.q.out | 2 + .../results/clientpositive/tez/temp_table.q.out | 87 +- .../results/clientpositive/tez/tez_dml.q.out | 2008 +++++++++--------- .../clientpositive/tez/tez_join_hash.q.out | 286 +-- .../clientpositive/tez/tez_joins_explain.q.out | 2 - .../clientpositive/tez/tez_multi_union.q.out | 1002 ++++----- .../tez/tez_schema_evolution.q.out | 96 +- .../tez/update_all_partitioned.q.out | 14 +- .../tez/update_where_partitioned.q.out | 20 +- .../clientpositive/tez/vector_data_types.q.out | 116 +- .../tez/vector_null_projection.q.out | 8 +- .../clientpositive/tez/vector_outer_join1.q.out | 236 +- .../clientpositive/tez/vector_outer_join2.q.out | 40 +- .../clientpositive/tez/vector_outer_join3.q.out | 82 +- .../tez/vectorization_part_project.q.out | 40 +- .../tez/vectorized_distinct_gby.q.out | 4 +- .../clientpositive/tez/vectorized_mapjoin.q.out | 8 +- .../tez/vectorized_nested_mapjoin.q.out | 8 +- .../tez/vectorized_rcfile_columnar.q.out | 24 +- .../tez/vectorized_shufflejoin.q.out | 37 +- .../tez/vectorized_timestamp_funcs.q.out | 292 +-- .../results/clientpositive/udf_in_file.q.out | 2 +- .../clientpositive/udf_nondeterministic.q.out | 120 ++ .../results/clientpositive/udf_sort_array.q.out | 33 + .../clientpositive/udf_substring_index.q.out | 107 + .../clientpositive/update_all_partitioned.q.out | 14 +- .../update_where_partitioned.q.out | 20 +- .../clientpositive/vector_data_types.q.out | 116 +- .../clientpositive/vector_null_projection.q.out | 8 +- .../clientpositive/vector_outer_join1.q.out | 228 +- .../clientpositive/vector_outer_join2.q.out | 36 +- .../clientpositive/vector_outer_join3.q.out | 70 +- .../vectorization_part_project.q.out | 40 +- .../vectorized_distinct_gby.q.out | 4 +- .../clientpositive/vectorized_mapjoin.q.out | 8 +- .../vectorized_nested_mapjoin.q.out | 8 +- .../vectorized_rcfile_columnar.q.out | 24 +- .../clientpositive/vectorized_shufflejoin.q.out | 44 +- .../vectorized_timestamp_funcs.q.out | 292 +-- .../clientpositive/windowing_windowspec2.q.out | 1302 ++++++++++++ .../hadoop/hive/serde2/NullStructSerDe.java | 2 +- .../objectinspector/ObjectInspectorUtils.java | 2 +- .../hive/serde2/lazy/TestLazySimpleSerDe.java | 9 +- .../apache/hive/service/auth/HttpAuthUtils.java | 2 +- .../java/org/apache/hive/service/cli/Type.java | 2 +- .../cli/operation/GetCatalogsOperation.java | 12 +- .../cli/operation/GetColumnsOperation.java | 34 + .../cli/operation/GetFunctionsOperation.java | 25 + .../cli/operation/GetSchemasOperation.java | 13 + .../cli/operation/GetTableTypesOperation.java | 4 + .../cli/operation/GetTablesOperation.java | 10 + .../cli/operation/GetTypeInfoOperation.java | 4 + .../cli/operation/MetadataOperation.java | 35 + .../service/cli/thrift/ThriftHttpServlet.java | 2 +- .../apache/hive/spark/client/JobContext.java | 2 +- .../hive/spark/client/JobContextImpl.java | 7 +- .../hive/spark/client/SparkClientImpl.java | 5 +- .../hive/spark/client/SparkClientUtilities.java | 13 +- .../apache/hive/spark/client/rpc/RpcServer.java | 18 + 340 files changed, 9639 insertions(+), 5235 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/a35f1adb/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/a35f1adb/itests/src/test/resources/testconfiguration.properties ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/a35f1adb/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/a35f1adb/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/a35f1adb/ql/src/java/org/apache/hadoop/hive/ql/exec/FunctionRegistry.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/a35f1adb/ql/src/java/org/apache/hadoop/hive/ql/exec/MapJoinOperator.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/a35f1adb/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/a35f1adb/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/SparkPlanGenerator.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/a35f1adb/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezJobMonitor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/a35f1adb/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/a35f1adb/ql/src/java/org/apache/hadoop/hive/ql/txn/compactor/CompactorMR.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/a35f1adb/ql/src/java/org/apache/hadoop/hive/ql/txn/compactor/Initiator.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/a35f1adb/ql/src/test/queries/clientpositive/mrr.q ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/a35f1adb/ql/src/test/results/clientpositive/tez/mrr.q.out ---------------------------------------------------------------------- diff --cc ql/src/test/results/clientpositive/tez/mrr.q.out index 1713783,d42f9b0..9d3e621 --- a/ql/src/test/results/clientpositive/tez/mrr.q.out +++ b/ql/src/test/results/clientpositive/tez/mrr.q.out @@@ -248,149 -385,17 +385,17 @@@ POSTHOOK: Input: default@sr 86 1 87 1 9 1 + 90 3 92 1 - 96 1 - 100 2 - 103 2 - 104 2 - 113 2 - 118 2 - 12 2 - 120 2 - 125 2 - 129 2 - 134 2 - 137 2 - 146 2 - 149 2 - 15 2 - 152 2 - 164 2 - 165 2 - 172 2 - 174 2 - 175 2 - 176 2 - 179 2 - 18 2 - 191 2 - 195 2 - 197 2 - 200 2 - 203 2 - 205 2 - 207 2 - 209 2 - 213 2 - 216 2 - 217 2 - 219 2 - 221 2 - 223 2 - 224 2 - 229 2 - 233 2 - 237 2 - 238 2 - 239 2 - 24 2 - 242 2 - 255 2 - 256 2 - 26 2 - 265 2 - 272 2 - 278 2 - 280 2 - 281 2 - 282 2 - 288 2 - 307 2 - 309 2 - 317 2 - 321 2 - 322 2 - 325 2 - 331 2 - 333 2 - 342 2 - 344 2 - 353 2 - 367 2 - 37 2 - 382 2 - 395 2 - 397 2 - 399 2 - 404 2 - 413 2 - 414 2 - 42 2 - 424 2 - 429 2 - 439 2 - 458 2 - 459 2 - 462 2 - 463 2 - 478 2 - 492 2 - 51 2 - 58 2 - 67 2 - 72 2 - 76 2 - 83 2 - 84 2 95 2 + 96 1 97 2 98 2 - 0 3 - 119 3 - 128 3 - 167 3 - 187 3 - 193 3 - 199 3 - 208 3 - 273 3 - 298 3 - 311 3 - 316 3 - 318 3 - 327 3 - 35 3 - 369 3 - 384 3 - 396 3 - 403 3 - 409 3 - 417 3 - 430 3 - 431 3 - 438 3 - 454 3 - 466 3 - 480 3 - 498 3 - 5 3 - 70 3 - 90 3 - 138 4 - 169 4 - 277 4 - 406 4 - 468 4 - 489 4 - 230 5 - 348 5 - 401 5 - 469 5 PREHOOK: query: -- join query with multiple reduce stages; -EXPLAIN SELECT s2.key, count(distinct s2.value) as cnt FROM src s1 join src s2 on (s1.key = s2.key) GROUP BY s2.key ORDER BY cnt +EXPLAIN SELECT s2.key, count(distinct s2.value) as cnt FROM src s1 join src s2 on (s1.key = s2.key) GROUP BY s2.key ORDER BY cnt,s2.key PREHOOK: type: QUERY POSTHOOK: query: -- join query with multiple reduce stages; -EXPLAIN SELECT s2.key, count(distinct s2.value) as cnt FROM src s1 join src s2 on (s1.key = s2.key) GROUP BY s2.key ORDER BY cnt +EXPLAIN SELECT s2.key, count(distinct s2.value) as cnt FROM src s1 join src s2 on (s1.key = s2.key) GROUP BY s2.key ORDER BY cnt,s2.key POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage
