You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by jc...@apache.org on 2018/05/16 16:04:59 UTC
[1/2] hive git commit: HIVE-19573: Fix flaky
TestMiniLlapLocalCliDriver#explainuser_4.q (Jesus Camacho Rodriguez)
Repository: hive
Updated Branches:
refs/heads/master bd9264fb3 -> ce0f7b034
HIVE-19573: Fix flaky TestMiniLlapLocalCliDriver#explainuser_4.q (Jesus Camacho Rodriguez)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/c9fcdcf3
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/c9fcdcf3
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/c9fcdcf3
Branch: refs/heads/master
Commit: c9fcdcf342ddbcd5e32baffb897c9185221eb351
Parents: bd9264f
Author: Jesus Camacho Rodriguez <jc...@apache.org>
Authored: Wed May 16 09:02:40 2018 -0700
Committer: Jesus Camacho Rodriguez <jc...@apache.org>
Committed: Wed May 16 09:02:40 2018 -0700
----------------------------------------------------------------------
.../test/queries/clientpositive/explainuser_4.q | 8 ++++----
.../clientpositive/llap/explainuser_4.q.out | 18 +++++++++---------
2 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/c9fcdcf3/ql/src/test/queries/clientpositive/explainuser_4.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/explainuser_4.q b/ql/src/test/queries/clientpositive/explainuser_4.q
index 099971a..a2c25bc 100644
--- a/ql/src/test/queries/clientpositive/explainuser_4.q
+++ b/ql/src/test/queries/clientpositive/explainuser_4.q
@@ -42,7 +42,7 @@ from alltypesorc a join alltypesorc b on a.cint = b.cint
where
a.cint between 1000000 and 3000000 and b.cbigint is not null
group by a.csmallint
-order by c1;
+order by c1, a.csmallint;
select
a.csmallint, count(*) c1
@@ -50,7 +50,7 @@ from alltypesorc a join alltypesorc b on a.cint = b.cint
where
a.cint between 1000000 and 3000000 and b.cbigint is not null
group by a.csmallint
-order by c1;
+order by c1, a.csmallint;
set hive.auto.convert.join=true;
set hive.optimize.dynamic.partition.hashjoin=true;
@@ -94,7 +94,7 @@ from alltypesorc a join alltypesorc b on a.cint = b.cint
where
a.cint between 1000000 and 3000000 and b.cbigint is not null
group by a.csmallint
-order by c1;
+order by c1, a.csmallint;
select
a.csmallint, count(*) c1
@@ -102,7 +102,7 @@ from alltypesorc a join alltypesorc b on a.cint = b.cint
where
a.cint between 1000000 and 3000000 and b.cbigint is not null
group by a.csmallint
-order by c1;
+order by c1, a.csmallint;
-- Left outer join with residual
explain
http://git-wip-us.apache.org/repos/asf/hive/blob/c9fcdcf3/ql/src/test/results/clientpositive/llap/explainuser_4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/explainuser_4.q.out b/ql/src/test/results/clientpositive/llap/explainuser_4.q.out
index 26d858c..c75e82c 100644
--- a/ql/src/test/results/clientpositive/llap/explainuser_4.q.out
+++ b/ql/src/test/results/clientpositive/llap/explainuser_4.q.out
@@ -156,7 +156,7 @@ from alltypesorc a join alltypesorc b on a.cint = b.cint
where
a.cint between 1000000 and 3000000 and b.cbigint is not null
group by a.csmallint
-order by c1
+order by c1, a.csmallint
PREHOOK: type: QUERY
POSTHOOK: query: explain
select
@@ -165,7 +165,7 @@ from alltypesorc a join alltypesorc b on a.cint = b.cint
where
a.cint between 1000000 and 3000000 and b.cbigint is not null
group by a.csmallint
-order by c1
+order by c1, a.csmallint
POSTHOOK: type: QUERY
Plan optimized by CBO.
@@ -218,7 +218,7 @@ from alltypesorc a join alltypesorc b on a.cint = b.cint
where
a.cint between 1000000 and 3000000 and b.cbigint is not null
group by a.csmallint
-order by c1
+order by c1, a.csmallint
PREHOOK: type: QUERY
PREHOOK: Input: default@alltypesorc
#### A masked pattern was here ####
@@ -228,14 +228,14 @@ from alltypesorc a join alltypesorc b on a.cint = b.cint
where
a.cint between 1000000 and 3000000 and b.cbigint is not null
group by a.csmallint
-order by c1
+order by c1, a.csmallint
POSTHOOK: type: QUERY
POSTHOOK: Input: default@alltypesorc
#### A masked pattern was here ####
+-13036 1
-8915 1
-3799 1
10782 1
--13036 1
NULL 6
PREHOOK: query: explain
select
@@ -395,7 +395,7 @@ from alltypesorc a join alltypesorc b on a.cint = b.cint
where
a.cint between 1000000 and 3000000 and b.cbigint is not null
group by a.csmallint
-order by c1
+order by c1, a.csmallint
PREHOOK: type: QUERY
POSTHOOK: query: explain
select
@@ -404,7 +404,7 @@ from alltypesorc a join alltypesorc b on a.cint = b.cint
where
a.cint between 1000000 and 3000000 and b.cbigint is not null
group by a.csmallint
-order by c1
+order by c1, a.csmallint
POSTHOOK: type: QUERY
Plan optimized by CBO.
@@ -457,7 +457,7 @@ from alltypesorc a join alltypesorc b on a.cint = b.cint
where
a.cint between 1000000 and 3000000 and b.cbigint is not null
group by a.csmallint
-order by c1
+order by c1, a.csmallint
PREHOOK: type: QUERY
PREHOOK: Input: default@alltypesorc
#### A masked pattern was here ####
@@ -467,7 +467,7 @@ from alltypesorc a join alltypesorc b on a.cint = b.cint
where
a.cint between 1000000 and 3000000 and b.cbigint is not null
group by a.csmallint
-order by c1
+order by c1, a.csmallint
POSTHOOK: type: QUERY
POSTHOOK: Input: default@alltypesorc
#### A masked pattern was here ####
[2/2] hive git commit: HIVE-19555: Enable
TestMiniLlapLocalCliDriver#tez_dynpart_hashjoin_1.q and
TestMiniLlapLocalCliDriver#tez_vector_dynpart_hashjoin_1.q (Jason Dere,
reviewed by Jesus Camacho Rodriguez)
Posted by jc...@apache.org.
HIVE-19555: Enable TestMiniLlapLocalCliDriver#tez_dynpart_hashjoin_1.q and TestMiniLlapLocalCliDriver#tez_vector_dynpart_hashjoin_1.q (Jason Dere, reviewed by Jesus Camacho Rodriguez)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/ce0f7b03
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/ce0f7b03
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/ce0f7b03
Branch: refs/heads/master
Commit: ce0f7b03418d58b7632d3921f3e403c009bd1282
Parents: c9fcdcf
Author: Jason Dere <jd...@hortonworks.com>
Authored: Wed May 16 09:04:42 2018 -0700
Committer: Jesus Camacho Rodriguez <jc...@apache.org>
Committed: Wed May 16 09:04:42 2018 -0700
----------------------------------------------------------------------
.../hadoop/hive/cli/control/CliConfigs.java | 2 --
.../clientpositive/tez_dynpart_hashjoin_1.q | 4 +--
.../tez_vector_dynpart_hashjoin_1.q | 8 ++---
.../llap/tez_dynpart_hashjoin_1.q.out | 18 +++++------
.../llap/tez_vector_dynpart_hashjoin_1.q.out | 34 ++++++++++----------
5 files changed, 32 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/ce0f7b03/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java
----------------------------------------------------------------------
diff --git a/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java b/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java
index cf8cea7..ac609df 100644
--- a/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java
+++ b/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java
@@ -231,8 +231,6 @@ public class CliConfigs {
excludeQuery("union_fast_stats.q"); // Disabled in HIVE-19509
excludeQuery("schema_evol_orc_acidvec_part.q"); // Disabled in HIVE-19509
excludeQuery("schema_evol_orc_vec_part_llap_io.q"); // Disabled in HIVE-19509
- excludeQuery("tez_dynpart_hashjoin_1.q"); // Disabled in HIVE-19509
- excludeQuery("tez_vector_dynpart_hashjoin_1.q"); // Disabled in HIVE-19509
setResultsDir("ql/src/test/results/clientpositive/llap");
setLogDir("itests/qtest/target/qfile-results/clientpositive");
http://git-wip-us.apache.org/repos/asf/hive/blob/ce0f7b03/ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_1.q b/ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_1.q
index 8d5b442..16e4d7f 100644
--- a/ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_1.q
+++ b/ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_1.q
@@ -41,7 +41,7 @@ from alltypesorc a join alltypesorc b on a.cint = b.cint
where
a.cint between 1000000 and 3000000 and b.cbigint is not null
group by a.csmallint
-order by c1;
+order by a.csmallint;
select
a.csmallint, count(*) c1
@@ -49,7 +49,7 @@ from alltypesorc a join alltypesorc b on a.cint = b.cint
where
a.cint between 1000000 and 3000000 and b.cbigint is not null
group by a.csmallint
-order by c1;
+order by a.csmallint;
set hive.auto.convert.join=true;
set hive.optimize.dynamic.partition.hashjoin=true;
http://git-wip-us.apache.org/repos/asf/hive/blob/ce0f7b03/ql/src/test/queries/clientpositive/tez_vector_dynpart_hashjoin_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/tez_vector_dynpart_hashjoin_1.q b/ql/src/test/queries/clientpositive/tez_vector_dynpart_hashjoin_1.q
index 66e3523..f828471 100644
--- a/ql/src/test/queries/clientpositive/tez_vector_dynpart_hashjoin_1.q
+++ b/ql/src/test/queries/clientpositive/tez_vector_dynpart_hashjoin_1.q
@@ -42,7 +42,7 @@ from alltypesorc a join alltypesorc b on a.cint = b.cint
where
a.cint between 1000000 and 3000000 and b.cbigint is not null
group by a.csmallint
-order by c1;
+order by a.csmallint;
select
a.csmallint, count(*) c1
@@ -50,7 +50,7 @@ from alltypesorc a join alltypesorc b on a.cint = b.cint
where
a.cint between 1000000 and 3000000 and b.cbigint is not null
group by a.csmallint
-order by c1;
+order by a.csmallint;
set hive.auto.convert.join=true;
set hive.optimize.dynamic.partition.hashjoin=true;
@@ -94,7 +94,7 @@ from alltypesorc a join alltypesorc b on a.cint = b.cint
where
a.cint between 1000000 and 3000000 and b.cbigint is not null
group by a.csmallint
-order by c1;
+order by a.csmallint;
select
a.csmallint, count(*) c1
@@ -102,4 +102,4 @@ from alltypesorc a join alltypesorc b on a.cint = b.cint
where
a.cint between 1000000 and 3000000 and b.cbigint is not null
group by a.csmallint
-order by c1;
+order by a.csmallint;
http://git-wip-us.apache.org/repos/asf/hive/blob/ce0f7b03/ql/src/test/results/clientpositive/llap/tez_dynpart_hashjoin_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/tez_dynpart_hashjoin_1.q.out b/ql/src/test/results/clientpositive/llap/tez_dynpart_hashjoin_1.q.out
index e9c6771..8f0572b 100644
--- a/ql/src/test/results/clientpositive/llap/tez_dynpart_hashjoin_1.q.out
+++ b/ql/src/test/results/clientpositive/llap/tez_dynpart_hashjoin_1.q.out
@@ -262,7 +262,7 @@ from alltypesorc a join alltypesorc b on a.cint = b.cint
where
a.cint between 1000000 and 3000000 and b.cbigint is not null
group by a.csmallint
-order by c1
+order by a.csmallint
PREHOOK: type: QUERY
POSTHOOK: query: explain
select
@@ -271,7 +271,7 @@ from alltypesorc a join alltypesorc b on a.cint = b.cint
where
a.cint between 1000000 and 3000000 and b.cbigint is not null
group by a.csmallint
-order by c1
+order by a.csmallint
POSTHOOK: type: QUERY
STAGE DEPENDENCIES:
Stage-1 is a root stage
@@ -359,15 +359,15 @@ STAGE PLANS:
outputColumnNames: _col0, _col1
Statistics: Num rows: 623 Data size: 7064 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- key expressions: _col1 (type: bigint)
+ key expressions: _col0 (type: smallint)
sort order: +
Statistics: Num rows: 623 Data size: 7064 Basic stats: COMPLETE Column stats: COMPLETE
- value expressions: _col0 (type: smallint)
+ value expressions: _col1 (type: bigint)
Reducer 4
Execution mode: vectorized, llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: smallint), KEY.reducesinkkey0 (type: bigint)
+ expressions: KEY.reducesinkkey0 (type: smallint), VALUE._col0 (type: bigint)
outputColumnNames: _col0, _col1
Statistics: Num rows: 623 Data size: 7064 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
@@ -390,7 +390,7 @@ from alltypesorc a join alltypesorc b on a.cint = b.cint
where
a.cint between 1000000 and 3000000 and b.cbigint is not null
group by a.csmallint
-order by c1
+order by a.csmallint
PREHOOK: type: QUERY
PREHOOK: Input: default@alltypesorc
#### A masked pattern was here ####
@@ -400,15 +400,15 @@ from alltypesorc a join alltypesorc b on a.cint = b.cint
where
a.cint between 1000000 and 3000000 and b.cbigint is not null
group by a.csmallint
-order by c1
+order by a.csmallint
POSTHOOK: type: QUERY
POSTHOOK: Input: default@alltypesorc
#### A masked pattern was here ####
+NULL 6
+-13036 1
-8915 1
-3799 1
10782 1
--13036 1
-NULL 6
PREHOOK: query: explain
select
*
http://git-wip-us.apache.org/repos/asf/hive/blob/ce0f7b03/ql/src/test/results/clientpositive/llap/tez_vector_dynpart_hashjoin_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/tez_vector_dynpart_hashjoin_1.q.out b/ql/src/test/results/clientpositive/llap/tez_vector_dynpart_hashjoin_1.q.out
index 68b68c4..d7661aa 100644
--- a/ql/src/test/results/clientpositive/llap/tez_vector_dynpart_hashjoin_1.q.out
+++ b/ql/src/test/results/clientpositive/llap/tez_vector_dynpart_hashjoin_1.q.out
@@ -262,7 +262,7 @@ from alltypesorc a join alltypesorc b on a.cint = b.cint
where
a.cint between 1000000 and 3000000 and b.cbigint is not null
group by a.csmallint
-order by c1
+order by a.csmallint
PREHOOK: type: QUERY
POSTHOOK: query: explain
select
@@ -271,7 +271,7 @@ from alltypesorc a join alltypesorc b on a.cint = b.cint
where
a.cint between 1000000 and 3000000 and b.cbigint is not null
group by a.csmallint
-order by c1
+order by a.csmallint
POSTHOOK: type: QUERY
STAGE DEPENDENCIES:
Stage-1 is a root stage
@@ -359,15 +359,15 @@ STAGE PLANS:
outputColumnNames: _col0, _col1
Statistics: Num rows: 623 Data size: 7064 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
- key expressions: _col1 (type: bigint)
+ key expressions: _col0 (type: smallint)
sort order: +
Statistics: Num rows: 623 Data size: 7064 Basic stats: COMPLETE Column stats: COMPLETE
- value expressions: _col0 (type: smallint)
+ value expressions: _col1 (type: bigint)
Reducer 4
Execution mode: vectorized, llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: smallint), KEY.reducesinkkey0 (type: bigint)
+ expressions: KEY.reducesinkkey0 (type: smallint), VALUE._col0 (type: bigint)
outputColumnNames: _col0, _col1
Statistics: Num rows: 623 Data size: 7064 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
@@ -390,7 +390,7 @@ from alltypesorc a join alltypesorc b on a.cint = b.cint
where
a.cint between 1000000 and 3000000 and b.cbigint is not null
group by a.csmallint
-order by c1
+order by a.csmallint
PREHOOK: type: QUERY
PREHOOK: Input: default@alltypesorc
#### A masked pattern was here ####
@@ -400,15 +400,15 @@ from alltypesorc a join alltypesorc b on a.cint = b.cint
where
a.cint between 1000000 and 3000000 and b.cbigint is not null
group by a.csmallint
-order by c1
+order by a.csmallint
POSTHOOK: type: QUERY
POSTHOOK: Input: default@alltypesorc
#### A masked pattern was here ####
+NULL 6
+-13036 1
-8915 1
-3799 1
10782 1
--13036 1
-NULL 6
PREHOOK: query: explain
select
*
@@ -679,7 +679,7 @@ from alltypesorc a join alltypesorc b on a.cint = b.cint
where
a.cint between 1000000 and 3000000 and b.cbigint is not null
group by a.csmallint
-order by c1
+order by a.csmallint
PREHOOK: type: QUERY
POSTHOOK: query: explain
select
@@ -688,7 +688,7 @@ from alltypesorc a join alltypesorc b on a.cint = b.cint
where
a.cint between 1000000 and 3000000 and b.cbigint is not null
group by a.csmallint
-order by c1
+order by a.csmallint
POSTHOOK: type: QUERY
STAGE DEPENDENCIES:
Stage-1 is a root stage
@@ -779,15 +779,15 @@ STAGE PLANS:
outputColumnNames: _col0, _col1
Statistics: Num rows: 750 Data size: 177548 Basic stats: COMPLETE Column stats: NONE
Reduce Output Operator
- key expressions: _col1 (type: bigint)
+ key expressions: _col0 (type: smallint)
sort order: +
Statistics: Num rows: 750 Data size: 177548 Basic stats: COMPLETE Column stats: NONE
- value expressions: _col0 (type: smallint)
+ value expressions: _col1 (type: bigint)
Reducer 4
Execution mode: vectorized, llap
Reduce Operator Tree:
Select Operator
- expressions: VALUE._col0 (type: smallint), KEY.reducesinkkey0 (type: bigint)
+ expressions: KEY.reducesinkkey0 (type: smallint), VALUE._col0 (type: bigint)
outputColumnNames: _col0, _col1
Statistics: Num rows: 750 Data size: 177548 Basic stats: COMPLETE Column stats: NONE
File Output Operator
@@ -810,7 +810,7 @@ from alltypesorc a join alltypesorc b on a.cint = b.cint
where
a.cint between 1000000 and 3000000 and b.cbigint is not null
group by a.csmallint
-order by c1
+order by a.csmallint
PREHOOK: type: QUERY
PREHOOK: Input: default@alltypesorc
#### A masked pattern was here ####
@@ -820,12 +820,12 @@ from alltypesorc a join alltypesorc b on a.cint = b.cint
where
a.cint between 1000000 and 3000000 and b.cbigint is not null
group by a.csmallint
-order by c1
+order by a.csmallint
POSTHOOK: type: QUERY
POSTHOOK: Input: default@alltypesorc
#### A masked pattern was here ####
+NULL 6
-13036 1
-8915 1
-3799 1
10782 1
-NULL 6