You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2016/05/21 00:48:28 UTC
hive git commit: HIVE-13197 : Add adapted constprog2.q and
constprog_partitioner.q tests back (Ashutosh Chauhan via Jesus Camacho
Rodriguez)
Repository: hive
Updated Branches:
refs/heads/master ffb79509b -> f68cbcbfb
HIVE-13197 : Add adapted constprog2.q and constprog_partitioner.q tests back (Ashutosh Chauhan via Jesus Camacho Rodriguez)
Signed-off-by: Ashutosh Chauhan <ha...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/f68cbcbf
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/f68cbcbf
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/f68cbcbf
Branch: refs/heads/master
Commit: f68cbcbfb4892ed954948967a978b03f2e754227
Parents: ffb7950
Author: Ashutosh Chauhan <ha...@apache.org>
Authored: Mon Mar 21 18:52:44 2016 -0700
Committer: Ashutosh Chauhan <ha...@apache.org>
Committed: Fri May 20 17:47:50 2016 -0700
----------------------------------------------------------------------
.../test/resources/testconfiguration.properties | 1 -
ql/src/test/queries/clientpositive/constprog2.q | 12 +++
.../clientpositive/constprog_partitioner.q | 18 ++++
.../results/clientpositive/constprog2.q.out | 107 +++++++------------
.../clientpositive/constprog_partitioner.q.out | 77 ++++---------
5 files changed, 93 insertions(+), 122 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/f68cbcbf/itests/src/test/resources/testconfiguration.properties
----------------------------------------------------------------------
diff --git a/itests/src/test/resources/testconfiguration.properties b/itests/src/test/resources/testconfiguration.properties
index c891d40..1ab914d 100644
--- a/itests/src/test/resources/testconfiguration.properties
+++ b/itests/src/test/resources/testconfiguration.properties
@@ -9,7 +9,6 @@ minimr.query.files=auto_sortmerge_join_16.q,\
bucketizedhiveinputformat.q,\
bucketmapjoin6.q,\
bucketmapjoin7.q,\
- constprog_partitioner.q,\
disable_merge_for_bucketing.q,\
empty_dir_in_table.q,\
exchgpartition2lel.q,\
http://git-wip-us.apache.org/repos/asf/hive/blob/f68cbcbf/ql/src/test/queries/clientpositive/constprog2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/constprog2.q b/ql/src/test/queries/clientpositive/constprog2.q
new file mode 100644
index 0000000..dbebd34
--- /dev/null
+++ b/ql/src/test/queries/clientpositive/constprog2.q
@@ -0,0 +1,12 @@
+set hive.mapred.mode=nonstrict;
+set hive.fetch.task.conversion=more;
+set hive.optimize.constant.propagation=true;
+
+EXPLAIN
+SELECT src1.key, src1.key + 1, src2.value
+ FROM srcbucket src1 join srcbucket src2 ON src1.key = src2.key AND src1.key = 86;
+
+EXPLAIN
+SELECT src1.key, src1.key + 1, src2.value
+ FROM srcbucket src1 join srcbucket src2 ON src1.key = src2.key AND cast(src1.key as double) = 86;
+
http://git-wip-us.apache.org/repos/asf/hive/blob/f68cbcbf/ql/src/test/queries/clientpositive/constprog_partitioner.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/constprog_partitioner.q b/ql/src/test/queries/clientpositive/constprog_partitioner.q
new file mode 100644
index 0000000..ba55031
--- /dev/null
+++ b/ql/src/test/queries/clientpositive/constprog_partitioner.q
@@ -0,0 +1,18 @@
+set hive.mapred.mode=nonstrict;
+set hive.fetch.task.conversion=more;
+set hive.optimize.constant.propagation=true;
+
+set mapred.reduce.tasks=4;
+
+EXPLAIN
+SELECT src1.key, src1.key + 1, src2.value
+ FROM srcbucket src1 join srcbucket src2 ON src1.key = src2.key AND src1.key = 100;
+
+EXPLAIN
+SELECT l_partkey, l_suppkey
+FROM lineitem li
+WHERE li.l_linenumber = 1 AND
+ li.l_orderkey IN (SELECT l_orderkey FROM lineitem WHERE l_shipmode = 'AIR' AND l_linenumber = li.l_linenumber)
+;
+
+
http://git-wip-us.apache.org/repos/asf/hive/blob/f68cbcbf/ql/src/test/results/clientpositive/constprog2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/constprog2.q.out b/ql/src/test/results/clientpositive/constprog2.q.out
index d49e50b..0d76fc8 100644
--- a/ql/src/test/results/clientpositive/constprog2.q.out
+++ b/ql/src/test/results/clientpositive/constprog2.q.out
@@ -1,10 +1,11 @@
+Warning: Shuffle Join JOIN[9][tables = [$hdt$_0, $hdt$_1]] in Stage 'Stage-1:MAPRED' is a cross product
PREHOOK: query: EXPLAIN
SELECT src1.key, src1.key + 1, src2.value
- FROM src src1 join src src2 ON src1.key = src2.key AND src1.key = 86
+ FROM srcbucket src1 join srcbucket src2 ON src1.key = src2.key AND src1.key = 86
PREHOOK: type: QUERY
POSTHOOK: query: EXPLAIN
SELECT src1.key, src1.key + 1, src2.value
- FROM src src1 join src src2 ON src1.key = src2.key AND src1.key = 86
+ FROM srcbucket src1 join srcbucket src2 ON src1.key = src2.key AND src1.key = 86
POSTHOOK: type: QUERY
STAGE DEPENDENCIES:
Stage-1 is a root stage
@@ -16,49 +17,45 @@ STAGE PLANS:
Map Operator Tree:
TableScan
alias: src1
- Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 1000 Data size: 10603 Basic stats: COMPLETE Column stats: NONE
Filter Operator
- predicate: (UDFToDouble(key) = 86.0) (type: boolean)
- Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
+ predicate: (key = 86) (type: boolean)
+ Statistics: Num rows: 500 Data size: 5301 Basic stats: COMPLETE Column stats: NONE
Select Operator
- Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 500 Data size: 5301 Basic stats: COMPLETE Column stats: NONE
Reduce Output Operator
- key expressions: '86' (type: string)
- sort order: +
- Map-reduce partition columns: '86' (type: string)
- Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
+ sort order:
+ Statistics: Num rows: 500 Data size: 5301 Basic stats: COMPLETE Column stats: NONE
TableScan
alias: src1
- Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 1000 Data size: 10603 Basic stats: COMPLETE Column stats: NONE
Filter Operator
- predicate: (UDFToDouble(key) = 86.0) (type: boolean)
- Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
+ predicate: (key = 86) (type: boolean)
+ Statistics: Num rows: 500 Data size: 5301 Basic stats: COMPLETE Column stats: NONE
Select Operator
expressions: value (type: string)
outputColumnNames: _col1
- Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 500 Data size: 5301 Basic stats: COMPLETE Column stats: NONE
Reduce Output Operator
- key expressions: '86' (type: string)
- sort order: +
- Map-reduce partition columns: '86' (type: string)
- Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
+ sort order:
+ Statistics: Num rows: 500 Data size: 5301 Basic stats: COMPLETE Column stats: NONE
value expressions: _col1 (type: string)
Reduce Operator Tree:
Join Operator
condition map:
Inner Join 0 to 1
keys:
- 0 _col0 (type: string)
- 1 _col0 (type: string)
+ 0
+ 1
outputColumnNames: _col2
- Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 550 Data size: 5831 Basic stats: COMPLETE Column stats: NONE
Select Operator
- expressions: '86' (type: string), 87.0 (type: double), _col2 (type: string)
+ expressions: 86 (type: int), 87 (type: int), _col2 (type: string)
outputColumnNames: _col0, _col1, _col2
- Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 550 Data size: 5831 Basic stats: COMPLETE Column stats: NONE
File Output Operator
compressed: false
- Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 550 Data size: 5831 Basic stats: COMPLETE Column stats: NONE
table:
input format: org.apache.hadoop.mapred.SequenceFileInputFormat
output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -70,24 +67,13 @@ STAGE PLANS:
Processor Tree:
ListSink
-PREHOOK: query: SELECT src1.key, src1.key + 1, src2.value
- FROM src src1 join src src2 ON src1.key = src2.key AND src1.key = 86
-PREHOOK: type: QUERY
-PREHOOK: Input: default@src
-#### A masked pattern was here ####
-POSTHOOK: query: SELECT src1.key, src1.key + 1, src2.value
- FROM src src1 join src src2 ON src1.key = src2.key AND src1.key = 86
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@src
-#### A masked pattern was here ####
-86 87.0 val_86
PREHOOK: query: EXPLAIN
SELECT src1.key, src1.key + 1, src2.value
- FROM src src1 join src src2 ON src1.key = src2.key AND cast(src1.key as double) = 86
+ FROM srcbucket src1 join srcbucket src2 ON src1.key = src2.key AND cast(src1.key as double) = 86
PREHOOK: type: QUERY
POSTHOOK: query: EXPLAIN
SELECT src1.key, src1.key + 1, src2.value
- FROM src src1 join src src2 ON src1.key = src2.key AND cast(src1.key as double) = 86
+ FROM srcbucket src1 join srcbucket src2 ON src1.key = src2.key AND cast(src1.key as double) = 86
POSTHOOK: type: QUERY
STAGE DEPENDENCIES:
Stage-1 is a root stage
@@ -99,49 +85,49 @@ STAGE PLANS:
Map Operator Tree:
TableScan
alias: src1
- Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 1000 Data size: 10603 Basic stats: COMPLETE Column stats: NONE
Filter Operator
predicate: (UDFToDouble(key) = 86.0) (type: boolean)
- Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 500 Data size: 5301 Basic stats: COMPLETE Column stats: NONE
Select Operator
- Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 500 Data size: 5301 Basic stats: COMPLETE Column stats: NONE
Reduce Output Operator
- key expressions: '86' (type: string)
+ key expressions: 86 (type: int)
sort order: +
- Map-reduce partition columns: '86' (type: string)
- Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
+ Map-reduce partition columns: 86 (type: int)
+ Statistics: Num rows: 500 Data size: 5301 Basic stats: COMPLETE Column stats: NONE
TableScan
alias: src1
- Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 1000 Data size: 10603 Basic stats: COMPLETE Column stats: NONE
Filter Operator
predicate: (UDFToDouble(key) = 86.0) (type: boolean)
- Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 500 Data size: 5301 Basic stats: COMPLETE Column stats: NONE
Select Operator
expressions: value (type: string)
outputColumnNames: _col1
- Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 500 Data size: 5301 Basic stats: COMPLETE Column stats: NONE
Reduce Output Operator
- key expressions: '86' (type: string)
+ key expressions: 86 (type: int)
sort order: +
- Map-reduce partition columns: '86' (type: string)
- Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
+ Map-reduce partition columns: 86 (type: int)
+ Statistics: Num rows: 500 Data size: 5301 Basic stats: COMPLETE Column stats: NONE
value expressions: _col1 (type: string)
Reduce Operator Tree:
Join Operator
condition map:
Inner Join 0 to 1
keys:
- 0 _col0 (type: string)
- 1 _col0 (type: string)
+ 0 _col0 (type: int)
+ 1 _col0 (type: int)
outputColumnNames: _col2
- Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 550 Data size: 5831 Basic stats: COMPLETE Column stats: NONE
Select Operator
- expressions: '86' (type: string), 87.0 (type: double), _col2 (type: string)
+ expressions: 86 (type: int), 87 (type: int), _col2 (type: string)
outputColumnNames: _col0, _col1, _col2
- Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 550 Data size: 5831 Basic stats: COMPLETE Column stats: NONE
File Output Operator
compressed: false
- Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 550 Data size: 5831 Basic stats: COMPLETE Column stats: NONE
table:
input format: org.apache.hadoop.mapred.SequenceFileInputFormat
output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -153,14 +139,3 @@ STAGE PLANS:
Processor Tree:
ListSink
-PREHOOK: query: SELECT src1.key, src1.key + 1, src2.value
- FROM src src1 join src src2 ON src1.key = src2.key AND cast(src1.key as double) = 86
-PREHOOK: type: QUERY
-PREHOOK: Input: default@src
-#### A masked pattern was here ####
-POSTHOOK: query: SELECT src1.key, src1.key + 1, src2.value
- FROM src src1 join src src2 ON src1.key = src2.key AND cast(src1.key as double) = 86
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@src
-#### A masked pattern was here ####
-86 87.0 val_86
http://git-wip-us.apache.org/repos/asf/hive/blob/f68cbcbf/ql/src/test/results/clientpositive/constprog_partitioner.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/constprog_partitioner.q.out b/ql/src/test/results/clientpositive/constprog_partitioner.q.out
index 1dd9128..56874ae 100644
--- a/ql/src/test/results/clientpositive/constprog_partitioner.q.out
+++ b/ql/src/test/results/clientpositive/constprog_partitioner.q.out
@@ -1,10 +1,11 @@
+Warning: Shuffle Join JOIN[9][tables = [$hdt$_0, $hdt$_1]] in Stage 'Stage-1:MAPRED' is a cross product
PREHOOK: query: EXPLAIN
SELECT src1.key, src1.key + 1, src2.value
- FROM src src1 join src src2 ON src1.key = src2.key AND src1.key = 100
+ FROM srcbucket src1 join srcbucket src2 ON src1.key = src2.key AND src1.key = 100
PREHOOK: type: QUERY
POSTHOOK: query: EXPLAIN
SELECT src1.key, src1.key + 1, src2.value
- FROM src src1 join src src2 ON src1.key = src2.key AND src1.key = 100
+ FROM srcbucket src1 join srcbucket src2 ON src1.key = src2.key AND src1.key = 100
POSTHOOK: type: QUERY
STAGE DEPENDENCIES:
Stage-1 is a root stage
@@ -16,49 +17,45 @@ STAGE PLANS:
Map Operator Tree:
TableScan
alias: src1
- Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 1000 Data size: 10603 Basic stats: COMPLETE Column stats: NONE
Filter Operator
- predicate: (UDFToDouble(key) = 100.0) (type: boolean)
- Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
+ predicate: (key = 100) (type: boolean)
+ Statistics: Num rows: 500 Data size: 5301 Basic stats: COMPLETE Column stats: NONE
Select Operator
- Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 500 Data size: 5301 Basic stats: COMPLETE Column stats: NONE
Reduce Output Operator
- key expressions: '100' (type: string)
- sort order: +
- Map-reduce partition columns: '100' (type: string)
- Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
+ sort order:
+ Statistics: Num rows: 500 Data size: 5301 Basic stats: COMPLETE Column stats: NONE
TableScan
alias: src1
- Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 1000 Data size: 10603 Basic stats: COMPLETE Column stats: NONE
Filter Operator
- predicate: (UDFToDouble(key) = 100.0) (type: boolean)
- Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
+ predicate: (key = 100) (type: boolean)
+ Statistics: Num rows: 500 Data size: 5301 Basic stats: COMPLETE Column stats: NONE
Select Operator
expressions: value (type: string)
outputColumnNames: _col1
- Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 500 Data size: 5301 Basic stats: COMPLETE Column stats: NONE
Reduce Output Operator
- key expressions: '100' (type: string)
- sort order: +
- Map-reduce partition columns: '100' (type: string)
- Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
+ sort order:
+ Statistics: Num rows: 500 Data size: 5301 Basic stats: COMPLETE Column stats: NONE
value expressions: _col1 (type: string)
Reduce Operator Tree:
Join Operator
condition map:
Inner Join 0 to 1
keys:
- 0 _col0 (type: string)
- 1 _col0 (type: string)
+ 0
+ 1
outputColumnNames: _col2
- Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 550 Data size: 5831 Basic stats: COMPLETE Column stats: NONE
Select Operator
- expressions: '100' (type: string), 101.0 (type: double), _col2 (type: string)
+ expressions: 100 (type: int), 101 (type: int), _col2 (type: string)
outputColumnNames: _col0, _col1, _col2
- Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 550 Data size: 5831 Basic stats: COMPLETE Column stats: NONE
File Output Operator
compressed: false
- Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
+ Statistics: Num rows: 550 Data size: 5831 Basic stats: COMPLETE Column stats: NONE
table:
input format: org.apache.hadoop.mapred.SequenceFileInputFormat
output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -70,20 +67,6 @@ STAGE PLANS:
Processor Tree:
ListSink
-PREHOOK: query: SELECT src1.key, src1.key + 1, src2.value
- FROM src src1 join src src2 ON src1.key = src2.key AND src1.key = 100
-PREHOOK: type: QUERY
-PREHOOK: Input: default@src
-#### A masked pattern was here ####
-POSTHOOK: query: SELECT src1.key, src1.key + 1, src2.value
- FROM src src1 join src src2 ON src1.key = src2.key AND src1.key = 100
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@src
-#### A masked pattern was here ####
-100 101.0 val_100
-100 101.0 val_100
-100 101.0 val_100
-100 101.0 val_100
PREHOOK: query: EXPLAIN
SELECT l_partkey, l_suppkey
FROM lineitem li
@@ -124,7 +107,7 @@ STAGE PLANS:
alias: li
Statistics: Num rows: 100 Data size: 11999 Basic stats: COMPLETE Column stats: NONE
Filter Operator
- predicate: (((l_shipmode = 'AIR') and (l_linenumber = 1)) and l_orderkey is not null) (type: boolean)
+ predicate: ((l_shipmode = 'AIR') and (l_linenumber = 1) and l_orderkey is not null) (type: boolean)
Statistics: Num rows: 25 Data size: 2999 Basic stats: COMPLETE Column stats: NONE
Select Operator
expressions: l_orderkey (type: int)
@@ -167,19 +150,3 @@ STAGE PLANS:
Processor Tree:
ListSink
-PREHOOK: query: SELECT l_partkey, l_suppkey
-FROM lineitem li
-WHERE li.l_linenumber = 1 AND
- li.l_orderkey IN (SELECT l_orderkey FROM lineitem WHERE l_shipmode = 'AIR' AND l_linenumber = li.l_linenumber)
-PREHOOK: type: QUERY
-PREHOOK: Input: default@lineitem
-#### A masked pattern was here ####
-POSTHOOK: query: SELECT l_partkey, l_suppkey
-FROM lineitem li
-WHERE li.l_linenumber = 1 AND
- li.l_orderkey IN (SELECT l_orderkey FROM lineitem WHERE l_shipmode = 'AIR' AND l_linenumber = li.l_linenumber)
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@lineitem
-#### A masked pattern was here ####
-108570 8571
-4297 1798