This is an automated email from the ASF dual-hosted git repository.
gates pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/branch-2 by this push:
new 9a09a3f HIVE-17096: Fix test failures in 2.3 branch
9a09a3f is described below
commit 9a09a3ff3f83686ea6baabebdf32f17235bdf2ea
Author: Pengcheng Xiong <pxi...@apache.org>
AuthorDate: Thu Jul 13 22:11:43 2017 -0700
HIVE-17096: Fix test failures in 2.3 branch
---
ql/src/test/queries/clientpositive/llap_smb.q | 17 ---
.../results/clientpositive/llap/llap_smb.q.out | 167 ++-------------------
.../clientpositive/llap/orc_ppd_basic.q.out | 4 -
3 files changed, 10 insertions(+), 178 deletions(-)
diff --git a/ql/src/test/queries/clientpositive/llap_smb.q
b/ql/src/test/queries/clientpositive/llap_smb.q
index 83681ea..79eaa26 100644
--- a/ql/src/test/queries/clientpositive/llap_smb.q
+++ b/ql/src/test/queries/clientpositive/llap_smb.q
@@ -34,20 +34,3 @@ select y,q,count(*) from orc_a a join orc_b b on a.id=b.id
group by y,q;
-SET hive.llap.io.enabled=false;
-set hive.enforce.sortmergebucketmapjoin=false;
-set hive.optimize.bucketmapjoin=true;
-set hive.optimize.bucketmapjoin.sortedmerge=true;
-set hive.auto.convert.sortmerge.join=true;
-set hive.auto.convert.join=true;
-set hive.auto.convert.join.noconditionaltask.size=10;
-
-explain
-select y,q,count(*) from orc_a a join orc_b b on a.id=b.id group by y,q;
-
--- The results are currently incorrect. See HIVE-16985/HIVE-16965
-
-select y,q,count(*) from orc_a a join orc_b b on a.id=b.id group by y,q;
-
-DROP TABLE orc_a;
-DROP TABLE orc_b;
diff --git a/ql/src/test/results/clientpositive/llap/llap_smb.q.out
b/ql/src/test/results/clientpositive/llap/llap_smb.q.out
index 4cb620a..1c8212b 100644
--- a/ql/src/test/results/clientpositive/llap/llap_smb.q.out
+++ b/ql/src/test/results/clientpositive/llap/llap_smb.q.out
@@ -172,170 +172,23 @@ POSTHOOK: Input: default@orc_a@y=2001/q=8
POSTHOOK: Input: default@orc_a@y=2001/q=9
POSTHOOK: Input: default@orc_b
#### A masked pattern was here ####
+2000 0 6721
+2000 1 7493
2000 2 6578
-2001 8 9438
2000 3 6149
+2000 4 7865
2000 5 5720
+2000 6 5577
+2000 7 6149
+2000 8 9438
2000 9 8151
2001 0 6721
2001 1 7493
2001 2 6578
+2001 3 6149
2001 4 7865
-2001 9 8151
-2000 1 7493
-2000 7 6149
-2000 8 9438
+2001 5 5720
2001 6 5577
2001 7 6149
-2000 0 6721
-2000 4 7865
-2000 6 5577
-2001 3 6149
-2001 5 5720
-PREHOOK: query: explain
-select y,q,count(*) from orc_a a join orc_b b on a.id=b.id group by y,q
-PREHOOK: type: QUERY
-POSTHOOK: query: explain
-select y,q,count(*) from orc_a a join orc_b b on a.id=b.id group by y,q
-POSTHOOK: type: QUERY
-STAGE DEPENDENCIES:
- Stage-1 is a root stage
- Stage-0 depends on stages: Stage-1
-
-STAGE PLANS:
- Stage: Stage-1
- Tez
-#### A masked pattern was here ####
- Edges:
- Reducer 2 <- Map 1 (SIMPLE_EDGE)
-#### A masked pattern was here ####
- Vertices:
- Map 1
- Map Operator Tree:
- TableScan
- alias: b
- filterExpr: id is not null (type: boolean)
- Statistics: Num rows: 200 Data size: 1828 Basic stats:
COMPLETE Column stats: NONE
- Filter Operator
- predicate: id is not null (type: boolean)
- Statistics: Num rows: 200 Data size: 1828 Basic stats:
COMPLETE Column stats: NONE
- Map Operator Tree:
- TableScan
- alias: a
- filterExpr: id is not null (type: boolean)
- Statistics: Num rows: 5000 Data size: 120000 Basic stats:
COMPLETE Column stats: PARTIAL
- Filter Operator
- predicate: id is not null (type: boolean)
- Statistics: Num rows: 5000 Data size: 40000 Basic stats:
COMPLETE Column stats: PARTIAL
- Merge Join Operator
- condition map:
- Inner Join 0 to 1
- keys:
- 0 id (type: bigint)
- 1 id (type: bigint)
- outputColumnNames: _col2, _col3
- Statistics: Num rows: 5500 Data size: 44000 Basic stats:
COMPLETE Column stats: NONE
- Group By Operator
- aggregations: count()
- keys: _col2 (type: int), _col3 (type: smallint)
- mode: hash
- outputColumnNames: _col0, _col1, _col2
- Statistics: Num rows: 5500 Data size: 44000 Basic
stats: COMPLETE Column stats: NONE
- Reduce Output Operator
- key expressions: _col0 (type: int), _col1 (type:
smallint)
- sort order: ++
- Map-reduce partition columns: _col0 (type: int),
_col1 (type: smallint)
- Statistics: Num rows: 5500 Data size: 44000 Basic
stats: COMPLETE Column stats: NONE
- value expressions: _col2 (type: bigint)
- Execution mode: llap
- Reducer 2
- Execution mode: vectorized, llap
- Reduce Operator Tree:
- Group By Operator
- aggregations: count(VALUE._col0)
- keys: KEY._col0 (type: int), KEY._col1 (type: smallint)
- mode: mergepartial
- outputColumnNames: _col0, _col1, _col2
- Statistics: Num rows: 2750 Data size: 22000 Basic stats:
COMPLETE Column stats: NONE
- File Output Operator
- compressed: false
- Statistics: Num rows: 2750 Data size: 22000 Basic stats:
COMPLETE Column stats: NONE
- table:
- input format:
org.apache.hadoop.mapred.SequenceFileInputFormat
- output format:
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
- serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-
- Stage: Stage-0
- Fetch Operator
- limit: -1
- Processor Tree:
- ListSink
-
-PREHOOK: query: select y,q,count(*) from orc_a a join orc_b b on a.id=b.id
group by y,q
-PREHOOK: type: QUERY
-PREHOOK: Input: default@orc_a
-PREHOOK: Input: default@orc_a@y=2000/q=0
-PREHOOK: Input: default@orc_a@y=2000/q=1
-PREHOOK: Input: default@orc_a@y=2000/q=2
-PREHOOK: Input: default@orc_a@y=2000/q=3
-PREHOOK: Input: default@orc_a@y=2000/q=4
-PREHOOK: Input: default@orc_a@y=2000/q=5
-PREHOOK: Input: default@orc_a@y=2000/q=6
-PREHOOK: Input: default@orc_a@y=2000/q=7
-PREHOOK: Input: default@orc_a@y=2000/q=8
-PREHOOK: Input: default@orc_a@y=2000/q=9
-PREHOOK: Input: default@orc_a@y=2001/q=0
-PREHOOK: Input: default@orc_a@y=2001/q=1
-PREHOOK: Input: default@orc_a@y=2001/q=2
-PREHOOK: Input: default@orc_a@y=2001/q=3
-PREHOOK: Input: default@orc_a@y=2001/q=4
-PREHOOK: Input: default@orc_a@y=2001/q=5
-PREHOOK: Input: default@orc_a@y=2001/q=6
-PREHOOK: Input: default@orc_a@y=2001/q=7
-PREHOOK: Input: default@orc_a@y=2001/q=8
-PREHOOK: Input: default@orc_a@y=2001/q=9
-PREHOOK: Input: default@orc_b
-#### A masked pattern was here ####
-POSTHOOK: query: select y,q,count(*) from orc_a a join orc_b b on a.id=b.id
group by y,q
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@orc_a
-POSTHOOK: Input: default@orc_a@y=2000/q=0
-POSTHOOK: Input: default@orc_a@y=2000/q=1
-POSTHOOK: Input: default@orc_a@y=2000/q=2
-POSTHOOK: Input: default@orc_a@y=2000/q=3
-POSTHOOK: Input: default@orc_a@y=2000/q=4
-POSTHOOK: Input: default@orc_a@y=2000/q=5
-POSTHOOK: Input: default@orc_a@y=2000/q=6
-POSTHOOK: Input: default@orc_a@y=2000/q=7
-POSTHOOK: Input: default@orc_a@y=2000/q=8
-POSTHOOK: Input: default@orc_a@y=2000/q=9
-POSTHOOK: Input: default@orc_a@y=2001/q=0
-POSTHOOK: Input: default@orc_a@y=2001/q=1
-POSTHOOK: Input: default@orc_a@y=2001/q=2
-POSTHOOK: Input: default@orc_a@y=2001/q=3
-POSTHOOK: Input: default@orc_a@y=2001/q=4
-POSTHOOK: Input: default@orc_a@y=2001/q=5
-POSTHOOK: Input: default@orc_a@y=2001/q=6
-POSTHOOK: Input: default@orc_a@y=2001/q=7
-POSTHOOK: Input: default@orc_a@y=2001/q=8
-POSTHOOK: Input: default@orc_a@y=2001/q=9
-POSTHOOK: Input: default@orc_b
-#### A masked pattern was here ####
-2001 4 139630
-2001 6 52
-PREHOOK: query: DROP TABLE orc_a
-PREHOOK: type: DROPTABLE
-PREHOOK: Input: default@orc_a
-PREHOOK: Output: default@orc_a
-POSTHOOK: query: DROP TABLE orc_a
-POSTHOOK: type: DROPTABLE
-POSTHOOK: Input: default@orc_a
-POSTHOOK: Output: default@orc_a
-PREHOOK: query: DROP TABLE orc_b
-PREHOOK: type: DROPTABLE
-PREHOOK: Input: default@orc_b
-PREHOOK: Output: default@orc_b
-POSTHOOK: query: DROP TABLE orc_b
-POSTHOOK: type: DROPTABLE
-POSTHOOK: Input: default@orc_b
-POSTHOOK: Output: default@orc_b
+2001 8 9438
+2001 9 8151
diff --git a/ql/src/test/results/clientpositive/llap/orc_ppd_basic.q.out
b/ql/src/test/results/clientpositive/llap/orc_ppd_basic.q.out
index 5748659..5a12268 100644
--- a/ql/src/test/results/clientpositive/llap/orc_ppd_basic.q.out
+++ b/ql/src/test/results/clientpositive/llap/orc_ppd_basic.q.out
@@ -1285,7 +1285,6 @@ PREHOOK: query: insert into table tmp_orcppd
null, null, null, null, null)
PREHOOK: type: QUERY
PREHOOK: Output: default@tmp_orcppd
-Stage-1 LLAP IO COUNTERS:
PREHOOK: query: drop table if exists tbl_orcppd_1_1
PREHOOK: type: DROPTABLE
PREHOOK: query: create table tbl_orcppd_1_1 as
@@ -1316,7 +1315,6 @@ PREHOOK: query: insert into table tmp_orcppd
values(null, null)
PREHOOK: type: QUERY
PREHOOK: Output: default@tmp_orcppd
-Stage-1 LLAP IO COUNTERS:
PREHOOK: query: drop table if exists tbl_orcppd_2_1
PREHOOK: type: DROPTABLE
PREHOOK: query: create table tbl_orcppd_2_1 as
@@ -1338,12 +1336,10 @@ PREHOOK: type: CREATETABLE_AS_SELECT
PREHOOK: Input: default@staging
PREHOOK: Output: database:default
PREHOOK: Output: default@tmp_orcppd
-Stage-1 LLAP IO COUNTERS:
PREHOOK: query: insert into table tmp_orcppd
values(null, null)
PREHOOK: type: QUERY
PREHOOK: Output: default@tmp_orcppd
-Stage-1 LLAP IO COUNTERS:
PREHOOK: query: drop table if exists tbl_orcppd_3_1
PREHOOK: type: DROPTABLE
PREHOOK: query: create table tbl_orcppd_3_1 as
