Repository: hive Updated Branches: refs/heads/branch-1 339b7d63c -> 9e7a35f7a
HIVE-11620: Fix several qtest output order (Jimmy, reviewed by Chao) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/9e7a35f7 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/9e7a35f7 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/9e7a35f7 Branch: refs/heads/branch-1 Commit: 9e7a35f7a5674a6fc61fa321620b657594f5739a Parents: 339b7d6 Author: Jimmy Xiang <jxi...@cloudera.com> Authored: Wed Aug 19 18:04:49 2015 -0700 Committer: Jimmy Xiang <jxi...@cloudera.com> Committed: Tue Aug 25 09:28:26 2015 -0700 ---------------------------------------------------------------------- .../queries/clientpositive/selectDistinctStar.q | 2 + .../clientpositive/unionall_unbalancedppd.q | 3 ++ .../clientpositive/vector_cast_constant.q | 4 +- .../clientpositive/selectDistinctStar.q.out | 8 +++- .../spark/vector_cast_constant.q.java1.7.out | 41 +++++++++++++------- .../clientpositive/tez/selectDistinctStar.q.out | 8 +++- .../tez/vector_cast_constant.q.java1.7.out | 21 ++++++++-- .../clientpositive/unionall_unbalancedppd.q.out | 14 ++++--- .../vector_cast_constant.q.java1.7.out | 32 ++++++++++++--- 9 files changed, 99 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/9e7a35f7/ql/src/test/queries/clientpositive/selectDistinctStar.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/selectDistinctStar.q b/ql/src/test/queries/clientpositive/selectDistinctStar.q index 300d7e0..3ab0901 100644 --- a/ql/src/test/queries/clientpositive/selectDistinctStar.q +++ b/ql/src/test/queries/clientpositive/selectDistinctStar.q @@ -2,6 +2,8 @@ explain select distinct src.* from src; +-- SORT_QUERY_RESULTS + select distinct src.* from src; select distinct * from src; http://git-wip-us.apache.org/repos/asf/hive/blob/9e7a35f7/ql/src/test/queries/clientpositive/unionall_unbalancedppd.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/unionall_unbalancedppd.q b/ql/src/test/queries/clientpositive/unionall_unbalancedppd.q index 0825c2d..ee9fdef 100644 --- a/ql/src/test/queries/clientpositive/unionall_unbalancedppd.q +++ b/ql/src/test/queries/clientpositive/unionall_unbalancedppd.q @@ -1,4 +1,7 @@ set hive.optimize.ppd=true; + +-- SORT_QUERY_RESULTS + drop table if exists union_all_bug_test_1; drop table if exists union_all_bug_test_2; create table if not exists union_all_bug_test_1 http://git-wip-us.apache.org/repos/asf/hive/blob/9e7a35f7/ql/src/test/queries/clientpositive/vector_cast_constant.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/vector_cast_constant.q b/ql/src/test/queries/clientpositive/vector_cast_constant.q index 890fcb4..5f9094b 100644 --- a/ql/src/test/queries/clientpositive/vector_cast_constant.q +++ b/ql/src/test/queries/clientpositive/vector_cast_constant.q @@ -42,11 +42,11 @@ EXPLAIN SELECT AVG(CAST(50 AS INT)) AS `avg_int_ok`, AVG(CAST(50 AS DOUBLE)) AS `avg_double_ok`, AVG(CAST(50 AS DECIMAL)) AS `avg_decimal_ok` - FROM over1korc GROUP BY i LIMIT 10; + FROM over1korc GROUP BY i ORDER BY i LIMIT 10; SELECT i, AVG(CAST(50 AS INT)) AS `avg_int_ok`, AVG(CAST(50 AS DOUBLE)) AS `avg_double_ok`, AVG(CAST(50 AS DECIMAL)) AS `avg_decimal_ok` - FROM over1korc GROUP BY i LIMIT 10; + FROM over1korc GROUP BY i ORDER BY i LIMIT 10; http://git-wip-us.apache.org/repos/asf/hive/blob/9e7a35f7/ql/src/test/results/clientpositive/selectDistinctStar.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/selectDistinctStar.q.out b/ql/src/test/results/clientpositive/selectDistinctStar.q.out index 8867b8d..dd7cd29 100644 --- a/ql/src/test/results/clientpositive/selectDistinctStar.q.out +++ b/ql/src/test/results/clientpositive/selectDistinctStar.q.out @@ -51,11 +51,15 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: select distinct src.* from src +PREHOOK: query: -- SORT_QUERY_RESULTS + +select distinct src.* from src PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: select distinct src.* from src +POSTHOOK: query: -- SORT_QUERY_RESULTS + +select distinct src.* from src POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### http://git-wip-us.apache.org/repos/asf/hive/blob/9e7a35f7/ql/src/test/results/clientpositive/spark/vector_cast_constant.q.java1.7.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/spark/vector_cast_constant.q.java1.7.out b/ql/src/test/results/clientpositive/spark/vector_cast_constant.q.java1.7.out index aaac8aa..2f90df6 100644 --- a/ql/src/test/results/clientpositive/spark/vector_cast_constant.q.java1.7.out +++ b/ql/src/test/results/clientpositive/spark/vector_cast_constant.q.java1.7.out @@ -106,14 +106,14 @@ PREHOOK: query: EXPLAIN SELECT AVG(CAST(50 AS INT)) AS `avg_int_ok`, AVG(CAST(50 AS DOUBLE)) AS `avg_double_ok`, AVG(CAST(50 AS DECIMAL)) AS `avg_decimal_ok` - FROM over1korc GROUP BY i LIMIT 10 + FROM over1korc GROUP BY i ORDER BY i LIMIT 10 PREHOOK: type: QUERY POSTHOOK: query: EXPLAIN SELECT i, AVG(CAST(50 AS INT)) AS `avg_int_ok`, AVG(CAST(50 AS DOUBLE)) AS `avg_double_ok`, AVG(CAST(50 AS DECIMAL)) AS `avg_decimal_ok` - FROM over1korc GROUP BY i LIMIT 10 + FROM over1korc GROUP BY i ORDER BY i LIMIT 10 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -124,6 +124,7 @@ STAGE PLANS: Spark Edges: Reducer 2 <- Map 1 (GROUP, 2) + Reducer 3 <- Reducer 2 (SORT, 1) #### A masked pattern was here #### Vertices: Map 1 @@ -156,6 +157,17 @@ STAGE PLANS: mode: mergepartial outputColumnNames: _col0, _col1, _col2, _col3 Statistics: Num rows: 524 Data size: 155436 Basic stats: COMPLETE Column stats: NONE + Reduce Output Operator + key expressions: _col0 (type: int) + sort order: + + Statistics: Num rows: 524 Data size: 155436 Basic stats: COMPLETE Column stats: NONE + value expressions: _col1 (type: double), _col2 (type: double), _col3 (type: decimal(14,4)) + Reducer 3 + Reduce Operator Tree: + Select Operator + expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: double), VALUE._col1 (type: double), VALUE._col2 (type: decimal(14,4)) + outputColumnNames: _col0, _col1, _col2, _col3 + Statistics: Num rows: 524 Data size: 155436 Basic stats: COMPLETE Column stats: NONE Limit Number of rows: 10 Statistics: Num rows: 10 Data size: 2960 Basic stats: COMPLETE Column stats: NONE @@ -166,6 +178,7 @@ STAGE PLANS: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + Execution mode: vectorized Stage: Stage-0 Fetch Operator @@ -178,7 +191,7 @@ PREHOOK: query: SELECT AVG(CAST(50 AS INT)) AS `avg_int_ok`, AVG(CAST(50 AS DOUBLE)) AS `avg_double_ok`, AVG(CAST(50 AS DECIMAL)) AS `avg_decimal_ok` - FROM over1korc GROUP BY i LIMIT 10 + FROM over1korc GROUP BY i ORDER BY i LIMIT 10 PREHOOK: type: QUERY PREHOOK: Input: default@over1korc #### A masked pattern was here #### @@ -187,17 +200,17 @@ POSTHOOK: query: SELECT AVG(CAST(50 AS INT)) AS `avg_int_ok`, AVG(CAST(50 AS DOUBLE)) AS `avg_double_ok`, AVG(CAST(50 AS DECIMAL)) AS `avg_decimal_ok` - FROM over1korc GROUP BY i LIMIT 10 + FROM over1korc GROUP BY i ORDER BY i LIMIT 10 POSTHOOK: type: QUERY POSTHOOK: Input: default@over1korc #### A masked pattern was here #### -65636 50.0 50.0 50 -65550 50.0 50.0 50 -65592 50.0 50.0 50 -65744 50.0 50.0 50 -65668 50.0 50.0 50 -65722 50.0 50.0 50 -65598 50.0 50.0 50 -65568 50.0 50.0 50 -65596 50.0 50.0 50 -65738 50.0 50.0 50 +65536 50.0 50.0 50 +65537 50.0 50.0 50 +65538 50.0 50.0 50 +65539 50.0 50.0 50 +65540 50.0 50.0 50 +65541 50.0 50.0 50 +65542 50.0 50.0 50 +65543 50.0 50.0 50 +65544 50.0 50.0 50 +65545 50.0 50.0 50 http://git-wip-us.apache.org/repos/asf/hive/blob/9e7a35f7/ql/src/test/results/clientpositive/tez/selectDistinctStar.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/tez/selectDistinctStar.q.out b/ql/src/test/results/clientpositive/tez/selectDistinctStar.q.out index 59c8f2a..f9575c3 100644 --- a/ql/src/test/results/clientpositive/tez/selectDistinctStar.q.out +++ b/ql/src/test/results/clientpositive/tez/selectDistinctStar.q.out @@ -57,11 +57,15 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: select distinct src.* from src +PREHOOK: query: -- SORT_QUERY_RESULTS + +select distinct src.* from src PREHOOK: type: QUERY PREHOOK: Input: default@src #### A masked pattern was here #### -POSTHOOK: query: select distinct src.* from src +POSTHOOK: query: -- SORT_QUERY_RESULTS + +select distinct src.* from src POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### http://git-wip-us.apache.org/repos/asf/hive/blob/9e7a35f7/ql/src/test/results/clientpositive/tez/vector_cast_constant.q.java1.7.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/tez/vector_cast_constant.q.java1.7.out b/ql/src/test/results/clientpositive/tez/vector_cast_constant.q.java1.7.out index c700038..ac8e02b 100644 --- a/ql/src/test/results/clientpositive/tez/vector_cast_constant.q.java1.7.out +++ b/ql/src/test/results/clientpositive/tez/vector_cast_constant.q.java1.7.out @@ -106,14 +106,14 @@ PREHOOK: query: EXPLAIN SELECT AVG(CAST(50 AS INT)) AS `avg_int_ok`, AVG(CAST(50 AS DOUBLE)) AS `avg_double_ok`, AVG(CAST(50 AS DECIMAL)) AS `avg_decimal_ok` - FROM over1korc GROUP BY i LIMIT 10 + FROM over1korc GROUP BY i ORDER BY i LIMIT 10 PREHOOK: type: QUERY POSTHOOK: query: EXPLAIN SELECT i, AVG(CAST(50 AS INT)) AS `avg_int_ok`, AVG(CAST(50 AS DOUBLE)) AS `avg_double_ok`, AVG(CAST(50 AS DECIMAL)) AS `avg_decimal_ok` - FROM over1korc GROUP BY i LIMIT 10 + FROM over1korc GROUP BY i ORDER BY i LIMIT 10 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -124,6 +124,7 @@ STAGE PLANS: Tez Edges: Reducer 2 <- Map 1 (SIMPLE_EDGE) + Reducer 3 <- Reducer 2 (SIMPLE_EDGE) #### A masked pattern was here #### Vertices: Map 1 @@ -156,6 +157,17 @@ STAGE PLANS: mode: mergepartial outputColumnNames: _col0, _col1, _col2, _col3 Statistics: Num rows: 524 Data size: 155436 Basic stats: COMPLETE Column stats: NONE + Reduce Output Operator + key expressions: _col0 (type: int) + sort order: + + Statistics: Num rows: 524 Data size: 155436 Basic stats: COMPLETE Column stats: NONE + value expressions: _col1 (type: double), _col2 (type: double), _col3 (type: decimal(14,4)) + Reducer 3 + Reduce Operator Tree: + Select Operator + expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: double), VALUE._col1 (type: double), VALUE._col2 (type: decimal(14,4)) + outputColumnNames: _col0, _col1, _col2, _col3 + Statistics: Num rows: 524 Data size: 155436 Basic stats: COMPLETE Column stats: NONE Limit Number of rows: 10 Statistics: Num rows: 10 Data size: 2960 Basic stats: COMPLETE Column stats: NONE @@ -166,6 +178,7 @@ STAGE PLANS: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + Execution mode: vectorized Stage: Stage-0 Fetch Operator @@ -178,7 +191,7 @@ PREHOOK: query: SELECT AVG(CAST(50 AS INT)) AS `avg_int_ok`, AVG(CAST(50 AS DOUBLE)) AS `avg_double_ok`, AVG(CAST(50 AS DECIMAL)) AS `avg_decimal_ok` - FROM over1korc GROUP BY i LIMIT 10 + FROM over1korc GROUP BY i ORDER BY i LIMIT 10 PREHOOK: type: QUERY PREHOOK: Input: default@over1korc #### A masked pattern was here #### @@ -187,7 +200,7 @@ POSTHOOK: query: SELECT AVG(CAST(50 AS INT)) AS `avg_int_ok`, AVG(CAST(50 AS DOUBLE)) AS `avg_double_ok`, AVG(CAST(50 AS DECIMAL)) AS `avg_decimal_ok` - FROM over1korc GROUP BY i LIMIT 10 + FROM over1korc GROUP BY i ORDER BY i LIMIT 10 POSTHOOK: type: QUERY POSTHOOK: Input: default@over1korc #### A masked pattern was here #### http://git-wip-us.apache.org/repos/asf/hive/blob/9e7a35f7/ql/src/test/results/clientpositive/unionall_unbalancedppd.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/unionall_unbalancedppd.q.out b/ql/src/test/results/clientpositive/unionall_unbalancedppd.q.out index 46828e9..99b5cba 100644 --- a/ql/src/test/results/clientpositive/unionall_unbalancedppd.q.out +++ b/ql/src/test/results/clientpositive/unionall_unbalancedppd.q.out @@ -1,6 +1,10 @@ -PREHOOK: query: drop table if exists union_all_bug_test_1 +PREHOOK: query: -- SORT_QUERY_RESULTS + +drop table if exists union_all_bug_test_1 PREHOOK: type: DROPTABLE -POSTHOOK: query: drop table if exists union_all_bug_test_1 +POSTHOOK: query: -- SORT_QUERY_RESULTS + +drop table if exists union_all_bug_test_1 POSTHOOK: type: DROPTABLE PREHOOK: query: drop table if exists union_all_bug_test_2 PREHOOK: type: DROPTABLE @@ -283,8 +287,8 @@ POSTHOOK: Input: default@union_all_bug_test_1 POSTHOOK: Input: default@union_all_bug_test_2 #### A masked pattern was here #### 0 -1 0 +1 PREHOOK: query: SELECT f1 FROM ( @@ -325,10 +329,10 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@union_all_bug_test_1 POSTHOOK: Input: default@union_all_bug_test_2 #### A masked pattern was here #### -1 0 -1 0 +1 +1 PREHOOK: query: SELECT f1 FROM ( http://git-wip-us.apache.org/repos/asf/hive/blob/9e7a35f7/ql/src/test/results/clientpositive/vector_cast_constant.q.java1.7.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/vector_cast_constant.q.java1.7.out b/ql/src/test/results/clientpositive/vector_cast_constant.q.java1.7.out index 789e6c2..9edd6f1 100644 --- a/ql/src/test/results/clientpositive/vector_cast_constant.q.java1.7.out +++ b/ql/src/test/results/clientpositive/vector_cast_constant.q.java1.7.out @@ -106,18 +106,19 @@ PREHOOK: query: EXPLAIN SELECT AVG(CAST(50 AS INT)) AS `avg_int_ok`, AVG(CAST(50 AS DOUBLE)) AS `avg_double_ok`, AVG(CAST(50 AS DECIMAL)) AS `avg_decimal_ok` - FROM over1korc GROUP BY i LIMIT 10 + FROM over1korc GROUP BY i ORDER BY i LIMIT 10 PREHOOK: type: QUERY POSTHOOK: query: EXPLAIN SELECT i, AVG(CAST(50 AS INT)) AS `avg_int_ok`, AVG(CAST(50 AS DOUBLE)) AS `avg_double_ok`, AVG(CAST(50 AS DECIMAL)) AS `avg_decimal_ok` - FROM over1korc GROUP BY i LIMIT 10 + FROM over1korc GROUP BY i ORDER BY i LIMIT 10 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage - Stage-0 depends on stages: Stage-1 + Stage-2 depends on stages: Stage-1 + Stage-0 depends on stages: Stage-2 STAGE PLANS: Stage: Stage-1 @@ -150,6 +151,27 @@ STAGE PLANS: mode: mergepartial outputColumnNames: _col0, _col1, _col2, _col3 Statistics: Num rows: 524 Data size: 155436 Basic stats: COMPLETE Column stats: NONE + File Output Operator + compressed: false + table: + input format: org.apache.hadoop.mapred.SequenceFileInputFormat + output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat + serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe + + Stage: Stage-2 + Map Reduce + Map Operator Tree: + TableScan + Reduce Output Operator + key expressions: _col0 (type: int) + sort order: + + Statistics: Num rows: 524 Data size: 155436 Basic stats: COMPLETE Column stats: NONE + value expressions: _col1 (type: double), _col2 (type: double), _col3 (type: decimal(14,4)) + Reduce Operator Tree: + Select Operator + expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: double), VALUE._col1 (type: double), VALUE._col2 (type: decimal(14,4)) + outputColumnNames: _col0, _col1, _col2, _col3 + Statistics: Num rows: 524 Data size: 155436 Basic stats: COMPLETE Column stats: NONE Limit Number of rows: 10 Statistics: Num rows: 10 Data size: 2960 Basic stats: COMPLETE Column stats: NONE @@ -172,7 +194,7 @@ PREHOOK: query: SELECT AVG(CAST(50 AS INT)) AS `avg_int_ok`, AVG(CAST(50 AS DOUBLE)) AS `avg_double_ok`, AVG(CAST(50 AS DECIMAL)) AS `avg_decimal_ok` - FROM over1korc GROUP BY i LIMIT 10 + FROM over1korc GROUP BY i ORDER BY i LIMIT 10 PREHOOK: type: QUERY PREHOOK: Input: default@over1korc #### A masked pattern was here #### @@ -181,7 +203,7 @@ POSTHOOK: query: SELECT AVG(CAST(50 AS INT)) AS `avg_int_ok`, AVG(CAST(50 AS DOUBLE)) AS `avg_double_ok`, AVG(CAST(50 AS DECIMAL)) AS `avg_decimal_ok` - FROM over1korc GROUP BY i LIMIT 10 + FROM over1korc GROUP BY i ORDER BY i LIMIT 10 POSTHOOK: type: QUERY POSTHOOK: Input: default@over1korc #### A masked pattern was here ####