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 2013/04/10 02:07:09 UTC
svn commit: r1466300 [9/13] - in /hive/trunk:
cli/src/java/org/apache/hadoop/hive/cli/
ql/src/test/queries/clientpositive/ ql/src/test/results/clientpositive/
Modified: hive/trunk/ql/src/test/results/clientpositive/ptf_npath.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/ptf_npath.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/ptf_npath.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/ptf_npath.q.out Wed Apr 10 00:06:55 2013
@@ -29,7 +29,8 @@ PREHOOK: Output: default@flights_tiny
POSTHOOK: query: LOAD DATA LOCAL INPATH '../data/files/flights_tiny.txt' OVERWRITE INTO TABLE flights_tiny
POSTHOOK: type: LOAD
POSTHOOK: Output: default@flights_tiny
-PREHOOK: query: select origin_city_name, fl_num, year, month, day_of_month, sz, tpath
+PREHOOK: query: -- 1. basic Npath test
+select origin_city_name, fl_num, year, month, day_of_month, sz, tpath
from npath(on
flights_tiny
distribute by fl_num
@@ -41,7 +42,8 @@ from npath(on
PREHOOK: type: QUERY
PREHOOK: Input: default@flights_tiny
#### A masked pattern was here ####
-POSTHOOK: query: select origin_city_name, fl_num, year, month, day_of_month, sz, tpath
+POSTHOOK: query: -- 1. basic Npath test
+select origin_city_name, fl_num, year, month, day_of_month, sz, tpath
from npath(on
flights_tiny
distribute by fl_num
@@ -69,7 +71,8 @@ Washington 7291 2010 10 27 2 [{"origin_c
Chicago 897 2010 10 20 4 [{"origin_city_name":"Chicago","dest_city_name":"New York","year":2010,"month":10,"day_of_month":20,"arr_delay":24.0,"fl_num":"897"},{"origin_city_name":"Chicago","dest_city_name":"New York","year":2010,"month":10,"day_of_month":21,"arr_delay":77.0,"fl_num":"897"},{"origin_city_name":"Chicago","dest_city_name":"New York","year":2010,"month":10,"day_of_month":22,"arr_delay":24.0,"fl_num":"897"},{"origin_city_name":"Chicago","dest_city_name":"New York","year":2010,"month":10,"day_of_month":24,"arr_delay":113.0,"fl_num":"897"}]
Chicago 897 2010 10 21 3 [{"origin_city_name":"Chicago","dest_city_name":"New York","year":2010,"month":10,"day_of_month":21,"arr_delay":77.0,"fl_num":"897"},{"origin_city_name":"Chicago","dest_city_name":"New York","year":2010,"month":10,"day_of_month":22,"arr_delay":24.0,"fl_num":"897"},{"origin_city_name":"Chicago","dest_city_name":"New York","year":2010,"month":10,"day_of_month":24,"arr_delay":113.0,"fl_num":"897"}]
Chicago 897 2010 10 22 2 [{"origin_city_name":"Chicago","dest_city_name":"New York","year":2010,"month":10,"day_of_month":22,"arr_delay":24.0,"fl_num":"897"},{"origin_city_name":"Chicago","dest_city_name":"New York","year":2010,"month":10,"day_of_month":24,"arr_delay":113.0,"fl_num":"897"}]
-PREHOOK: query: select origin_city_name, fl_num, year, month, day_of_month, sz, tpath
+PREHOOK: query: -- 2. Npath on 1 partition
+select origin_city_name, fl_num, year, month, day_of_month, sz, tpath
from npath(on
flights_tiny
sort by year, month, day_of_month
@@ -81,7 +84,8 @@ where fl_num = 1142
PREHOOK: type: QUERY
PREHOOK: Input: default@flights_tiny
#### A masked pattern was here ####
-POSTHOOK: query: select origin_city_name, fl_num, year, month, day_of_month, sz, tpath
+POSTHOOK: query: -- 2. Npath on 1 partition
+select origin_city_name, fl_num, year, month, day_of_month, sz, tpath
from npath(on
flights_tiny
sort by year, month, day_of_month
Modified: hive/trunk/ql/src/test/results/clientpositive/ptf_rcfile.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/ptf_rcfile.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/ptf_rcfile.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/ptf_rcfile.q.out Wed Apr 10 00:06:55 2013
@@ -33,7 +33,8 @@ PREHOOK: Output: default@part_rc
POSTHOOK: query: LOAD DATA LOCAL INPATH '../data/files/part.rc' overwrite into table part_rc
POSTHOOK: type: LOAD
POSTHOOK: Output: default@part_rc
-PREHOOK: query: select p_mfgr, p_name, p_size,
+PREHOOK: query: -- testWindowingPTFWithPartRC
+select p_mfgr, p_name, p_size,
rank() over (partition by p_mfgr order by p_name) as r,
dense_rank() over (partition by p_mfgr order by p_name) as dr,
sum(p_retailprice) over (partition by p_mfgr order by p_name rows between unbounded preceding and current row) as s1
@@ -43,7 +44,8 @@ order by p_name)
PREHOOK: type: QUERY
PREHOOK: Input: default@part_rc
#### A masked pattern was here ####
-POSTHOOK: query: select p_mfgr, p_name, p_size,
+POSTHOOK: query: -- testWindowingPTFWithPartRC
+select p_mfgr, p_name, p_size,
rank() over (partition by p_mfgr order by p_name) as r,
dense_rank() over (partition by p_mfgr order by p_name) as dr,
sum(p_retailprice) over (partition by p_mfgr order by p_name rows between unbounded preceding and current row) as s1
Modified: hive/trunk/ql/src/test/results/clientpositive/ptf_seqfile.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/ptf_seqfile.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/ptf_seqfile.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/ptf_seqfile.q.out Wed Apr 10 00:06:55 2013
@@ -33,7 +33,8 @@ PREHOOK: Output: default@part_seq
POSTHOOK: query: LOAD DATA LOCAL INPATH '../data/files/part.seq' overwrite into table part_seq
POSTHOOK: type: LOAD
POSTHOOK: Output: default@part_seq
-PREHOOK: query: select p_mfgr, p_name, p_size,
+PREHOOK: query: -- testWindowingPTFWithPartSeqFile
+select p_mfgr, p_name, p_size,
rank() over (partition by p_mfgr order by p_name) as r,
dense_rank() over (partition by p_mfgr order by p_name) as dr,
sum(p_retailprice) over (partition by p_mfgr order by p_name rows between unbounded preceding and current row) as s1
@@ -43,7 +44,8 @@ order by p_name)
PREHOOK: type: QUERY
PREHOOK: Input: default@part_seq
#### A masked pattern was here ####
-POSTHOOK: query: select p_mfgr, p_name, p_size,
+POSTHOOK: query: -- testWindowingPTFWithPartSeqFile
+select p_mfgr, p_name, p_size,
rank() over (partition by p_mfgr order by p_name) as r,
dense_rank() over (partition by p_mfgr order by p_name) as dr,
sum(p_retailprice) over (partition by p_mfgr order by p_name rows between unbounded preceding and current row) as s1
Modified: hive/trunk/ql/src/test/results/clientpositive/rand_partitionpruner1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/rand_partitionpruner1.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/rand_partitionpruner1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/rand_partitionpruner1.q.out Wed Apr 10 00:06:55 2013
@@ -1,6 +1,8 @@
-PREHOOK: query: explain extended select * from src where rand(1) < 0.1
+PREHOOK: query: -- scanning un-partitioned data
+explain extended select * from src where rand(1) < 0.1
PREHOOK: type: QUERY
-POSTHOOK: query: explain extended select * from src where rand(1) < 0.1
+POSTHOOK: query: -- scanning un-partitioned data
+explain extended select * from src where rand(1) < 0.1
POSTHOOK: type: QUERY
ABSTRACT SYNTAX TREE:
(TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR TOK_ALLCOLREF)) (TOK_WHERE (< (TOK_FUNCTION rand 1) 0.1))))
Modified: hive/trunk/ql/src/test/results/clientpositive/rand_partitionpruner2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/rand_partitionpruner2.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/rand_partitionpruner2.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/rand_partitionpruner2.q.out Wed Apr 10 00:06:55 2013
@@ -1,6 +1,10 @@
-PREHOOK: query: create table tmptable(key string, value string, hr string, ds string)
+PREHOOK: query: -- scanning partitioned data
+
+create table tmptable(key string, value string, hr string, ds string)
PREHOOK: type: CREATETABLE
-POSTHOOK: query: create table tmptable(key string, value string, hr string, ds string)
+POSTHOOK: query: -- scanning partitioned data
+
+create table tmptable(key string, value string, hr string, ds string)
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: default@tmptable
PREHOOK: query: explain extended
Modified: hive/trunk/ql/src/test/results/clientpositive/rand_partitionpruner3.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/rand_partitionpruner3.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/rand_partitionpruner3.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/rand_partitionpruner3.q.out Wed Apr 10 00:06:55 2013
@@ -1,6 +1,10 @@
-PREHOOK: query: explain extended select a.* from srcpart a where rand(1) < 0.1 and a.ds = '2008-04-08' and not(key > 50 or key < 10) and a.hr like '%2'
+PREHOOK: query: -- complex predicates in the where clause
+
+explain extended select a.* from srcpart a where rand(1) < 0.1 and a.ds = '2008-04-08' and not(key > 50 or key < 10) and a.hr like '%2'
PREHOOK: type: QUERY
-POSTHOOK: query: explain extended select a.* from srcpart a where rand(1) < 0.1 and a.ds = '2008-04-08' and not(key > 50 or key < 10) and a.hr like '%2'
+POSTHOOK: query: -- complex predicates in the where clause
+
+explain extended select a.* from srcpart a where rand(1) < 0.1 and a.ds = '2008-04-08' and not(key > 50 or key < 10) and a.hr like '%2'
POSTHOOK: type: QUERY
ABSTRACT SYNTAX TREE:
(TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME srcpart) a)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_ALLCOLREF (TOK_TABNAME a)))) (TOK_WHERE (and (and (and (< (TOK_FUNCTION rand 1) 0.1) (= (. (TOK_TABLE_OR_COL a) ds) '2008-04-08')) (not (or (> (TOK_TABLE_OR_COL key) 50) (< (TOK_TABLE_OR_COL key) 10)))) (like (. (TOK_TABLE_OR_COL a) hr) '%2')))))
@@ -123,9 +127,11 @@ POSTHOOK: Input: default@srcpart@ds=2008
26 val_26 2008-04-08 12
18 val_18 2008-04-08 12
37 val_37 2008-04-08 12
-PREHOOK: query: explain extended select a.* from srcpart a where a.ds = '2008-04-08' and not(key > 50 or key < 10) and a.hr like '%2'
+PREHOOK: query: -- without rand for comparison
+explain extended select a.* from srcpart a where a.ds = '2008-04-08' and not(key > 50 or key < 10) and a.hr like '%2'
PREHOOK: type: QUERY
-POSTHOOK: query: explain extended select a.* from srcpart a where a.ds = '2008-04-08' and not(key > 50 or key < 10) and a.hr like '%2'
+POSTHOOK: query: -- without rand for comparison
+explain extended select a.* from srcpart a where a.ds = '2008-04-08' and not(key > 50 or key < 10) and a.hr like '%2'
POSTHOOK: type: QUERY
ABSTRACT SYNTAX TREE:
(TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME srcpart) a)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_ALLCOLREF (TOK_TABNAME a)))) (TOK_WHERE (and (and (= (. (TOK_TABLE_OR_COL a) ds) '2008-04-08') (not (or (> (TOK_TABLE_OR_COL key) 50) (< (TOK_TABLE_OR_COL key) 10)))) (like (. (TOK_TABLE_OR_COL a) hr) '%2')))))
Modified: hive/trunk/ql/src/test/results/clientpositive/rcfile_merge1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/rcfile_merge1.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/rcfile_merge1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/rcfile_merge1.q.out Wed Apr 10 00:06:55 2013
@@ -20,12 +20,14 @@ POSTHOOK: query: CREATE TABLE rcfile_mer
PARTITIONED BY (ds STRING, part STRING) STORED AS RCFILE
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: default@rcfile_merge1b
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- Use non block-level merge
+EXPLAIN
INSERT OVERWRITE TABLE rcfile_merge1 PARTITION (ds='1', part)
SELECT key, value, PMOD(HASH(key), 100) as part
FROM src
PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- Use non block-level merge
+EXPLAIN
INSERT OVERWRITE TABLE rcfile_merge1 PARTITION (ds='1', part)
SELECT key, value, PMOD(HASH(key), 100) as part
FROM src
@@ -1224,7 +1226,8 @@ POSTHOOK: Lineage: rcfile_merge1b PARTIT
POSTHOOK: Lineage: rcfile_merge1b PARTITION(ds=1,part=99).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
POSTHOOK: Lineage: rcfile_merge1b PARTITION(ds=1,part=9).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
POSTHOOK: Lineage: rcfile_merge1b PARTITION(ds=1,part=9).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: SELECT SUM(HASH(c)) FROM (
+PREHOOK: query: -- Verify
+SELECT SUM(HASH(c)) FROM (
SELECT TRANSFORM(*) USING 'tr \t _' AS (c)
FROM rcfile_merge1 WHERE ds='1'
) t
@@ -1330,7 +1333,8 @@ PREHOOK: Input: default@rcfile_merge1@ds
PREHOOK: Input: default@rcfile_merge1@ds=1/part=98
PREHOOK: Input: default@rcfile_merge1@ds=1/part=99
#### A masked pattern was here ####
-POSTHOOK: query: SELECT SUM(HASH(c)) FROM (
+POSTHOOK: query: -- Verify
+SELECT SUM(HASH(c)) FROM (
SELECT TRANSFORM(*) USING 'tr \t _' AS (c)
FROM rcfile_merge1 WHERE ds='1'
) t
Modified: hive/trunk/ql/src/test/results/clientpositive/reducesink_dedup.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/reducesink_dedup.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/reducesink_dedup.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/reducesink_dedup.q.out Wed Apr 10 00:06:55 2013
@@ -2,7 +2,8 @@ PREHOOK: query: DROP TABLE part
PREHOOK: type: DROPTABLE
POSTHOOK: query: DROP TABLE part
POSTHOOK: type: DROPTABLE
-PREHOOK: query: CREATE TABLE part(
+PREHOOK: query: -- data setup
+CREATE TABLE part(
p_partkey INT,
p_name STRING,
p_mfgr STRING,
@@ -14,7 +15,8 @@ PREHOOK: query: CREATE TABLE part(
p_comment STRING
)
PREHOOK: type: CREATETABLE
-POSTHOOK: query: CREATE TABLE part(
+POSTHOOK: query: -- data setup
+CREATE TABLE part(
p_partkey INT,
p_name STRING,
p_mfgr STRING,
Modified: hive/trunk/ql/src/test/results/clientpositive/rename_column.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/rename_column.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/rename_column.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/rename_column.q.out Wed Apr 10 00:06:55 2013
@@ -151,9 +151,11 @@ src_thrift
srcbucket
srcbucket2
srcpart
-PREHOOK: query: CREATE DATABASE kv_rename_test_db
+PREHOOK: query: -- Using non-default Database
+CREATE DATABASE kv_rename_test_db
PREHOOK: type: CREATEDATABASE
-POSTHOOK: query: CREATE DATABASE kv_rename_test_db
+POSTHOOK: query: -- Using non-default Database
+CREATE DATABASE kv_rename_test_db
POSTHOOK: type: CREATEDATABASE
PREHOOK: query: USE kv_rename_test_db
PREHOOK: type: SWITCHDATABASE
Modified: hive/trunk/ql/src/test/results/clientpositive/rename_partition_location.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/rename_partition_location.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/rename_partition_location.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/rename_partition_location.q.out Wed Apr 10 00:06:55 2013
@@ -1,8 +1,14 @@
-PREHOOK: query: CREATE TABLE rename_partition_table (key STRING, value STRING) PARTITIONED BY (part STRING)
+PREHOOK: query: -- This test verifies that if the tables location changes, renaming a partition will not change
+-- the partition location accordingly
+
+CREATE TABLE rename_partition_table (key STRING, value STRING) PARTITIONED BY (part STRING)
STORED AS RCFILE
#### A masked pattern was here ####
PREHOOK: type: CREATETABLE
-POSTHOOK: query: CREATE TABLE rename_partition_table (key STRING, value STRING) PARTITIONED BY (part STRING)
+POSTHOOK: query: -- This test verifies that if the tables location changes, renaming a partition will not change
+-- the partition location accordingly
+
+CREATE TABLE rename_partition_table (key STRING, value STRING) PARTITIONED BY (part STRING)
STORED AS RCFILE
#### A masked pattern was here ####
POSTHOOK: type: CREATETABLE
Modified: hive/trunk/ql/src/test/results/clientpositive/rename_table_location.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/rename_table_location.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/rename_table_location.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/rename_table_location.q.out Wed Apr 10 00:06:55 2013
@@ -1,8 +1,14 @@
-PREHOOK: query: CREATE TABLE rename_partition_table (key STRING, value STRING) PARTITIONED BY (part STRING)
+PREHOOK: query: -- This test verifies that if the tables location changes, renaming a table will not change
+-- the table location scheme
+
+CREATE TABLE rename_partition_table (key STRING, value STRING) PARTITIONED BY (part STRING)
STORED AS RCFILE
#### A masked pattern was here ####
PREHOOK: type: CREATETABLE
-POSTHOOK: query: CREATE TABLE rename_partition_table (key STRING, value STRING) PARTITIONED BY (part STRING)
+POSTHOOK: query: -- This test verifies that if the tables location changes, renaming a table will not change
+-- the table location scheme
+
+CREATE TABLE rename_partition_table (key STRING, value STRING) PARTITIONED BY (part STRING)
STORED AS RCFILE
#### A masked pattern was here ####
POSTHOOK: type: CREATETABLE
@@ -27,7 +33,10 @@ POSTHOOK: Input: default@rename_partitio
POSTHOOK: Output: default@rename_partition_table
POSTHOOK: Lineage: rename_partition_table PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
POSTHOOK: Lineage: rename_partition_table PARTITION(part=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: ALTER TABLE rename_partition_table RENAME TO rename_partition_table_renamed
+PREHOOK: query: -- If the metastore attempts to change the scheme of the table back to the default pfile, it will get
+-- an exception related to the source and destination file systems not matching
+
+ALTER TABLE rename_partition_table RENAME TO rename_partition_table_renamed
PREHOOK: type: ALTERTABLE_RENAME
PREHOOK: Input: default@rename_partition_table
PREHOOK: Output: default@rename_partition_table
Modified: hive/trunk/ql/src/test/results/clientpositive/sample1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/sample1.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/sample1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/sample1.q.out Wed Apr 10 00:06:55 2013
@@ -3,12 +3,14 @@ PREHOOK: type: CREATETABLE
POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING, dt STRING, hr STRING) STORED AS TEXTFILE
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: default@dest1
-PREHOOK: query: EXPLAIN EXTENDED
+PREHOOK: query: -- no input pruning, no sample filter
+EXPLAIN EXTENDED
INSERT OVERWRITE TABLE dest1 SELECT s.*
FROM srcpart TABLESAMPLE (BUCKET 1 OUT OF 1 ON rand()) s
WHERE s.ds='2008-04-08' and s.hr='11'
PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN EXTENDED
+POSTHOOK: query: -- no input pruning, no sample filter
+EXPLAIN EXTENDED
INSERT OVERWRITE TABLE dest1 SELECT s.*
FROM srcpart TABLESAMPLE (BUCKET 1 OUT OF 1 ON rand()) s
WHERE s.ds='2008-04-08' and s.hr='11'
Modified: hive/trunk/ql/src/test/results/clientpositive/sample10.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/sample10.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/sample10.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/sample10.q.out Wed Apr 10 00:06:55 2013
@@ -1,6 +1,10 @@
-PREHOOK: query: create table srcpartbucket (key string, value string) partitioned by (ds string, hr string) clustered by (key) into 4 buckets
+PREHOOK: query: -- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.17, 0.18, 0.19)
+
+create table srcpartbucket (key string, value string) partitioned by (ds string, hr string) clustered by (key) into 4 buckets
PREHOOK: type: CREATETABLE
-POSTHOOK: query: create table srcpartbucket (key string, value string) partitioned by (ds string, hr string) clustered by (key) into 4 buckets
+POSTHOOK: query: -- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.17, 0.18, 0.19)
+
+create table srcpartbucket (key string, value string) partitioned by (ds string, hr string) clustered by (key) into 4 buckets
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: default@srcpartbucket
PREHOOK: query: insert overwrite table srcpartbucket partition(ds, hr) select * from srcpart where ds is not null and key < 10
Modified: hive/trunk/ql/src/test/results/clientpositive/sample2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/sample2.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/sample2.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/sample2.q.out Wed Apr 10 00:06:55 2013
@@ -3,11 +3,15 @@ PREHOOK: type: CREATETABLE
POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: default@dest1
-PREHOOK: query: EXPLAIN EXTENDED
+PREHOOK: query: -- input pruning, no sample filter
+-- default table sample columns
+EXPLAIN EXTENDED
INSERT OVERWRITE TABLE dest1 SELECT s.*
FROM srcbucket TABLESAMPLE (BUCKET 1 OUT OF 2) s
PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN EXTENDED
+POSTHOOK: query: -- input pruning, no sample filter
+-- default table sample columns
+EXPLAIN EXTENDED
INSERT OVERWRITE TABLE dest1 SELECT s.*
FROM srcbucket TABLESAMPLE (BUCKET 1 OUT OF 2) s
POSTHOOK: type: QUERY
Modified: hive/trunk/ql/src/test/results/clientpositive/sample3.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/sample3.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/sample3.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/sample3.q.out Wed Apr 10 00:06:55 2013
@@ -1,8 +1,10 @@
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- no input pruning, sample filter
+EXPLAIN
SELECT s.key
FROM srcbucket TABLESAMPLE (BUCKET 1 OUT OF 5 on key) s
PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- no input pruning, sample filter
+EXPLAIN
SELECT s.key
FROM srcbucket TABLESAMPLE (BUCKET 1 OUT OF 5 on key) s
POSTHOOK: type: QUERY
Modified: hive/trunk/ql/src/test/results/clientpositive/sample4.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/sample4.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/sample4.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/sample4.q.out Wed Apr 10 00:06:55 2013
@@ -3,11 +3,15 @@ PREHOOK: type: CREATETABLE
POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: default@dest1
-PREHOOK: query: EXPLAIN EXTENDED
+PREHOOK: query: -- bucket column is the same as table sample
+-- No need for sample filter
+EXPLAIN EXTENDED
INSERT OVERWRITE TABLE dest1 SELECT s.*
FROM srcbucket TABLESAMPLE (BUCKET 1 OUT OF 2 on key) s
PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN EXTENDED
+POSTHOOK: query: -- bucket column is the same as table sample
+-- No need for sample filter
+EXPLAIN EXTENDED
INSERT OVERWRITE TABLE dest1 SELECT s.*
FROM srcbucket TABLESAMPLE (BUCKET 1 OUT OF 2 on key) s
POSTHOOK: type: QUERY
Modified: hive/trunk/ql/src/test/results/clientpositive/sample5.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/sample5.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/sample5.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/sample5.q.out Wed Apr 10 00:06:55 2013
@@ -3,12 +3,14 @@ PREHOOK: type: CREATETABLE
POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: default@dest1
-PREHOOK: query: EXPLAIN EXTENDED
-INSERT OVERWRITE TABLE dest1 SELECT s.*
+PREHOOK: query: -- no input pruning, sample filter
+EXPLAIN EXTENDED
+INSERT OVERWRITE TABLE dest1 SELECT s.* -- here's another test
FROM srcbucket TABLESAMPLE (BUCKET 1 OUT OF 5 on key) s
PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN EXTENDED
-INSERT OVERWRITE TABLE dest1 SELECT s.*
+POSTHOOK: query: -- no input pruning, sample filter
+EXPLAIN EXTENDED
+INSERT OVERWRITE TABLE dest1 SELECT s.* -- here's another test
FROM srcbucket TABLESAMPLE (BUCKET 1 OUT OF 5 on key) s
POSTHOOK: type: QUERY
ABSTRACT SYNTAX TREE:
@@ -293,12 +295,12 @@ STAGE PLANS:
#### A masked pattern was here ####
-PREHOOK: query: INSERT OVERWRITE TABLE dest1 SELECT s.*
+PREHOOK: query: INSERT OVERWRITE TABLE dest1 SELECT s.* -- here's another test
FROM srcbucket TABLESAMPLE (BUCKET 1 OUT OF 5 on key) s
PREHOOK: type: QUERY
PREHOOK: Input: default@srcbucket
PREHOOK: Output: default@dest1
-POSTHOOK: query: INSERT OVERWRITE TABLE dest1 SELECT s.*
+POSTHOOK: query: INSERT OVERWRITE TABLE dest1 SELECT s.* -- here's another test
FROM srcbucket TABLESAMPLE (BUCKET 1 OUT OF 5 on key) s
POSTHOOK: type: QUERY
POSTHOOK: Input: default@srcbucket
Modified: hive/trunk/ql/src/test/results/clientpositive/sample6.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/sample6.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/sample6.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/sample6.q.out Wed Apr 10 00:06:55 2013
@@ -3,11 +3,13 @@ PREHOOK: type: CREATETABLE
POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: default@dest1
-PREHOOK: query: EXPLAIN EXTENDED
+PREHOOK: query: -- both input pruning and sample filter
+EXPLAIN EXTENDED
INSERT OVERWRITE TABLE dest1 SELECT s.*
FROM srcbucket TABLESAMPLE (BUCKET 1 OUT OF 4 on key) s
PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN EXTENDED
+POSTHOOK: query: -- both input pruning and sample filter
+EXPLAIN EXTENDED
INSERT OVERWRITE TABLE dest1 SELECT s.*
FROM srcbucket TABLESAMPLE (BUCKET 1 OUT OF 4 on key) s
POSTHOOK: type: QUERY
Modified: hive/trunk/ql/src/test/results/clientpositive/sample7.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/sample7.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/sample7.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/sample7.q.out Wed Apr 10 00:06:55 2013
@@ -3,12 +3,14 @@ PREHOOK: type: CREATETABLE
POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: default@dest1
-PREHOOK: query: EXPLAIN EXTENDED
+PREHOOK: query: -- both input pruning and sample filter
+EXPLAIN EXTENDED
INSERT OVERWRITE TABLE dest1 SELECT s.*
FROM srcbucket TABLESAMPLE (BUCKET 1 OUT OF 4 on key) s
WHERE s.key > 100
PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN EXTENDED
+POSTHOOK: query: -- both input pruning and sample filter
+EXPLAIN EXTENDED
INSERT OVERWRITE TABLE dest1 SELECT s.*
FROM srcbucket TABLESAMPLE (BUCKET 1 OUT OF 4 on key) s
WHERE s.key > 100
Modified: hive/trunk/ql/src/test/results/clientpositive/sample8.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/sample8.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/sample8.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/sample8.q.out Wed Apr 10 00:06:55 2013
@@ -1,4 +1,5 @@
-PREHOOK: query: EXPLAIN EXTENDED
+PREHOOK: query: -- sampling with join and alias
+EXPLAIN EXTENDED
SELECT s.*
FROM srcpart TABLESAMPLE (BUCKET 1 OUT OF 1 ON key) s
JOIN srcpart TABLESAMPLE (BUCKET 1 OUT OF 10 ON key) t
@@ -6,7 +7,8 @@ WHERE t.key = s.key and t.value = s.valu
DISTRIBUTE BY key, value
SORT BY key, value
PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN EXTENDED
+POSTHOOK: query: -- sampling with join and alias
+EXPLAIN EXTENDED
SELECT s.*
FROM srcpart TABLESAMPLE (BUCKET 1 OUT OF 1 ON key) s
JOIN srcpart TABLESAMPLE (BUCKET 1 OUT OF 10 ON key) t
Modified: hive/trunk/ql/src/test/results/clientpositive/sample_islocalmode_hook_hadoop20.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/sample_islocalmode_hook_hadoop20.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/sample_islocalmode_hook_hadoop20.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/sample_islocalmode_hook_hadoop20.q.out Wed Apr 10 00:06:55 2013
@@ -2,9 +2,27 @@ PREHOOK: query: USE default
PREHOOK: type: SWITCHDATABASE
POSTHOOK: query: USE default
POSTHOOK: type: SWITCHDATABASE
-PREHOOK: query: create table sih_i_part (key int, value string) partitioned by (p string)
+PREHOOK: query: -- INCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 0.20S)
+-- This test sets mapred.max.split.size=300 and hive.merge.smallfiles.avgsize=1
+-- in an attempt to force the generation of multiple splits and multiple output files.
+-- However, Hadoop 0.20 is incapable of generating splits smaller than the block size
+-- when using CombineFileInputFormat, so only one split is generated. This has a
+-- significant impact on the results of the TABLESAMPLE(x PERCENT). This issue was
+-- fixed in MAPREDUCE-2046 which is included in 0.22.
+
+-- create file inputs
+create table sih_i_part (key int, value string) partitioned by (p string)
PREHOOK: type: CREATETABLE
-POSTHOOK: query: create table sih_i_part (key int, value string) partitioned by (p string)
+POSTHOOK: query: -- INCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 0.20S)
+-- This test sets mapred.max.split.size=300 and hive.merge.smallfiles.avgsize=1
+-- in an attempt to force the generation of multiple splits and multiple output files.
+-- However, Hadoop 0.20 is incapable of generating splits smaller than the block size
+-- when using CombineFileInputFormat, so only one split is generated. This has a
+-- significant impact on the results of the TABLESAMPLE(x PERCENT). This issue was
+-- fixed in MAPREDUCE-2046 which is included in 0.22.
+
+-- create file inputs
+create table sih_i_part (key int, value string) partitioned by (p string)
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: default@sih_i_part
PREHOOK: query: insert overwrite table sih_i_part partition (p='1') select key, value from src
@@ -75,18 +93,21 @@ POSTHOOK: Lineage: sih_i_part PARTITION(
POSTHOOK: Lineage: sih_i_part PARTITION(p=2).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
POSTHOOK: Lineage: sih_i_part PARTITION(p=3).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
POSTHOOK: Lineage: sih_i_part PARTITION(p=3).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: select count(1) from sih_src tablesample(1 percent)
+PREHOOK: query: -- Sample split, running locally limited by num tasks
+select count(1) from sih_src tablesample(1 percent)
PREHOOK: type: QUERY
PREHOOK: Input: default@sih_src
#### A masked pattern was here ####
1500
-PREHOOK: query: select count(1) from sih_src tablesample(1 percent)a join sih_src2 tablesample(1 percent)b on a.key = b.key
+PREHOOK: query: -- sample two tables
+select count(1) from sih_src tablesample(1 percent)a join sih_src2 tablesample(1 percent)b on a.key = b.key
PREHOOK: type: QUERY
PREHOOK: Input: default@sih_src
PREHOOK: Input: default@sih_src2
#### A masked pattern was here ####
3084
-PREHOOK: query: select count(1) from sih_src tablesample(1 percent)
+PREHOOK: query: -- sample split, running locally limited by max bytes
+select count(1) from sih_src tablesample(1 percent)
PREHOOK: type: QUERY
PREHOOK: Input: default@sih_src
#### A masked pattern was here ####
Modified: hive/trunk/ql/src/test/results/clientpositive/script_env_var1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/script_env_var1.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/script_env_var1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/script_env_var1.q.out Wed Apr 10 00:06:55 2013
@@ -1,10 +1,14 @@
-PREHOOK: query: SELECT count(1) FROM
+PREHOOK: query: -- Verifies that script operator ID environment variables have unique values
+-- in each instance of the script operator.
+SELECT count(1) FROM
( SELECT TRANSFORM('echo $HIVE_SCRIPT_OPERATOR_ID') USING 'bash' AS key FROM src LIMIT 1 UNION ALL
SELECT TRANSFORM('echo $HIVE_SCRIPT_OPERATOR_ID') USING 'bash' AS key FROM src LIMIT 1 ) a GROUP BY key
PREHOOK: type: QUERY
PREHOOK: Input: default@src
#### A masked pattern was here ####
-POSTHOOK: query: SELECT count(1) FROM
+POSTHOOK: query: -- Verifies that script operator ID environment variables have unique values
+-- in each instance of the script operator.
+SELECT count(1) FROM
( SELECT TRANSFORM('echo $HIVE_SCRIPT_OPERATOR_ID') USING 'bash' AS key FROM src LIMIT 1 UNION ALL
SELECT TRANSFORM('echo $HIVE_SCRIPT_OPERATOR_ID') USING 'bash' AS key FROM src LIMIT 1 ) a GROUP BY key
POSTHOOK: type: QUERY
Modified: hive/trunk/ql/src/test/results/clientpositive/script_env_var2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/script_env_var2.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/script_env_var2.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/script_env_var2.q.out Wed Apr 10 00:06:55 2013
@@ -1,10 +1,12 @@
-PREHOOK: query: SELECT count(1) FROM
+PREHOOK: query: -- Same test as script_env_var1, but test setting the variable name
+SELECT count(1) FROM
( SELECT TRANSFORM('echo $MY_ID') USING 'bash' AS key FROM src LIMIT 1 UNION ALL
SELECT TRANSFORM('echo $MY_ID') USING 'bash' AS key FROM src LIMIT 1 ) a GROUP BY key
PREHOOK: type: QUERY
PREHOOK: Input: default@src
#### A masked pattern was here ####
-POSTHOOK: query: SELECT count(1) FROM
+POSTHOOK: query: -- Same test as script_env_var1, but test setting the variable name
+SELECT count(1) FROM
( SELECT TRANSFORM('echo $MY_ID') USING 'bash' AS key FROM src LIMIT 1 UNION ALL
SELECT TRANSFORM('echo $MY_ID') USING 'bash' AS key FROM src LIMIT 1 ) a GROUP BY key
POSTHOOK: type: QUERY
Modified: hive/trunk/ql/src/test/results/clientpositive/script_pipe.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/script_pipe.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/script_pipe.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/script_pipe.q.out Wed Apr 10 00:06:55 2013
@@ -1,6 +1,8 @@
-PREHOOK: query: EXPLAIN SELECT TRANSFORM(*) USING 'true' AS a, b, c FROM (SELECT * FROM src LIMIT 1) tmp
+PREHOOK: query: -- Tests exception in ScriptOperator.close() by passing to the operator a small amount of data
+EXPLAIN SELECT TRANSFORM(*) USING 'true' AS a, b, c FROM (SELECT * FROM src LIMIT 1) tmp
PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN SELECT TRANSFORM(*) USING 'true' AS a, b, c FROM (SELECT * FROM src LIMIT 1) tmp
+POSTHOOK: query: -- Tests exception in ScriptOperator.close() by passing to the operator a small amount of data
+EXPLAIN SELECT TRANSFORM(*) USING 'true' AS a, b, c FROM (SELECT * FROM src LIMIT 1) tmp
POSTHOOK: type: QUERY
ABSTRACT SYNTAX TREE:
(TOK_QUERY (TOK_FROM (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR TOK_ALLCOLREF)) (TOK_LIMIT 1))) tmp)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TRANSFORM (TOK_EXPLIST TOK_ALLCOLREF) TOK_SERDE TOK_RECORDWRITER 'true' TOK_SERDE TOK_RECORDREADER (TOK_ALIASLIST a b c))))))
@@ -59,9 +61,11 @@ STAGE PLANS:
limit: -1
-PREHOOK: query: EXPLAIN SELECT TRANSFORM(key, value, key, value, key, value, key, value, key, value, key, value) USING 'head -n 1' as a,b,c,d FROM src
+PREHOOK: query: -- Tests exception in ScriptOperator.processOp() by passing extra data needed to fill pipe buffer
+EXPLAIN SELECT TRANSFORM(key, value, key, value, key, value, key, value, key, value, key, value) USING 'head -n 1' as a,b,c,d FROM src
PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN SELECT TRANSFORM(key, value, key, value, key, value, key, value, key, value, key, value) USING 'head -n 1' as a,b,c,d FROM src
+POSTHOOK: query: -- Tests exception in ScriptOperator.processOp() by passing extra data needed to fill pipe buffer
+EXPLAIN SELECT TRANSFORM(key, value, key, value, key, value, key, value, key, value, key, value) USING 'head -n 1' as a,b,c,d FROM src
POSTHOOK: type: QUERY
ABSTRACT SYNTAX TREE:
(TOK_QUERY (TOK_FROM (TOK_TABREF (TOK_TABNAME src))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TRANSFORM (TOK_EXPLIST (TOK_TABLE_OR_COL key) (TOK_TABLE_OR_COL value) (TOK_TABLE_OR_COL key) (TOK_TABLE_OR_COL value) (TOK_TABLE_OR_COL key) (TOK_TABLE_OR_COL value) (TOK_TABLE_OR_COL key) (TOK_TABLE_OR_COL value) (TOK_TABLE_OR_COL key) (TOK_TABLE_OR_COL value) (TOK_TABLE_OR_COL key) (TOK_TABLE_OR_COL value)) TOK_SERDE TOK_RECORDWRITER 'head -n 1' TOK_SERDE TOK_RECORDREADER (TOK_ALIASLIST a b c d))))))
Modified: hive/trunk/ql/src/test/results/clientpositive/semicolon.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/semicolon.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/semicolon.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/semicolon.q.out Wed Apr 10 00:06:55 2013
@@ -1,8 +1,14 @@
-PREHOOK: query: SELECT COUNT(1) FROM src
+PREHOOK: query: -- comment
+-- comment;
+-- comment
+SELECT COUNT(1) FROM src
PREHOOK: type: QUERY
PREHOOK: Input: default@src
#### A masked pattern was here ####
-POSTHOOK: query: SELECT COUNT(1) FROM src
+POSTHOOK: query: -- comment
+-- comment;
+-- comment
+SELECT COUNT(1) FROM src
POSTHOOK: type: QUERY
POSTHOOK: Input: default@src
#### A masked pattern was here ####
Modified: hive/trunk/ql/src/test/results/clientpositive/show_columns.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/show_columns.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/show_columns.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/show_columns.q.out Wed Apr 10 00:06:55 2013
@@ -37,9 +37,11 @@ POSTHOOK: Input: default@shcol_test
key
value
ds
-PREHOOK: query: CREATE DATABASE test_db
+PREHOOK: query: -- SHOW COLUMNS
+CREATE DATABASE test_db
PREHOOK: type: CREATEDATABASE
-POSTHOOK: query: CREATE DATABASE test_db
+POSTHOOK: query: -- SHOW COLUMNS
+CREATE DATABASE test_db
POSTHOOK: type: CREATEDATABASE
PREHOOK: query: USE test_db
PREHOOK: type: SWITCHDATABASE
@@ -50,9 +52,11 @@ PREHOOK: type: CREATETABLE
POSTHOOK: query: CREATE TABLE foo(a INT)
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: test_db@foo
-PREHOOK: query: USE test_db
+PREHOOK: query: -- SHOW COLUMNS basic syntax tests
+USE test_db
PREHOOK: type: SWITCHDATABASE
-POSTHOOK: query: USE test_db
+POSTHOOK: query: -- SHOW COLUMNS basic syntax tests
+USE test_db
POSTHOOK: type: SWITCHDATABASE
PREHOOK: query: SHOW COLUMNS from foo
PREHOOK: type: SHOWCOLUMNS
@@ -72,9 +76,11 @@ POSTHOOK: Input: test_db@foo
# col_name
a
-PREHOOK: query: CREATE DATABASE `database`
+PREHOOK: query: -- SHOW COLUMNS from a database with a name that requires escaping
+CREATE DATABASE `database`
PREHOOK: type: CREATEDATABASE
-POSTHOOK: query: CREATE DATABASE `database`
+POSTHOOK: query: -- SHOW COLUMNS from a database with a name that requires escaping
+CREATE DATABASE `database`
POSTHOOK: type: CREATEDATABASE
PREHOOK: query: USE `database`
PREHOOK: type: SWITCHDATABASE
Modified: hive/trunk/ql/src/test/results/clientpositive/show_create_table_alter.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/show_create_table_alter.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/show_create_table_alter.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/show_create_table_alter.q.out Wed Apr 10 00:06:55 2013
@@ -1,7 +1,11 @@
-PREHOOK: query: CREATE EXTERNAL TABLE tmp_showcrt1 (key smallint, value float)
+PREHOOK: query: -- Test SHOW CREATE TABLE on an external, clustered and sorted table. Then test the query again after ALTERs.
+
+CREATE EXTERNAL TABLE tmp_showcrt1 (key smallint, value float)
CLUSTERED BY (key) SORTED BY (value DESC) INTO 5 BUCKETS
PREHOOK: type: CREATETABLE
-POSTHOOK: query: CREATE EXTERNAL TABLE tmp_showcrt1 (key smallint, value float)
+POSTHOOK: query: -- Test SHOW CREATE TABLE on an external, clustered and sorted table. Then test the query again after ALTERs.
+
+CREATE EXTERNAL TABLE tmp_showcrt1 (key smallint, value float)
CLUSTERED BY (key) SORTED BY (value DESC) INTO 5 BUCKETS
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: default@tmp_showcrt1
@@ -29,11 +33,13 @@ LOCATION
#### A masked pattern was here ####
TBLPROPERTIES (
#### A masked pattern was here ####
-PREHOOK: query: ALTER TABLE tmp_showcrt1 SET TBLPROPERTIES ('comment'='temporary table', 'EXTERNAL'='FALSE')
+PREHOOK: query: -- Add a comment to the table, change the EXTERNAL property, and test SHOW CREATE TABLE on the change.
+ALTER TABLE tmp_showcrt1 SET TBLPROPERTIES ('comment'='temporary table', 'EXTERNAL'='FALSE')
PREHOOK: type: ALTERTABLE_PROPERTIES
PREHOOK: Input: default@tmp_showcrt1
PREHOOK: Output: default@tmp_showcrt1
-POSTHOOK: query: ALTER TABLE tmp_showcrt1 SET TBLPROPERTIES ('comment'='temporary table', 'EXTERNAL'='FALSE')
+POSTHOOK: query: -- Add a comment to the table, change the EXTERNAL property, and test SHOW CREATE TABLE on the change.
+ALTER TABLE tmp_showcrt1 SET TBLPROPERTIES ('comment'='temporary table', 'EXTERNAL'='FALSE')
POSTHOOK: type: ALTERTABLE_PROPERTIES
POSTHOOK: Input: default@tmp_showcrt1
POSTHOOK: Output: default@tmp_showcrt1
@@ -63,11 +69,13 @@ LOCATION
TBLPROPERTIES (
'EXTERNAL'='FALSE',
#### A masked pattern was here ####
-PREHOOK: query: ALTER TABLE tmp_showcrt1 SET TBLPROPERTIES ('comment'='changed comment', 'EXTERNAL'='TRUE')
+PREHOOK: query: -- Alter the table comment, change the EXTERNAL property back and test SHOW CREATE TABLE on the change.
+ALTER TABLE tmp_showcrt1 SET TBLPROPERTIES ('comment'='changed comment', 'EXTERNAL'='TRUE')
PREHOOK: type: ALTERTABLE_PROPERTIES
PREHOOK: Input: default@tmp_showcrt1
PREHOOK: Output: default@tmp_showcrt1
-POSTHOOK: query: ALTER TABLE tmp_showcrt1 SET TBLPROPERTIES ('comment'='changed comment', 'EXTERNAL'='TRUE')
+POSTHOOK: query: -- Alter the table comment, change the EXTERNAL property back and test SHOW CREATE TABLE on the change.
+ALTER TABLE tmp_showcrt1 SET TBLPROPERTIES ('comment'='changed comment', 'EXTERNAL'='TRUE')
POSTHOOK: type: ALTERTABLE_PROPERTIES
POSTHOOK: Input: default@tmp_showcrt1
POSTHOOK: Output: default@tmp_showcrt1
@@ -96,11 +104,13 @@ LOCATION
#### A masked pattern was here ####
TBLPROPERTIES (
#### A masked pattern was here ####
-PREHOOK: query: ALTER TABLE tmp_showcrt1 SET TBLPROPERTIES ('SORTBUCKETCOLSPREFIX'='FALSE')
+PREHOOK: query: -- Change the 'SORTBUCKETCOLSPREFIX' property and test SHOW CREATE TABLE. The output should not change.
+ALTER TABLE tmp_showcrt1 SET TBLPROPERTIES ('SORTBUCKETCOLSPREFIX'='FALSE')
PREHOOK: type: ALTERTABLE_PROPERTIES
PREHOOK: Input: default@tmp_showcrt1
PREHOOK: Output: default@tmp_showcrt1
-POSTHOOK: query: ALTER TABLE tmp_showcrt1 SET TBLPROPERTIES ('SORTBUCKETCOLSPREFIX'='FALSE')
+POSTHOOK: query: -- Change the 'SORTBUCKETCOLSPREFIX' property and test SHOW CREATE TABLE. The output should not change.
+ALTER TABLE tmp_showcrt1 SET TBLPROPERTIES ('SORTBUCKETCOLSPREFIX'='FALSE')
POSTHOOK: type: ALTERTABLE_PROPERTIES
POSTHOOK: Input: default@tmp_showcrt1
POSTHOOK: Output: default@tmp_showcrt1
@@ -129,11 +139,13 @@ LOCATION
#### A masked pattern was here ####
TBLPROPERTIES (
#### A masked pattern was here ####
-PREHOOK: query: ALTER TABLE tmp_showcrt1 SET TBLPROPERTIES ('storage_handler'='org.apache.hadoop.hive.ql.metadata.DefaultStorageHandler')
+PREHOOK: query: -- Alter the storage handler of the table, and test SHOW CREATE TABLE.
+ALTER TABLE tmp_showcrt1 SET TBLPROPERTIES ('storage_handler'='org.apache.hadoop.hive.ql.metadata.DefaultStorageHandler')
PREHOOK: type: ALTERTABLE_PROPERTIES
PREHOOK: Input: default@tmp_showcrt1
PREHOOK: Output: default@tmp_showcrt1
-POSTHOOK: query: ALTER TABLE tmp_showcrt1 SET TBLPROPERTIES ('storage_handler'='org.apache.hadoop.hive.ql.metadata.DefaultStorageHandler')
+POSTHOOK: query: -- Alter the storage handler of the table, and test SHOW CREATE TABLE.
+ALTER TABLE tmp_showcrt1 SET TBLPROPERTIES ('storage_handler'='org.apache.hadoop.hive.ql.metadata.DefaultStorageHandler')
POSTHOOK: type: ALTERTABLE_PROPERTIES
POSTHOOK: Input: default@tmp_showcrt1
POSTHOOK: Output: default@tmp_showcrt1
Modified: hive/trunk/ql/src/test/results/clientpositive/show_create_table_db_table.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/show_create_table_db_table.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/show_create_table_db_table.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/show_create_table_db_table.q.out Wed Apr 10 00:06:55 2013
@@ -1,6 +1,10 @@
-PREHOOK: query: CREATE DATABASE tmp_feng comment 'for show create table test'
+PREHOOK: query: -- Test SHOW CREATE TABLE on a table name of format "db.table".
+
+CREATE DATABASE tmp_feng comment 'for show create table test'
PREHOOK: type: CREATEDATABASE
-POSTHOOK: query: CREATE DATABASE tmp_feng comment 'for show create table test'
+POSTHOOK: query: -- Test SHOW CREATE TABLE on a table name of format "db.table".
+
+CREATE DATABASE tmp_feng comment 'for show create table test'
POSTHOOK: type: CREATEDATABASE
PREHOOK: query: SHOW DATABASES
PREHOOK: type: SHOWDATABASES
Modified: hive/trunk/ql/src/test/results/clientpositive/show_create_table_delimited.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/show_create_table_delimited.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/show_create_table_delimited.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/show_create_table_delimited.q.out Wed Apr 10 00:06:55 2013
@@ -1,9 +1,13 @@
-PREHOOK: query: CREATE TABLE tmp_showcrt1 (key int, value string, newvalue bigint)
+PREHOOK: query: -- Test SHOW CREATE TABLE on a table with delimiters, stored format, and location.
+
+CREATE TABLE tmp_showcrt1 (key int, value string, newvalue bigint)
ROW FORMAT DELIMITED FIELDS TERMINATED BY ',' COLLECTION ITEMS TERMINATED BY '|' MAP KEYS TERMINATED BY '\045' LINES TERMINATED BY '\n'
STORED AS textfile
#### A masked pattern was here ####
PREHOOK: type: CREATETABLE
-POSTHOOK: query: CREATE TABLE tmp_showcrt1 (key int, value string, newvalue bigint)
+POSTHOOK: query: -- Test SHOW CREATE TABLE on a table with delimiters, stored format, and location.
+
+CREATE TABLE tmp_showcrt1 (key int, value string, newvalue bigint)
ROW FORMAT DELIMITED FIELDS TERMINATED BY ',' COLLECTION ITEMS TERMINATED BY '|' MAP KEYS TERMINATED BY '\045' LINES TERMINATED BY '\n'
STORED AS textfile
#### A masked pattern was here ####
Modified: hive/trunk/ql/src/test/results/clientpositive/show_create_table_partitioned.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/show_create_table_partitioned.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/show_create_table_partitioned.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/show_create_table_partitioned.q.out Wed Apr 10 00:06:55 2013
@@ -1,8 +1,12 @@
-PREHOOK: query: CREATE EXTERNAL TABLE tmp_showcrt1 (key string, newvalue boolean COMMENT 'a new value')
+PREHOOK: query: -- Test SHOW CREATE TABLE on a table with partitions and column comments.
+
+CREATE EXTERNAL TABLE tmp_showcrt1 (key string, newvalue boolean COMMENT 'a new value')
COMMENT 'temporary table'
PARTITIONED BY (value bigint COMMENT 'some value')
PREHOOK: type: CREATETABLE
-POSTHOOK: query: CREATE EXTERNAL TABLE tmp_showcrt1 (key string, newvalue boolean COMMENT 'a new value')
+POSTHOOK: query: -- Test SHOW CREATE TABLE on a table with partitions and column comments.
+
+CREATE EXTERNAL TABLE tmp_showcrt1 (key string, newvalue boolean COMMENT 'a new value')
COMMENT 'temporary table'
PARTITIONED BY (value bigint COMMENT 'some value')
POSTHOOK: type: CREATETABLE
Modified: hive/trunk/ql/src/test/results/clientpositive/show_create_table_serde.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/show_create_table_serde.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/show_create_table_serde.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/show_create_table_serde.q.out Wed Apr 10 00:06:55 2013
@@ -1,10 +1,16 @@
-PREHOOK: query: CREATE TABLE tmp_showcrt1 (key int, value string, newvalue bigint)
+PREHOOK: query: -- Test SHOW CREATE TABLE on a table with serde.
+
+-- without a storage handler
+CREATE TABLE tmp_showcrt1 (key int, value string, newvalue bigint)
COMMENT 'temporary table'
ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe'
STORED AS INPUTFORMAT 'org.apache.hadoop.hive.ql.io.RCFileInputFormat'
OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.RCFileOutputFormat'
PREHOOK: type: CREATETABLE
-POSTHOOK: query: CREATE TABLE tmp_showcrt1 (key int, value string, newvalue bigint)
+POSTHOOK: query: -- Test SHOW CREATE TABLE on a table with serde.
+
+-- without a storage handler
+CREATE TABLE tmp_showcrt1 (key int, value string, newvalue bigint)
COMMENT 'temporary table'
ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe'
STORED AS INPUTFORMAT 'org.apache.hadoop.hive.ql.io.RCFileInputFormat'
@@ -40,12 +46,14 @@ POSTHOOK: query: DROP TABLE tmp_showcrt1
POSTHOOK: type: DROPTABLE
POSTHOOK: Input: default@tmp_showcrt1
POSTHOOK: Output: default@tmp_showcrt1
-PREHOOK: query: CREATE EXTERNAL TABLE tmp_showcrt1 (key string, value boolean)
+PREHOOK: query: -- with a storage handler and serde properties
+CREATE EXTERNAL TABLE tmp_showcrt1 (key string, value boolean)
ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe'
STORED BY 'org.apache.hadoop.hive.ql.metadata.DefaultStorageHandler'
WITH SERDEPROPERTIES ('field.delim'=',', 'serialization.format'='$')
PREHOOK: type: CREATETABLE
-POSTHOOK: query: CREATE EXTERNAL TABLE tmp_showcrt1 (key string, value boolean)
+POSTHOOK: query: -- with a storage handler and serde properties
+CREATE EXTERNAL TABLE tmp_showcrt1 (key string, value boolean)
ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe'
STORED BY 'org.apache.hadoop.hive.ql.metadata.DefaultStorageHandler'
WITH SERDEPROPERTIES ('field.delim'=',', 'serialization.format'='$')
Modified: hive/trunk/ql/src/test/results/clientpositive/show_create_table_view.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/show_create_table_view.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/show_create_table_view.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/show_create_table_view.q.out Wed Apr 10 00:06:55 2013
@@ -1,6 +1,10 @@
-PREHOOK: query: CREATE VIEW tmp_copy_src AS SELECT * FROM src
+PREHOOK: query: -- Test SHOW CREATE TABLE on a view name.
+
+CREATE VIEW tmp_copy_src AS SELECT * FROM src
PREHOOK: type: CREATEVIEW
-POSTHOOK: query: CREATE VIEW tmp_copy_src AS SELECT * FROM src
+POSTHOOK: query: -- Test SHOW CREATE TABLE on a view name.
+
+CREATE VIEW tmp_copy_src AS SELECT * FROM src
POSTHOOK: type: CREATEVIEW
POSTHOOK: Output: default@tmp_copy_src
PREHOOK: query: SHOW CREATE TABLE tmp_copy_src
Modified: hive/trunk/ql/src/test/results/clientpositive/show_tables.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/show_tables.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/show_tables.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/show_tables.q.out Wed Apr 10 00:06:55 2013
@@ -70,9 +70,11 @@ POSTHOOK: query: SHOW TABLES LIKE 'shtb_
POSTHOOK: type: SHOWTABLES
shtb_test1
shtb_test2
-PREHOOK: query: CREATE DATABASE test_db
+PREHOOK: query: -- SHOW TABLES FROM/IN database
+CREATE DATABASE test_db
PREHOOK: type: CREATEDATABASE
-POSTHOOK: query: CREATE DATABASE test_db
+POSTHOOK: query: -- SHOW TABLES FROM/IN database
+CREATE DATABASE test_db
POSTHOOK: type: CREATEDATABASE
PREHOOK: query: USE test_db
PREHOOK: type: SWITCHDATABASE
@@ -93,9 +95,11 @@ PREHOOK: type: CREATETABLE
POSTHOOK: query: CREATE TABLE baz(a INT)
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: test_db@baz
-PREHOOK: query: USE default
+PREHOOK: query: -- SHOW TABLES basic syntax tests
+USE default
PREHOOK: type: SWITCHDATABASE
-POSTHOOK: query: USE default
+POSTHOOK: query: -- SHOW TABLES basic syntax tests
+USE default
POSTHOOK: type: SWITCHDATABASE
PREHOOK: query: SHOW TABLES FROM test_db
PREHOOK: type: SHOWTABLES
@@ -147,9 +151,11 @@ PREHOOK: query: SHOW TABLES IN test_db L
PREHOOK: type: SHOWTABLES
POSTHOOK: query: SHOW TABLES IN test_db LIKE "nomatch"
POSTHOOK: type: SHOWTABLES
-PREHOOK: query: CREATE DATABASE `database`
+PREHOOK: query: -- SHOW TABLES from a database with a name that requires escaping
+CREATE DATABASE `database`
PREHOOK: type: CREATEDATABASE
-POSTHOOK: query: CREATE DATABASE `database`
+POSTHOOK: query: -- SHOW TABLES from a database with a name that requires escaping
+CREATE DATABASE `database`
POSTHOOK: type: CREATEDATABASE
PREHOOK: query: USE `database`
PREHOOK: type: SWITCHDATABASE
Modified: hive/trunk/ql/src/test/results/clientpositive/skewjoinopt1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/skewjoinopt1.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/skewjoinopt1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/skewjoinopt1.q.out Wed Apr 10 00:06:55 2013
@@ -24,10 +24,16 @@ PREHOOK: Output: default@t2
POSTHOOK: query: LOAD DATA LOCAL INPATH '../data/files/T2.txt' INTO TABLE T2
POSTHOOK: type: LOAD
POSTHOOK: Output: default@t2
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- a simple join query with skew on both the tables on the join key
+-- adding a order by at the end to make the results deterministic
+
+EXPLAIN
SELECT a.*, b.* FROM T1 a JOIN T2 b ON a.key = b.key
PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- a simple join query with skew on both the tables on the join key
+-- adding a order by at the end to make the results deterministic
+
+EXPLAIN
SELECT a.*, b.* FROM T1 a JOIN T2 b ON a.key = b.key
POSTHOOK: type: QUERY
ABSTRACT SYNTAX TREE:
@@ -233,10 +239,14 @@ POSTHOOK: Input: default@t2
8 18 8 18
8 28 8 18
8 28 8 18
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- test outer joins also
+
+EXPLAIN
SELECT a.*, b.* FROM T1 a RIGHT OUTER JOIN T2 b ON a.key = b.key
PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- test outer joins also
+
+EXPLAIN
SELECT a.*, b.* FROM T1 a RIGHT OUTER JOIN T2 b ON a.key = b.key
POSTHOOK: type: QUERY
ABSTRACT SYNTAX TREE:
@@ -444,10 +454,14 @@ NULL NULL 5 15
8 18 8 18
8 28 8 18
8 28 8 18
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- an aggregation at the end should not change anything
+
+EXPLAIN
SELECT count(1) FROM T1 a JOIN T2 b ON a.key = b.key
PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- an aggregation at the end should not change anything
+
+EXPLAIN
SELECT count(1) FROM T1 a JOIN T2 b ON a.key = b.key
POSTHOOK: type: QUERY
ABSTRACT SYNTAX TREE:
Modified: hive/trunk/ql/src/test/results/clientpositive/skewjoinopt10.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/skewjoinopt10.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/skewjoinopt10.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/skewjoinopt10.q.out Wed Apr 10 00:06:55 2013
@@ -28,10 +28,16 @@ POSTHOOK: Input: default@t1
POSTHOOK: Output: default@array_valued_t1
POSTHOOK: Lineage: array_valued_t1.key SIMPLE [(t1)t1.FieldSchema(name:key, type:string, comment:null), ]
POSTHOOK: Lineage: array_valued_t1.value EXPRESSION [(t1)t1.FieldSchema(name:value, type:string, comment:null), ]
-PREHOOK: query: explain
+PREHOOK: query: -- This test is to verify the skew join compile optimization when the join is followed by a lateral view
+-- adding a order by at the end to make the results deterministic
+
+explain
select * from (select a.key as key, b.value as array_val from T1 a join array_valued_T1 b on a.key=b.key) i lateral view explode (array_val) c as val
PREHOOK: type: QUERY
-POSTHOOK: query: explain
+POSTHOOK: query: -- This test is to verify the skew join compile optimization when the join is followed by a lateral view
+-- adding a order by at the end to make the results deterministic
+
+explain
select * from (select a.key as key, b.value as array_val from T1 a join array_valued_T1 b on a.key=b.key) i lateral view explode (array_val) c as val
POSTHOOK: type: QUERY
POSTHOOK: Lineage: array_valued_t1.key SIMPLE [(t1)t1.FieldSchema(name:key, type:string, comment:null), ]
Modified: hive/trunk/ql/src/test/results/clientpositive/skewjoinopt11.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/skewjoinopt11.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/skewjoinopt11.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/skewjoinopt11.q.out Wed Apr 10 00:06:55 2013
@@ -22,7 +22,12 @@ PREHOOK: Output: default@t2
POSTHOOK: query: LOAD DATA LOCAL INPATH '../data/files/T2.txt' INTO TABLE T2
POSTHOOK: type: LOAD
POSTHOOK: Output: default@t2
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- This test is to verify the skew join compile optimization when the join is followed
+-- by a union. Both sides of a union consist of a join, which should have used
+-- skew join compile time optimization.
+-- adding an order by at the end to make the results deterministic
+
+EXPLAIN
select * from
(
select a.key, a.val as val1, b.val as val2 from T1 a join T2 b on a.key = b.key
@@ -30,7 +35,12 @@ select * from
select a.key, a.val as val1, b.val as val2 from T1 a join T2 b on a.key = b.key
) subq1
PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- This test is to verify the skew join compile optimization when the join is followed
+-- by a union. Both sides of a union consist of a join, which should have used
+-- skew join compile time optimization.
+-- adding an order by at the end to make the results deterministic
+
+EXPLAIN
select * from
(
select a.key, a.val as val1, b.val as val2 from T1 a join T2 b on a.key = b.key
Modified: hive/trunk/ql/src/test/results/clientpositive/skewjoinopt12.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/skewjoinopt12.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/skewjoinopt12.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/skewjoinopt12.q.out Wed Apr 10 00:06:55 2013
@@ -24,10 +24,18 @@ PREHOOK: Output: default@t2
POSTHOOK: query: LOAD DATA LOCAL INPATH '../data/files/T2.txt' INTO TABLE T2
POSTHOOK: type: LOAD
POSTHOOK: Output: default@t2
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- Both the join tables are skewed by 2 keys, and one of the skewed values
+-- is common to both the tables. The join key matches the skewed key set.
+-- adding a order by at the end to make the results deterministic
+
+EXPLAIN
SELECT a.*, b.* FROM T1 a JOIN T2 b ON a.key = b.key and a.val = b.val
PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- Both the join tables are skewed by 2 keys, and one of the skewed values
+-- is common to both the tables. The join key matches the skewed key set.
+-- adding a order by at the end to make the results deterministic
+
+EXPLAIN
SELECT a.*, b.* FROM T1 a JOIN T2 b ON a.key = b.key and a.val = b.val
POSTHOOK: type: QUERY
ABSTRACT SYNTAX TREE:
Modified: hive/trunk/ql/src/test/results/clientpositive/skewjoinopt13.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/skewjoinopt13.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/skewjoinopt13.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/skewjoinopt13.q.out Wed Apr 10 00:06:55 2013
@@ -33,13 +33,27 @@ PREHOOK: Output: default@t3
POSTHOOK: query: LOAD DATA LOCAL INPATH '../data/files/T3.txt' INTO TABLE T3
POSTHOOK: type: LOAD
POSTHOOK: Output: default@t3
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- This test is for skewed join compile time optimization for more than 2 tables.
+-- The join key for table 3 is different from the join key used for joining
+-- tables 1 and 2. Table 3 is skewed, but since one of the join sources for table
+-- 3 consist of a sub-query which contains a join, the compile time skew join
+-- optimization is not performed
+-- adding a order by at the end to make the results deterministic
+
+EXPLAIN
select *
from
T1 a join T2 b on a.key = b.key
join T3 c on a.val = c.val
PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- This test is for skewed join compile time optimization for more than 2 tables.
+-- The join key for table 3 is different from the join key used for joining
+-- tables 1 and 2. Table 3 is skewed, but since one of the join sources for table
+-- 3 consist of a sub-query which contains a join, the compile time skew join
+-- optimization is not performed
+-- adding a order by at the end to make the results deterministic
+
+EXPLAIN
select *
from
T1 a join T2 b on a.key = b.key
Modified: hive/trunk/ql/src/test/results/clientpositive/skewjoinopt14.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/skewjoinopt14.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/skewjoinopt14.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/skewjoinopt14.q.out Wed Apr 10 00:06:55 2013
@@ -35,13 +35,29 @@ PREHOOK: Output: default@t3
POSTHOOK: query: LOAD DATA LOCAL INPATH '../data/files/T3.txt' INTO TABLE T3
POSTHOOK: type: LOAD
POSTHOOK: Output: default@t3
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- This test is for skewed join compile time optimization for more than 2 tables.
+-- The join key for table 3 is different from the join key used for joining
+-- tables 1 and 2. Tables 1 and 3 are skewed. Since one of the join sources for table
+-- 3 consist of a sub-query which contains a join, the compile time skew join
+-- optimization is not enabled for table 3, but it is used for the first join between
+-- tables 1 and 2
+-- adding a order by at the end to make the results deterministic
+
+EXPLAIN
select *
from
T1 a join T2 b on a.key = b.key
join T3 c on a.val = c.val
PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- This test is for skewed join compile time optimization for more than 2 tables.
+-- The join key for table 3 is different from the join key used for joining
+-- tables 1 and 2. Tables 1 and 3 are skewed. Since one of the join sources for table
+-- 3 consist of a sub-query which contains a join, the compile time skew join
+-- optimization is not enabled for table 3, but it is used for the first join between
+-- tables 1 and 2
+-- adding a order by at the end to make the results deterministic
+
+EXPLAIN
select *
from
T1 a join T2 b on a.key = b.key
Modified: hive/trunk/ql/src/test/results/clientpositive/skewjoinopt15.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/skewjoinopt15.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/skewjoinopt15.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/skewjoinopt15.q.out Wed Apr 10 00:06:55 2013
@@ -9,9 +9,11 @@ PREHOOK: Output: default@tmpt1
POSTHOOK: query: LOAD DATA LOCAL INPATH '../data/files/T1.txt' INTO TABLE tmpT1
POSTHOOK: type: LOAD
POSTHOOK: Output: default@tmpt1
-PREHOOK: query: CREATE TABLE T1(key INT, val STRING) SKEWED BY (key) ON ((2))
+PREHOOK: query: -- testing skew on other data types - int
+CREATE TABLE T1(key INT, val STRING) SKEWED BY (key) ON ((2))
PREHOOK: type: CREATETABLE
-POSTHOOK: query: CREATE TABLE T1(key INT, val STRING) SKEWED BY (key) ON ((2))
+POSTHOOK: query: -- testing skew on other data types - int
+CREATE TABLE T1(key INT, val STRING) SKEWED BY (key) ON ((2))
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: default@T1
PREHOOK: query: INSERT OVERWRITE TABLE T1 SELECT key, val FROM tmpT1
@@ -58,10 +60,22 @@ POSTHOOK: Lineage: t1.key EXPRESSION [(t
POSTHOOK: Lineage: t1.val SIMPLE [(tmpt1)tmpt1.FieldSchema(name:val, type:string, comment:null), ]
POSTHOOK: Lineage: t2.key EXPRESSION [(tmpt2)tmpt2.FieldSchema(name:key, type:string, comment:null), ]
POSTHOOK: Lineage: t2.val SIMPLE [(tmpt2)tmpt2.FieldSchema(name:val, type:string, comment:null), ]
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- The skewed key is a integer column.
+-- Otherwise this test is similar to skewjoinopt1.q
+-- Both the joined tables are skewed, and the joined column
+-- is an integer
+-- adding a order by at the end to make the results deterministic
+
+EXPLAIN
SELECT a.*, b.* FROM T1 a JOIN T2 b ON a.key = b.key
PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- The skewed key is a integer column.
+-- Otherwise this test is similar to skewjoinopt1.q
+-- Both the joined tables are skewed, and the joined column
+-- is an integer
+-- adding a order by at the end to make the results deterministic
+
+EXPLAIN
SELECT a.*, b.* FROM T1 a JOIN T2 b ON a.key = b.key
POSTHOOK: type: QUERY
POSTHOOK: Lineage: t1.key EXPRESSION [(tmpt1)tmpt1.FieldSchema(name:key, type:string, comment:null), ]
@@ -275,10 +289,14 @@ POSTHOOK: Lineage: t2.val SIMPLE [(tmpt2
8 18 8 18
8 28 8 18
8 28 8 18
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- test outer joins also
+
+EXPLAIN
SELECT a.*, b.* FROM T1 a RIGHT OUTER JOIN T2 b ON a.key = b.key
PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- test outer joins also
+
+EXPLAIN
SELECT a.*, b.* FROM T1 a RIGHT OUTER JOIN T2 b ON a.key = b.key
POSTHOOK: type: QUERY
POSTHOOK: Lineage: t1.key EXPRESSION [(tmpt1)tmpt1.FieldSchema(name:key, type:string, comment:null), ]
@@ -494,10 +512,14 @@ NULL NULL 5 15
8 18 8 18
8 28 8 18
8 28 8 18
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- an aggregation at the end should not change anything
+
+EXPLAIN
SELECT count(1) FROM T1 a JOIN T2 b ON a.key = b.key
PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- an aggregation at the end should not change anything
+
+EXPLAIN
SELECT count(1) FROM T1 a JOIN T2 b ON a.key = b.key
POSTHOOK: type: QUERY
POSTHOOK: Lineage: t1.key EXPRESSION [(tmpt1)tmpt1.FieldSchema(name:key, type:string, comment:null), ]
Modified: hive/trunk/ql/src/test/results/clientpositive/skewjoinopt16.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/skewjoinopt16.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/skewjoinopt16.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/skewjoinopt16.q.out Wed Apr 10 00:06:55 2013
@@ -24,10 +24,18 @@ PREHOOK: Output: default@t2
POSTHOOK: query: LOAD DATA LOCAL INPATH '../data/files/T2.txt' INTO TABLE T2
POSTHOOK: type: LOAD
POSTHOOK: Output: default@t2
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- One of the tables is skewed by 2 columns, and the other table is
+-- skewed by one column. Ths join is performed on the both the columns
+-- adding a order by at the end to make the results deterministic
+
+EXPLAIN
SELECT a.*, b.* FROM T1 a JOIN T2 b ON a.key = b.key and a.val = b.val
PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- One of the tables is skewed by 2 columns, and the other table is
+-- skewed by one column. Ths join is performed on the both the columns
+-- adding a order by at the end to make the results deterministic
+
+EXPLAIN
SELECT a.*, b.* FROM T1 a JOIN T2 b ON a.key = b.key and a.val = b.val
POSTHOOK: type: QUERY
ABSTRACT SYNTAX TREE:
Modified: hive/trunk/ql/src/test/results/clientpositive/skewjoinopt17.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/skewjoinopt17.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/skewjoinopt17.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/skewjoinopt17.q.out Wed Apr 10 00:06:55 2013
@@ -24,10 +24,22 @@ PREHOOK: Output: default@t2
POSTHOOK: query: LOAD DATA LOCAL INPATH '../data/files/T2.txt' INTO TABLE T2
POSTHOOK: type: LOAD
POSTHOOK: Output: default@t2
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- One of the tables is skewed by 2 columns, and the other table is
+-- skewed by one column. Ths join is performed on the first skewed column
+-- The skewed value for the jon key is common to both the tables.
+-- In this case, the skewed join value is not repeated in the filter.
+-- adding a order by at the end to make the results deterministic
+
+EXPLAIN
SELECT a.*, b.* FROM T1 a JOIN T2 b ON a.key = b.key
PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- One of the tables is skewed by 2 columns, and the other table is
+-- skewed by one column. Ths join is performed on the first skewed column
+-- The skewed value for the jon key is common to both the tables.
+-- In this case, the skewed join value is not repeated in the filter.
+-- adding a order by at the end to make the results deterministic
+
+EXPLAIN
SELECT a.*, b.* FROM T1 a JOIN T2 b ON a.key = b.key
POSTHOOK: type: QUERY
ABSTRACT SYNTAX TREE:
@@ -275,10 +287,18 @@ PREHOOK: Output: default@t2
POSTHOOK: query: LOAD DATA LOCAL INPATH '../data/files/T2.txt' INTO TABLE T2
POSTHOOK: type: LOAD
POSTHOOK: Output: default@t2
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- One of the tables is skewed by 2 columns, and the other table is
+-- skewed by one column. Ths join is performed on the both the columns
+-- In this case, the skewed join value is repeated in the filter.
+
+EXPLAIN
SELECT a.*, b.* FROM T1 a JOIN T2 b ON a.key = b.key and a.val = b.val
PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- One of the tables is skewed by 2 columns, and the other table is
+-- skewed by one column. Ths join is performed on the both the columns
+-- In this case, the skewed join value is repeated in the filter.
+
+EXPLAIN
SELECT a.*, b.* FROM T1 a JOIN T2 b ON a.key = b.key and a.val = b.val
POSTHOOK: type: QUERY
ABSTRACT SYNTAX TREE:
Modified: hive/trunk/ql/src/test/results/clientpositive/skewjoinopt18.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/skewjoinopt18.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/skewjoinopt18.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/skewjoinopt18.q.out Wed Apr 10 00:06:55 2013
@@ -9,9 +9,11 @@ PREHOOK: Output: default@tmpt1
POSTHOOK: query: LOAD DATA LOCAL INPATH '../data/files/T1.txt' INTO TABLE tmpT1
POSTHOOK: type: LOAD
POSTHOOK: Output: default@tmpt1
-PREHOOK: query: CREATE TABLE T1(key INT, val STRING) SKEWED BY (key) ON ((2))
+PREHOOK: query: -- testing skew on other data types - int
+CREATE TABLE T1(key INT, val STRING) SKEWED BY (key) ON ((2))
PREHOOK: type: CREATETABLE
-POSTHOOK: query: CREATE TABLE T1(key INT, val STRING) SKEWED BY (key) ON ((2))
+POSTHOOK: query: -- testing skew on other data types - int
+CREATE TABLE T1(key INT, val STRING) SKEWED BY (key) ON ((2))
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: default@T1
PREHOOK: query: INSERT OVERWRITE TABLE T1 SELECT key, val FROM tmpT1
@@ -24,10 +26,16 @@ POSTHOOK: Input: default@tmpt1
POSTHOOK: Output: default@t1
POSTHOOK: Lineage: t1.key EXPRESSION [(tmpt1)tmpt1.FieldSchema(name:key, type:string, comment:null), ]
POSTHOOK: Lineage: t1.val SIMPLE [(tmpt1)tmpt1.FieldSchema(name:val, type:string, comment:null), ]
-PREHOOK: query: CREATE TABLE T2(key STRING, val STRING)
+PREHOOK: query: -- Tke skewed column is same in both the tables, however it is
+-- INT in one of the tables, and STRING in the other table
+
+CREATE TABLE T2(key STRING, val STRING)
SKEWED BY (key) ON ((3)) STORED AS TEXTFILE
PREHOOK: type: CREATETABLE
-POSTHOOK: query: CREATE TABLE T2(key STRING, val STRING)
+POSTHOOK: query: -- Tke skewed column is same in both the tables, however it is
+-- INT in one of the tables, and STRING in the other table
+
+CREATE TABLE T2(key STRING, val STRING)
SKEWED BY (key) ON ((3)) STORED AS TEXTFILE
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: default@T2
@@ -41,10 +49,20 @@ POSTHOOK: type: LOAD
POSTHOOK: Output: default@t2
POSTHOOK: Lineage: t1.key EXPRESSION [(tmpt1)tmpt1.FieldSchema(name:key, type:string, comment:null), ]
POSTHOOK: Lineage: t1.val SIMPLE [(tmpt1)tmpt1.FieldSchema(name:val, type:string, comment:null), ]
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- Once HIVE-3445 is fixed, the compile time skew join optimization would be
+-- applicable here. Till the above jira is fixed, it would be performed as a
+-- regular join
+-- adding a order by at the end to make the results deterministic
+
+EXPLAIN
SELECT a.*, b.* FROM T1 a JOIN T2 b ON a.key = b.key
PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- Once HIVE-3445 is fixed, the compile time skew join optimization would be
+-- applicable here. Till the above jira is fixed, it would be performed as a
+-- regular join
+-- adding a order by at the end to make the results deterministic
+
+EXPLAIN
SELECT a.*, b.* FROM T1 a JOIN T2 b ON a.key = b.key
POSTHOOK: type: QUERY
POSTHOOK: Lineage: t1.key EXPRESSION [(tmpt1)tmpt1.FieldSchema(name:key, type:string, comment:null), ]
Modified: hive/trunk/ql/src/test/results/clientpositive/skewjoinopt19.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/skewjoinopt19.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/skewjoinopt19.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/skewjoinopt19.q.out Wed Apr 10 00:06:55 2013
@@ -24,10 +24,20 @@ PREHOOK: Output: default@t2
POSTHOOK: query: LOAD DATA LOCAL INPATH '../data/files/T2.txt' INTO TABLE T2
POSTHOOK: type: LOAD
POSTHOOK: Output: default@t2
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- add a test where the skewed key is also the bucketized key
+-- it should not matter, and the compile time skewed join
+-- optimization is performed
+-- adding a order by at the end to make the results deterministic
+
+EXPLAIN
SELECT a.*, b.* FROM T1 a JOIN T2 b ON a.key = b.key
PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- add a test where the skewed key is also the bucketized key
+-- it should not matter, and the compile time skewed join
+-- optimization is performed
+-- adding a order by at the end to make the results deterministic
+
+EXPLAIN
SELECT a.*, b.* FROM T1 a JOIN T2 b ON a.key = b.key
POSTHOOK: type: QUERY
ABSTRACT SYNTAX TREE:
Modified: hive/trunk/ql/src/test/results/clientpositive/skewjoinopt2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/skewjoinopt2.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/skewjoinopt2.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/skewjoinopt2.q.out Wed Apr 10 00:06:55 2013
@@ -24,10 +24,22 @@ PREHOOK: Output: default@t2
POSTHOOK: query: LOAD DATA LOCAL INPATH '../data/files/T2.txt' INTO TABLE T2
POSTHOOK: type: LOAD
POSTHOOK: Output: default@t2
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- a simple query with skew on both the tables on the join key
+-- multiple skew values are present for the skewed keys
+-- but the skewed values do not overlap.
+-- The join values are a superset of the skewed keys.
+-- adding a order by at the end to make the results deterministic
+
+EXPLAIN
SELECT a.*, b.* FROM T1 a JOIN T2 b ON a.key = b.key and a.val = b.val
PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- a simple query with skew on both the tables on the join key
+-- multiple skew values are present for the skewed keys
+-- but the skewed values do not overlap.
+-- The join values are a superset of the skewed keys.
+-- adding a order by at the end to make the results deterministic
+
+EXPLAIN
SELECT a.*, b.* FROM T1 a JOIN T2 b ON a.key = b.key and a.val = b.val
POSTHOOK: type: QUERY
ABSTRACT SYNTAX TREE:
@@ -245,10 +257,14 @@ POSTHOOK: Input: default@t2
3 13 3 13
8 18 8 18
8 18 8 18
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- test outer joins also
+
+EXPLAIN
SELECT a.*, b.* FROM T1 a LEFT OUTER JOIN T2 b ON a.key = b.key and a.val = b.val
PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- test outer joins also
+
+EXPLAIN
SELECT a.*, b.* FROM T1 a LEFT OUTER JOIN T2 b ON a.key = b.key and a.val = b.val
POSTHOOK: type: QUERY
ABSTRACT SYNTAX TREE:
@@ -470,10 +486,14 @@ POSTHOOK: Input: default@t2
8 28 NULL NULL
8 18 8 18
8 18 8 18
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- a group by at the end should not change anything
+
+EXPLAIN
SELECT a.key, count(1) FROM T1 a JOIN T2 b ON a.key = b.key and a.val = b.val group by a.key
PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- a group by at the end should not change anything
+
+EXPLAIN
SELECT a.key, count(1) FROM T1 a JOIN T2 b ON a.key = b.key and a.val = b.val group by a.key
POSTHOOK: type: QUERY
ABSTRACT SYNTAX TREE:
Modified: hive/trunk/ql/src/test/results/clientpositive/skewjoinopt20.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/skewjoinopt20.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/skewjoinopt20.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/skewjoinopt20.q.out Wed Apr 10 00:06:55 2013
@@ -24,10 +24,20 @@ PREHOOK: Output: default@t2
POSTHOOK: query: LOAD DATA LOCAL INPATH '../data/files/T2.txt' INTO TABLE T2
POSTHOOK: type: LOAD
POSTHOOK: Output: default@t2
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- add a test where the skewed key is also the bucketized/sorted key
+-- it should not matter, and the compile time skewed join
+-- optimization is performed
+-- adding a order by at the end to make the results deterministic
+
+EXPLAIN
SELECT a.*, b.* FROM T1 a JOIN T2 b ON a.key = b.key
PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- add a test where the skewed key is also the bucketized/sorted key
+-- it should not matter, and the compile time skewed join
+-- optimization is performed
+-- adding a order by at the end to make the results deterministic
+
+EXPLAIN
SELECT a.*, b.* FROM T1 a JOIN T2 b ON a.key = b.key
POSTHOOK: type: QUERY
ABSTRACT SYNTAX TREE:
Modified: hive/trunk/ql/src/test/results/clientpositive/skewjoinopt3.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/skewjoinopt3.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/skewjoinopt3.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/skewjoinopt3.q.out Wed Apr 10 00:06:55 2013
@@ -24,10 +24,20 @@ PREHOOK: Output: default@t2
POSTHOOK: query: LOAD DATA LOCAL INPATH '../data/files/T2.txt' INTO TABLE T2
POSTHOOK: type: LOAD
POSTHOOK: Output: default@t2
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- a simple query with skew on both the tables. One of the skewed
+-- value is common to both the tables. The skewed value should not be
+-- repeated in the filter.
+-- adding a order by at the end to make the results deterministic
+
+EXPLAIN
SELECT a.*, b.* FROM T1 a JOIN T2 b ON a.key = b.key
PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- a simple query with skew on both the tables. One of the skewed
+-- value is common to both the tables. The skewed value should not be
+-- repeated in the filter.
+-- adding a order by at the end to make the results deterministic
+
+EXPLAIN
SELECT a.*, b.* FROM T1 a JOIN T2 b ON a.key = b.key
POSTHOOK: type: QUERY
ABSTRACT SYNTAX TREE:
@@ -233,10 +243,14 @@ POSTHOOK: Input: default@t2
8 18 8 18
8 28 8 18
8 28 8 18
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- test outer joins also
+
+EXPLAIN
SELECT a.*, b.* FROM T1 a FULL OUTER JOIN T2 b ON a.key = b.key
PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- test outer joins also
+
+EXPLAIN
SELECT a.*, b.* FROM T1 a FULL OUTER JOIN T2 b ON a.key = b.key
POSTHOOK: type: QUERY
ABSTRACT SYNTAX TREE:
Modified: hive/trunk/ql/src/test/results/clientpositive/skewjoinopt4.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/skewjoinopt4.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/skewjoinopt4.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/skewjoinopt4.q.out Wed Apr 10 00:06:55 2013
@@ -22,10 +22,18 @@ PREHOOK: Output: default@t2
POSTHOOK: query: LOAD DATA LOCAL INPATH '../data/files/T2.txt' INTO TABLE T2
POSTHOOK: type: LOAD
POSTHOOK: Output: default@t2
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- only of the tables of the join (the left table of the join) is skewed
+-- the skewed filter would still be applied to both the tables
+-- adding a order by at the end to make the results deterministic
+
+EXPLAIN
SELECT a.*, b.* FROM T1 a JOIN T2 b ON a.key = b.key
PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- only of the tables of the join (the left table of the join) is skewed
+-- the skewed filter would still be applied to both the tables
+-- adding a order by at the end to make the results deterministic
+
+EXPLAIN
SELECT a.*, b.* FROM T1 a JOIN T2 b ON a.key = b.key
POSTHOOK: type: QUERY
ABSTRACT SYNTAX TREE:
@@ -231,10 +239,12 @@ POSTHOOK: Input: default@t2
8 18 8 18
8 28 8 18
8 28 8 18
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- the order of the join should not matter, just confirming
+EXPLAIN
SELECT a.*, b.* FROM T2 a JOIN T1 b ON a.key = b.key
PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- the order of the join should not matter, just confirming
+EXPLAIN
SELECT a.*, b.* FROM T2 a JOIN T1 b ON a.key = b.key
POSTHOOK: type: QUERY
ABSTRACT SYNTAX TREE:
Modified: hive/trunk/ql/src/test/results/clientpositive/skewjoinopt5.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/skewjoinopt5.q.out?rev=1466300&r1=1466299&r2=1466300&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/skewjoinopt5.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/skewjoinopt5.q.out Wed Apr 10 00:06:55 2013
@@ -24,10 +24,18 @@ PREHOOK: Output: default@t2
POSTHOOK: query: LOAD DATA LOCAL INPATH '../data/files/T2.txt' INTO TABLE T2
POSTHOOK: type: LOAD
POSTHOOK: Output: default@t2
-PREHOOK: query: EXPLAIN
+PREHOOK: query: -- One of the tables is skewed by 2 columns, and the other table is
+-- skewed by one column. Ths join is performed on the first skewed column
+-- adding a order by at the end to make the results deterministic
+
+EXPLAIN
SELECT a.*, b.* FROM T1 a JOIN T2 b ON a.key = b.key
PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN
+POSTHOOK: query: -- One of the tables is skewed by 2 columns, and the other table is
+-- skewed by one column. Ths join is performed on the first skewed column
+-- adding a order by at the end to make the results deterministic
+
+EXPLAIN
SELECT a.*, b.* FROM T1 a JOIN T2 b ON a.key = b.key
POSTHOOK: type: QUERY
ABSTRACT SYNTAX TREE: