hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From na...@apache.org
Subject svn commit: r1465903 [12/13] - in /hive/trunk/ql/src/test: queries/clientpositive/ results/clientpositive/
Date Tue, 09 Apr 2013 06:33:23 GMT
Modified: hive/trunk/ql/src/test/results/clientpositive/udf_printf.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/udf_printf.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/udf_printf.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/udf_printf.q.out Tue Apr  9 06:33:16 2013
@@ -2,13 +2,9 @@ PREHOOK: query: use default
 PREHOOK: type: SWITCHDATABASE
 POSTHOOK: query: use default
 POSTHOOK: type: SWITCHDATABASE
-PREHOOK: query: -- Test printf() UDF
-
-DESCRIBE FUNCTION printf
+PREHOOK: query: DESCRIBE FUNCTION printf
 PREHOOK: type: DESCFUNCTION
-POSTHOOK: query: -- Test printf() UDF
-
-DESCRIBE FUNCTION printf
+POSTHOOK: query: DESCRIBE FUNCTION printf
 POSTHOOK: type: DESCFUNCTION
 printf(String format, Obj... args) - function that can format strings according to printf-style format strings
 PREHOOK: query: DESCRIBE FUNCTION EXTENDED printf
@@ -57,13 +53,11 @@ STAGE PLANS:
       limit: 1
 
 
-PREHOOK: query: -- Test Primitive Types
-SELECT printf("Hello World %d %s", 100, "days") FROM src LIMIT 1
+PREHOOK: query: SELECT printf("Hello World %d %s", 100, "days") FROM src LIMIT 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: -- Test Primitive Types
-SELECT printf("Hello World %d %s", 100, "days") FROM src LIMIT 1
+POSTHOOK: query: SELECT printf("Hello World %d %s", 100, "days") FROM src LIMIT 1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
@@ -77,22 +71,18 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
 All Type Test: false, A, 15000, 1.234000e+01, +27183.2401, 2300.41, 32, corret, 0x1.002p8
-PREHOOK: query: -- Test NULL Values
-SELECT printf("Color %s, String Null: %s, number1 %d, number2 %05d, Integer Null: %d, hex %#x, float %5.2f Double Null: %f\n", "red", NULL, 123456, 89, NULL, 255, 3.14159, NULL) FROM src LIMIT 1
+PREHOOK: query: SELECT printf("Color %s, String Null: %s, number1 %d, number2 %05d, Integer Null: %d, hex %#x, float %5.2f Double Null: %f\n", "red", NULL, 123456, 89, NULL, 255, 3.14159, NULL) FROM src LIMIT 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: -- Test NULL Values
-SELECT printf("Color %s, String Null: %s, number1 %d, number2 %05d, Integer Null: %d, hex %#x, float %5.2f Double Null: %f\n", "red", NULL, 123456, 89, NULL, 255, 3.14159, NULL) FROM src LIMIT 1
+POSTHOOK: query: SELECT printf("Color %s, String Null: %s, number1 %d, number2 %05d, Integer Null: %d, hex %#x, float %5.2f Double Null: %f\n", "red", NULL, 123456, 89, NULL, 255, 3.14159, NULL) FROM src LIMIT 1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
 Color red, String Null: null, number1 123456, number2 00089, Integer Null: null, hex 0xff, float  3.14 Double Null: null
-PREHOOK: query: -- Test Timestamp
-create table timestamp_udf (t timestamp)
+PREHOOK: query: create table timestamp_udf (t timestamp)
 PREHOOK: type: CREATETABLE
-POSTHOOK: query: -- Test Timestamp
-create table timestamp_udf (t timestamp)
+POSTHOOK: query: create table timestamp_udf (t timestamp)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: default@timestamp_udf
 PREHOOK: query: from src
@@ -127,14 +117,12 @@ POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: default@timestamp_udf
 POSTHOOK: Output: default@timestamp_udf
 POSTHOOK: Lineage: timestamp_udf.t EXPRESSION []
-PREHOOK: query: -- Test Binary
-CREATE TABLE binay_udf(key binary, value int)
+PREHOOK: query: CREATE TABLE binay_udf(key binary, value int)
 ROW FORMAT DELIMITED
 FIELDS TERMINATED BY '9'
 STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
-POSTHOOK: query: -- Test Binary
-CREATE TABLE binay_udf(key binary, value int)
+POSTHOOK: query: CREATE TABLE binay_udf(key binary, value int)
 ROW FORMAT DELIMITED
 FIELDS TERMINATED BY '9'
 STORED AS TEXTFILE

Modified: hive/trunk/ql/src/test/results/clientpositive/udf_reverse.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/udf_reverse.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/udf_reverse.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/udf_reverse.q.out Tue Apr  9 06:33:16 2013
@@ -161,15 +161,9 @@ POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: default@dest1
 POSTHOOK: Output: default@dest1
 POSTHOOK: Lineage: dest1.len EXPRESSION [(src1)src1.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: -- Test with non-ascii characters
--- kv4.txt contains the text 0xE982B5E993AE, which should be reversed to
--- 0xE993AEE982B5
-CREATE TABLE dest1(name STRING) STORED AS TEXTFILE
+PREHOOK: query: CREATE TABLE dest1(name STRING) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
-POSTHOOK: query: -- Test with non-ascii characters
--- kv4.txt contains the text 0xE982B5E993AE, which should be reversed to
--- 0xE993AEE982B5
-CREATE TABLE dest1(name STRING) STORED AS TEXTFILE
+POSTHOOK: query: CREATE TABLE dest1(name STRING) STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: default@dest1
 POSTHOOK: Lineage: dest1.len EXPRESSION [(src1)src1.FieldSchema(name:value, type:string, comment:default), ]

Modified: hive/trunk/ql/src/test/results/clientpositive/udf_round_2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/udf_round_2.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/udf_round_2.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/udf_round_2.q.out Tue Apr  9 06:33:16 2013
@@ -1,8 +1,6 @@
-PREHOOK: query: -- test for NaN (not-a-number) 
-create table tstTbl1(n double)
+PREHOOK: query: create table tstTbl1(n double)
 PREHOOK: type: CREATETABLE
-POSTHOOK: query: -- test for NaN (not-a-number) 
-create table tstTbl1(n double)
+POSTHOOK: query: create table tstTbl1(n double)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: default@tstTbl1
 PREHOOK: query: insert overwrite table tstTbl1
@@ -46,13 +44,11 @@ POSTHOOK: Input: default@tsttbl1
 #### A masked pattern was here ####
 POSTHOOK: Lineage: tsttbl1.n EXPRESSION []
 NaN
-PREHOOK: query: -- test for Infinity
-select round(1/0), round(1/0, 2), round(1.0/0.0), round(1.0/0.0, 2) from src limit 1
+PREHOOK: query: select round(1/0), round(1/0, 2), round(1.0/0.0), round(1.0/0.0, 2) from src limit 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: -- test for Infinity
-select round(1/0), round(1/0, 2), round(1.0/0.0), round(1.0/0.0, 2) from src limit 1
+POSTHOOK: query: select round(1/0), round(1/0, 2), round(1.0/0.0), round(1.0/0.0, 2) from src limit 1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####

Modified: hive/trunk/ql/src/test/results/clientpositive/udf_round_3.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/udf_round_3.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/udf_round_3.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/udf_round_3.q.out Tue Apr  9 06:33:16 2013
@@ -1,54 +1,44 @@
-PREHOOK: query: -- test for TINYINT
-select round(-128), round(127), round(0) from src limit 1
+PREHOOK: query: select round(-128), round(127), round(0) from src limit 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: -- test for TINYINT
-select round(-128), round(127), round(0) from src limit 1
+POSTHOOK: query: select round(-128), round(127), round(0) from src limit 1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
 -128	127	0
-PREHOOK: query: -- test for SMALLINT
-select round(-32768), round(32767), round(-129), round(128) from src limit 1
+PREHOOK: query: select round(-32768), round(32767), round(-129), round(128) from src limit 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: -- test for SMALLINT
-select round(-32768), round(32767), round(-129), round(128) from src limit 1
+POSTHOOK: query: select round(-32768), round(32767), round(-129), round(128) from src limit 1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
 -32768	32767	-129	128
-PREHOOK: query: -- test for INT
-select round(cast(negative(pow(2, 31)) as INT)), round(cast((pow(2, 31) - 1) as INT)), round(-32769), round(32768) from src limit 1
+PREHOOK: query: select round(cast(negative(pow(2, 31)) as INT)), round(cast((pow(2, 31) - 1) as INT)), round(-32769), round(32768) from src limit 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: -- test for INT
-select round(cast(negative(pow(2, 31)) as INT)), round(cast((pow(2, 31) - 1) as INT)), round(-32769), round(32768) from src limit 1
+POSTHOOK: query: select round(cast(negative(pow(2, 31)) as INT)), round(cast((pow(2, 31) - 1) as INT)), round(-32769), round(32768) from src limit 1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
 -2147483648	2147483647	-32769	32768
-PREHOOK: query: -- test for BIGINT
-select round(cast(negative(pow(2, 63)) as BIGINT)), round(cast((pow(2, 63) - 1) as BIGINT)), round(cast(negative(pow(2, 31) + 1) as BIGINT)), round(cast(pow(2, 31) as BIGINT)) from src limit 1
+PREHOOK: query: select round(cast(negative(pow(2, 63)) as BIGINT)), round(cast((pow(2, 63) - 1) as BIGINT)), round(cast(negative(pow(2, 31) + 1) as BIGINT)), round(cast(pow(2, 31) as BIGINT)) from src limit 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: -- test for BIGINT
-select round(cast(negative(pow(2, 63)) as BIGINT)), round(cast((pow(2, 63) - 1) as BIGINT)), round(cast(negative(pow(2, 31) + 1) as BIGINT)), round(cast(pow(2, 31) as BIGINT)) from src limit 1
+POSTHOOK: query: select round(cast(negative(pow(2, 63)) as BIGINT)), round(cast((pow(2, 63) - 1) as BIGINT)), round(cast(negative(pow(2, 31) + 1) as BIGINT)), round(cast(pow(2, 31) as BIGINT)) from src limit 1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
 -9223372036854775808	9223372036854775807	-2147483649	2147483648
-PREHOOK: query: -- test for DOUBLE
-select round(126.1), round(126.7), round(32766.1), round(32766.7) from src limit 1
+PREHOOK: query: select round(126.1), round(126.7), round(32766.1), round(32766.7) from src limit 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: -- test for DOUBLE
-select round(126.1), round(126.7), round(32766.1), round(32766.7) from src limit 1
+POSTHOOK: query: select round(126.1), round(126.7), round(32766.1), round(32766.7) from src limit 1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####

Modified: hive/trunk/ql/src/test/results/clientpositive/udf_sort_array.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/udf_sort_array.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/udf_sort_array.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/udf_sort_array.q.out Tue Apr  9 06:33:16 2013
@@ -2,13 +2,9 @@ PREHOOK: query: use default
 PREHOOK: type: SWITCHDATABASE
 POSTHOOK: query: use default
 POSTHOOK: type: SWITCHDATABASE
-PREHOOK: query: -- Test sort_array() UDF
-
-DESCRIBE FUNCTION sort_array
+PREHOOK: query: DESCRIBE FUNCTION sort_array
 PREHOOK: type: DESCFUNCTION
-POSTHOOK: query: -- Test sort_array() UDF
-
-DESCRIBE FUNCTION sort_array
+POSTHOOK: query: DESCRIBE FUNCTION sort_array
 POSTHOOK: type: DESCFUNCTION
 sort_array(array(obj1, obj2,...)) - Sorts the input array in ascending order according to the natural ordering of the array elements.
 PREHOOK: query: DESCRIBE FUNCTION EXTENDED sort_array
@@ -19,12 +15,10 @@ sort_array(array(obj1, obj2,...)) - Sort
 Example:
   > SELECT sort_array(array('b', 'd', 'c', 'a')) FROM src LIMIT 1;
   'a', 'b', 'c', 'd'
-PREHOOK: query: -- Evaluate function against STRING valued keys
-EXPLAIN
+PREHOOK: query: EXPLAIN
 SELECT sort_array(array("b", "d", "c", "a")) FROM src LIMIT 1
 PREHOOK: type: QUERY
-POSTHOOK: query: -- Evaluate function against STRING valued keys
-EXPLAIN
+POSTHOOK: query: EXPLAIN
 SELECT sort_array(array("b", "d", "c", "a")) FROM src LIMIT 1
 POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
@@ -77,30 +71,25 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
 ["enterprise databases","hadoop distributed file system","hadoop map-reduce"]
-PREHOOK: query: -- Evaluate function against INT valued keys
-SELECT sort_array(array(2, 9, 7, 3, 5, 4, 1, 6, 8)) FROM src LIMIT 1
+PREHOOK: query: SELECT sort_array(array(2, 9, 7, 3, 5, 4, 1, 6, 8)) FROM src LIMIT 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: -- Evaluate function against INT valued keys
-SELECT sort_array(array(2, 9, 7, 3, 5, 4, 1, 6, 8)) FROM src LIMIT 1
+POSTHOOK: query: SELECT sort_array(array(2, 9, 7, 3, 5, 4, 1, 6, 8)) FROM src LIMIT 1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
 [1,2,3,4,5,6,7,8,9]
-PREHOOK: query: -- Evaluate function against FLOAT valued keys
-SELECT sort_array(sort_array(array(2.333, 9, 1.325, 2.003, 0.777, -3.445, 1))) FROM src LIMIT 1
+PREHOOK: query: SELECT sort_array(sort_array(array(2.333, 9, 1.325, 2.003, 0.777, -3.445, 1))) FROM src LIMIT 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: -- Evaluate function against FLOAT valued keys
-SELECT sort_array(sort_array(array(2.333, 9, 1.325, 2.003, 0.777, -3.445, 1))) FROM src LIMIT 1
+POSTHOOK: query: SELECT sort_array(sort_array(array(2.333, 9, 1.325, 2.003, 0.777, -3.445, 1))) FROM src LIMIT 1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
 [-3.445,0.777,1.0,1.325,2.003,2.333,9.0]
-PREHOOK: query: -- Test it against data in a table.
-CREATE TABLE dest1 (
+PREHOOK: query: CREATE TABLE dest1 (
 	tinyints ARRAY<TINYINT>,
 	smallints ARRAY<SMALLINT>,
 	ints ARRAY<INT>,
@@ -112,8 +101,7 @@ CREATE TABLE dest1 (
 	timestamps ARRAY<TIMESTAMP>
 ) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
-POSTHOOK: query: -- Test it against data in a table.
-CREATE TABLE dest1 (
+POSTHOOK: query: CREATE TABLE dest1 (
 	tinyints ARRAY<TINYINT>,
 	smallints ARRAY<SMALLINT>,
 	ints ARRAY<INT>,

Modified: hive/trunk/ql/src/test/results/clientpositive/udf_substr.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/udf_substr.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/udf_substr.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/udf_substr.q.out Tue Apr  9 06:33:16 2013
@@ -118,8 +118,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
 C	C	C	C	B	BC	BC	BC	A	AB	ABC	ABC	
-PREHOOK: query: -- substring() is a synonim of substr(), so just perform some basic tests
-SELECT
+PREHOOK: query: SELECT
   substring('ABCDEFG', 3, 4), substring('ABCDEFG', -5, 4),
   substring('ABCDEFG', 3), substring('ABCDEFG', -5),
   substring('ABC', 0), substring('ABC', 1), substring('ABC', 2), substring('ABC', 3),
@@ -129,8 +128,7 @@ FROM src LIMIT 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: -- substring() is a synonim of substr(), so just perform some basic tests
-SELECT
+POSTHOOK: query: SELECT
   substring('ABCDEFG', 3, 4), substring('ABCDEFG', -5, 4),
   substring('ABCDEFG', 3), substring('ABCDEFG', -5),
   substring('ABC', 0), substring('ABC', 1), substring('ABC', 2), substring('ABC', 3),
@@ -141,8 +139,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
 CDEF	CDEF	CDEFG	CDEFG	ABC	ABC	BC	C	ABC	BC	A	A	A
-PREHOOK: query: -- test for binary substr
-SELECT
+PREHOOK: query: SELECT
   substr(null, 1), substr(null, 1, 1),
   substr(ABC, null), substr(ABC, null, 1),
   substr(ABC, 1, null),
@@ -161,8 +158,7 @@ FROM (
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: -- test for binary substr
-SELECT
+POSTHOOK: query: SELECT
   substr(null, 1), substr(null, 1, 1),
   substr(ABC, null), substr(ABC, null, 1),
   substr(ABC, 1, null),
@@ -182,8 +178,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
 NULL	NULL	NULL	NULL	NULL	A	AB	ABC	ABC	A	AB	ABC	ABC	B	BC	BC	BC	C	C	C	C		C	C	C	C	B	BC	BC	BC	A	AB	ABC	ABC	
-PREHOOK: query: -- test UTF-8 substr
-SELECT
+PREHOOK: query: SELECT
   substr("玩", 1),
   substr("abc 玩", 5),
   substr("abc 玩玩玩 abc", 5),
@@ -192,8 +187,7 @@ FROM src LIMIT 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: -- test UTF-8 substr
-SELECT
+POSTHOOK: query: SELECT
   substr("玩", 1),
   substr("abc 玩", 5),
   substr("abc 玩玩玩 abc", 5),

Modified: hive/trunk/ql/src/test/results/clientpositive/udf_substring.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/udf_substring.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/udf_substring.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/udf_substring.q.out Tue Apr  9 06:33:16 2013
@@ -1,8 +1,6 @@
-PREHOOK: query: -- Synonym. See udf_substr.q
-DESCRIBE FUNCTION substring
+PREHOOK: query: DESCRIBE FUNCTION substring
 PREHOOK: type: DESCFUNCTION
-POSTHOOK: query: -- Synonym. See udf_substr.q
-DESCRIBE FUNCTION substring
+POSTHOOK: query: DESCRIBE FUNCTION substring
 POSTHOOK: type: DESCFUNCTION
 substring(str, pos[, len]) - returns the substring of str that starts at pos and is of length len orsubstring(bin, pos[, len]) - returns the slice of byte array that starts at pos and is of length len
 PREHOOK: query: DESCRIBE FUNCTION EXTENDED substring

Modified: hive/trunk/ql/src/test/results/clientpositive/udf_to_unix_timestamp.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/udf_to_unix_timestamp.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/udf_to_unix_timestamp.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/udf_to_unix_timestamp.q.out Tue Apr  9 06:33:16 2013
@@ -80,11 +80,9 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@oneline
 #### A masked pattern was here ####
 random_string	NULL
-PREHOOK: query: -- PPD
-explain select * from (select * from src) a where unix_timestamp(a.key) > 10
+PREHOOK: query: explain select * from (select * from src) a where unix_timestamp(a.key) > 10
 PREHOOK: type: QUERY
-POSTHOOK: query: -- PPD
-explain select * from (select * from src) a where unix_timestamp(a.key) > 10
+POSTHOOK: query: explain select * from (select * from src) a where unix_timestamp(a.key) > 10
 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)))) a)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR TOK_ALLCOLREF)) (TOK_WHERE (> (TOK_FUNCTION unix_timestamp (. (TOK_TABLE_OR_COL a) key)) 10))))

Modified: hive/trunk/ql/src/test/results/clientpositive/udf_translate.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/udf_translate.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/udf_translate.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/udf_translate.q.out Tue Apr  9 06:33:16 2013
@@ -20,11 +20,9 @@ If the same character is present multipl
 For example,
 
 translate('abcdef', 'ada', '192') returns '1bc9ef' replaces 'a' with '1' and 'd' with '9' ignoring the second occurence of 'a' in the from string mapping it to '2'
-PREHOOK: query: -- Create some tables to serve some input data
-CREATE TABLE table_input(input STRING)
+PREHOOK: query: CREATE TABLE table_input(input STRING)
 PREHOOK: type: CREATETABLE
-POSTHOOK: query: -- Create some tables to serve some input data
-CREATE TABLE table_input(input STRING)
+POSTHOOK: query: CREATE TABLE table_input(input STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: default@table_input
 PREHOOK: query: CREATE TABLE table_translate(input_string STRING, from_string STRING, to_string STRING)
@@ -53,14 +51,12 @@ POSTHOOK: Lineage: table_input.input SIM
 POSTHOOK: Lineage: table_translate.from_string SIMPLE []
 POSTHOOK: Lineage: table_translate.input_string SIMPLE []
 POSTHOOK: Lineage: table_translate.to_string SIMPLE []
-PREHOOK: query: -- Run some queries on constant input parameters
-SELECT  translate('abcd', 'ab', '12'),
+PREHOOK: query: SELECT  translate('abcd', 'ab', '12'),
         translate('abcd', 'abc', '12') FROM src LIMIT 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: -- Run some queries on constant input parameters
-SELECT  translate('abcd', 'ab', '12'),
+POSTHOOK: query: SELECT  translate('abcd', 'ab', '12'),
         translate('abcd', 'abc', '12') FROM src LIMIT 1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
@@ -70,14 +66,12 @@ POSTHOOK: Lineage: table_translate.from_
 POSTHOOK: Lineage: table_translate.input_string SIMPLE []
 POSTHOOK: Lineage: table_translate.to_string SIMPLE []
 12cd	12d
-PREHOOK: query: -- Run some queries where first parameter being a table column while the other two being constants
-SELECT translate(table_input.input, 'ab', '12'),
+PREHOOK: query: SELECT translate(table_input.input, 'ab', '12'),
        translate(table_input.input, 'abc', '12') FROM table_input LIMIT 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@table_input
 #### A masked pattern was here ####
-POSTHOOK: query: -- Run some queries where first parameter being a table column while the other two being constants
-SELECT translate(table_input.input, 'ab', '12'),
+POSTHOOK: query: SELECT translate(table_input.input, 'ab', '12'),
        translate(table_input.input, 'abc', '12') FROM table_input LIMIT 1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@table_input
@@ -87,13 +81,11 @@ POSTHOOK: Lineage: table_translate.from_
 POSTHOOK: Lineage: table_translate.input_string SIMPLE []
 POSTHOOK: Lineage: table_translate.to_string SIMPLE []
 12cd	12d
-PREHOOK: query: -- Run some queries where all parameters are coming from table columns
-SELECT translate(input_string, from_string, to_string) FROM table_translate LIMIT 1
+PREHOOK: query: SELECT translate(input_string, from_string, to_string) FROM table_translate LIMIT 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@table_translate
 #### A masked pattern was here ####
-POSTHOOK: query: -- Run some queries where all parameters are coming from table columns
-SELECT translate(input_string, from_string, to_string) FROM table_translate LIMIT 1
+POSTHOOK: query: SELECT translate(input_string, from_string, to_string) FROM table_translate LIMIT 1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@table_translate
 #### A masked pattern was here ####
@@ -102,16 +94,14 @@ POSTHOOK: Lineage: table_translate.from_
 POSTHOOK: Lineage: table_translate.input_string SIMPLE []
 POSTHOOK: Lineage: table_translate.to_string SIMPLE []
 1bc
-PREHOOK: query: -- Run some queries where some parameters are NULL
-SELECT translate(NULL, 'ab', '12'),
+PREHOOK: query: SELECT translate(NULL, 'ab', '12'),
        translate('abcd', NULL, '12'),
        translate('abcd', 'ab', NULL),
        translate(NULL, NULL, NULL) FROM src LIMIT 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: -- Run some queries where some parameters are NULL
-SELECT translate(NULL, 'ab', '12'),
+POSTHOOK: query: SELECT translate(NULL, 'ab', '12'),
        translate('abcd', NULL, '12'),
        translate('abcd', 'ab', NULL),
        translate(NULL, NULL, NULL) FROM src LIMIT 1
@@ -123,14 +113,12 @@ POSTHOOK: Lineage: table_translate.from_
 POSTHOOK: Lineage: table_translate.input_string SIMPLE []
 POSTHOOK: Lineage: table_translate.to_string SIMPLE []
 NULL	NULL	NULL	NULL
-PREHOOK: query: -- Run some queries where the same character appears several times in the from string (2nd argument) of the UDF
-SELECT translate('abcd', 'aba', '123'),
+PREHOOK: query: SELECT translate('abcd', 'aba', '123'),
        translate('abcd', 'aba', '12') FROM src LIMIT 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: -- Run some queries where the same character appears several times in the from string (2nd argument) of the UDF
-SELECT translate('abcd', 'aba', '123'),
+POSTHOOK: query: SELECT translate('abcd', 'aba', '123'),
        translate('abcd', 'aba', '12') FROM src LIMIT 1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
@@ -140,13 +128,11 @@ POSTHOOK: Lineage: table_translate.from_
 POSTHOOK: Lineage: table_translate.input_string SIMPLE []
 POSTHOOK: Lineage: table_translate.to_string SIMPLE []
 12cd	12cd
-PREHOOK: query: -- Run some queries for the ignorant case when the 3rd parameter has more characters than the second one
-SELECT translate('abcd', 'abc', '1234') FROM src LIMIT 1
+PREHOOK: query: SELECT translate('abcd', 'abc', '1234') FROM src LIMIT 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: -- Run some queries for the ignorant case when the 3rd parameter has more characters than the second one
-SELECT translate('abcd', 'abc', '1234') FROM src LIMIT 1
+POSTHOOK: query: SELECT translate('abcd', 'abc', '1234') FROM src LIMIT 1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
@@ -155,13 +141,11 @@ POSTHOOK: Lineage: table_translate.from_
 POSTHOOK: Lineage: table_translate.input_string SIMPLE []
 POSTHOOK: Lineage: table_translate.to_string SIMPLE []
 123d
-PREHOOK: query: -- Test proper function over UTF-8 characters
-SELECT translate('Àbcd', 'À', 'Ã') FROM src LIMIT 1
+PREHOOK: query: SELECT translate('Àbcd', 'À', 'Ã') FROM src LIMIT 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: -- Test proper function over UTF-8 characters
-SELECT translate('Àbcd', 'À', 'Ã') FROM src LIMIT 1
+POSTHOOK: query: SELECT translate('Àbcd', 'À', 'Ã') FROM src LIMIT 1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####

Modified: hive/trunk/ql/src/test/results/clientpositive/udf_unhex.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/udf_unhex.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/udf_unhex.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/udf_unhex.q.out Tue Apr  9 06:33:16 2013
@@ -25,9 +25,7 @@ The characters in the argument string mu
 digits: '0' .. '9', 'A' .. 'F', 'a' .. 'f'. If UNHEX() encounters
 any nonhexadecimal digits in the argument, it returns NULL. Also,
 if there are an odd number of characters a leading 0 is appended.
-PREHOOK: query: -- Good inputs
-
-SELECT
+PREHOOK: query: SELECT
   unhex('4D7953514C'),
   unhex('31323637'),
   unhex('61'),
@@ -37,9 +35,7 @@ FROM src limit 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: -- Good inputs
-
-SELECT
+POSTHOOK: query: SELECT
   unhex('4D7953514C'),
   unhex('31323637'),
   unhex('61'),
@@ -50,8 +46,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
 MySQL	1267	a	-4	
-PREHOOK: query: -- Bad inputs
-SELECT
+PREHOOK: query: SELECT
   unhex('MySQL'),
   unhex('G123'),
   unhex('\0')
@@ -59,8 +54,7 @@ FROM src limit 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: -- Bad inputs
-SELECT
+POSTHOOK: query: SELECT
   unhex('MySQL'),
   unhex('G123'),
   unhex('\0')

Modified: hive/trunk/ql/src/test/results/clientpositive/udtf_json_tuple.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/udtf_json_tuple.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/udtf_json_tuple.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/udtf_json_tuple.q.out Tue Apr  9 06:33:16 2013
@@ -571,13 +571,9 @@ POSTHOOK: Lineage: json_t.key EXPRESSION
 NULL	1
 2	2
 value2	1
-PREHOOK: query: -- Verify that json_tuple can handle new lines in JSON values
-
-CREATE TABLE dest1(c1 STRING) STORED AS RCFILE
+PREHOOK: query: CREATE TABLE dest1(c1 STRING) STORED AS RCFILE
 PREHOOK: type: CREATETABLE
-POSTHOOK: query: -- Verify that json_tuple can handle new lines in JSON values
-
-CREATE TABLE dest1(c1 STRING) STORED AS RCFILE
+POSTHOOK: query: CREATE TABLE dest1(c1 STRING) STORED AS RCFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: default@dest1
 POSTHOOK: Lineage: json_t.jstring EXPRESSION []

Modified: hive/trunk/ql/src/test/results/clientpositive/udtf_parse_url_tuple.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/udtf_parse_url_tuple.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/udtf_parse_url_tuple.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/udtf_parse_url_tuple.q.out Tue Apr  9 06:33:16 2013
@@ -353,12 +353,10 @@ NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	
 facebook.com	/path1/p.php	k1=v1&k2=v2	Ref1	http	/path1/p.php?k1=v1&k2=v2	facebook.com	NULL	v1
 sites.google.com	/a/example.com/site/page	NULL	NULL	ftp	/a/example.com/site/page	sites.google.com	NULL	NULL
 www.socs.uts.edu.au	/MosaicDocs-old/url-primer.html	k1=tps	chapter1	https	/MosaicDocs-old/url-primer.html?k1=tps	www.socs.uts.edu.au:80	NULL	tps
-PREHOOK: query: -- should return null for 'host', 'query', 'QUERY:nonExistCol' 
-explain
+PREHOOK: query: explain
 select a.key, b.ho, b.qu, b.qk1, b.err1, b.err2, b.err3 from url_t a lateral view parse_url_tuple(a.fullurl, 'HOST', 'PATH', 'QUERY', 'REF', 'PROTOCOL', 'FILE', 'AUTHORITY', 'USERINFO', 'QUERY:k1', 'host', 'query', 'QUERY:nonExistCol') b as ho, pa, qu, re, pr, fi, au, us, qk1, err1, err2, err3 order by a.key
 PREHOOK: type: QUERY
-POSTHOOK: query: -- should return null for 'host', 'query', 'QUERY:nonExistCol' 
-explain
+POSTHOOK: query: explain
 select a.key, b.ho, b.qu, b.qk1, b.err1, b.err2, b.err3 from url_t a lateral view parse_url_tuple(a.fullurl, 'HOST', 'PATH', 'QUERY', 'REF', 'PROTOCOL', 'FILE', 'AUTHORITY', 'USERINFO', 'QUERY:k1', 'host', 'query', 'QUERY:nonExistCol') b as ho, pa, qu, re, pr, fi, au, us, qk1, err1, err2, err3 order by a.key
 POSTHOOK: type: QUERY
 POSTHOOK: Lineage: url_t.fullurl EXPRESSION []

Modified: hive/trunk/ql/src/test/results/clientpositive/union.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/union.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/union.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/union.q.out Tue Apr  9 06:33:16 2013
@@ -1,6 +1,4 @@
-PREHOOK: query: -- union case: both subqueries are map jobs on same input, followed by filesink
-
-EXPLAIN
+PREHOOK: query: EXPLAIN
 FROM (
   FROM src select src.key, src.value WHERE src.key < 100
   UNION ALL
@@ -8,9 +6,7 @@ FROM (
 ) unioninput
 INSERT OVERWRITE DIRECTORY '../build/ql/test/data/warehouse/union.out' SELECT unioninput.*
 PREHOOK: type: QUERY
-POSTHOOK: query: -- union case: both subqueries are map jobs on same input, followed by filesink
-
-EXPLAIN
+POSTHOOK: query: EXPLAIN
 FROM (
   FROM src select src.key, src.value WHERE src.key < 100
   UNION ALL

Modified: hive/trunk/ql/src/test/results/clientpositive/union10.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/union10.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/union10.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/union10.q.out Tue Apr  9 06:33:16 2013
@@ -1,10 +1,6 @@
-PREHOOK: query: -- union case: all subqueries are a map-reduce jobs, 3 way union, same input for all sub-queries, followed by filesink
-
-create table tmptable(key string, value int)
+PREHOOK: query: create table tmptable(key string, value int)
 PREHOOK: type: CREATETABLE
-POSTHOOK: query: -- union case: all subqueries are a map-reduce jobs, 3 way union, same input for all sub-queries, followed by filesink
-
-create table tmptable(key string, value int)
+POSTHOOK: query: create table tmptable(key string, value int)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: default@tmptable
 PREHOOK: query: explain 

Modified: hive/trunk/ql/src/test/results/clientpositive/union11.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/union11.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/union11.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/union11.q.out Tue Apr  9 06:33:16 2013
@@ -1,15 +1,11 @@
-PREHOOK: query: -- union case: all subqueries are a map-reduce jobs, 3 way union, same input for all sub-queries, followed by reducesink
-
-explain 
+PREHOOK: query: explain 
   select unionsrc.key, count(1) FROM (select 'tst1' as key, count(1) as value from src s1
                                         UNION  ALL  
                                             select 'tst2' as key, count(1) as value from src s2
                                         UNION ALL
                                             select 'tst3' as key, count(1) as value from src s3) unionsrc group by unionsrc.key
 PREHOOK: type: QUERY
-POSTHOOK: query: -- union case: all subqueries are a map-reduce jobs, 3 way union, same input for all sub-queries, followed by reducesink
-
-explain 
+POSTHOOK: query: explain 
   select unionsrc.key, count(1) FROM (select 'tst1' as key, count(1) as value from src s1
                                         UNION  ALL  
                                             select 'tst2' as key, count(1) as value from src s2

Modified: hive/trunk/ql/src/test/results/clientpositive/union12.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/union12.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/union12.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/union12.q.out Tue Apr  9 06:33:16 2013
@@ -1,10 +1,6 @@
-PREHOOK: query: -- union case: all subqueries are a map-reduce jobs, 3 way union, different inputs for all sub-queries, followed by filesink
-
-create table tmptable(key string, value int)
+PREHOOK: query: create table tmptable(key string, value int)
 PREHOOK: type: CREATETABLE
-POSTHOOK: query: -- union case: all subqueries are a map-reduce jobs, 3 way union, different inputs for all sub-queries, followed by filesink
-
-create table tmptable(key string, value int)
+POSTHOOK: query: create table tmptable(key string, value int)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: default@tmptable
 PREHOOK: query: explain 

Modified: hive/trunk/ql/src/test/results/clientpositive/union13.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/union13.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/union13.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/union13.q.out Tue Apr  9 06:33:16 2013
@@ -1,12 +1,8 @@
-PREHOOK: query: -- union case: both subqueries are a map-only jobs, same input, followed by filesink
-
-explain 
+PREHOOK: query: explain 
   select unionsrc.key, unionsrc.value FROM (select s1.key as key, s1.value as value from src s1 UNION  ALL  
                                             select s2.key as key, s2.value as value from src s2) unionsrc
 PREHOOK: type: QUERY
-POSTHOOK: query: -- union case: both subqueries are a map-only jobs, same input, followed by filesink
-
-explain 
+POSTHOOK: query: explain 
   select unionsrc.key, unionsrc.value FROM (select s1.key as key, s1.value as value from src s1 UNION  ALL  
                                             select s2.key as key, s2.value as value from src s2) unionsrc
 POSTHOOK: type: QUERY

Modified: hive/trunk/ql/src/test/results/clientpositive/union14.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/union14.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/union14.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/union14.q.out Tue Apr  9 06:33:16 2013
@@ -1,14 +1,10 @@
-PREHOOK: query: -- union case: 1 subquery is a map-reduce job, different inputs for sub-queries, followed by reducesink
-
-explain 
+PREHOOK: query: explain 
   select unionsrc.key, count(1) FROM (select s2.key as key, s2.value as value from src1 s2
                                         UNION  ALL  
                                       select 'tst1' as key, cast(count(1) as string) as value from src s1) 
   unionsrc group by unionsrc.key
 PREHOOK: type: QUERY
-POSTHOOK: query: -- union case: 1 subquery is a map-reduce job, different inputs for sub-queries, followed by reducesink
-
-explain 
+POSTHOOK: query: explain 
   select unionsrc.key, count(1) FROM (select s2.key as key, s2.value as value from src1 s2
                                         UNION  ALL  
                                       select 'tst1' as key, cast(count(1) as string) as value from src s1) 

Modified: hive/trunk/ql/src/test/results/clientpositive/union15.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/union15.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/union15.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/union15.q.out Tue Apr  9 06:33:16 2013
@@ -1,15 +1,11 @@
-PREHOOK: query: -- union case: 1 subquery is a map-reduce job, different inputs for sub-queries, followed by reducesink
-
-explain 
+PREHOOK: query: explain 
   select unionsrc.key, count(1) FROM (select 'tst1' as key, cast(count(1) as string) as value from src s1
                                         UNION  ALL  
                                             select s2.key as key, s2.value as value from src1 s2
                                         UNION  ALL  
                                             select s3.key as key, s3.value as value from src1 s3) unionsrc group by unionsrc.key
 PREHOOK: type: QUERY
-POSTHOOK: query: -- union case: 1 subquery is a map-reduce job, different inputs for sub-queries, followed by reducesink
-
-explain 
+POSTHOOK: query: explain 
   select unionsrc.key, count(1) FROM (select 'tst1' as key, cast(count(1) as string) as value from src s1
                                         UNION  ALL  
                                             select s2.key as key, s2.value as value from src1 s2

Modified: hive/trunk/ql/src/test/results/clientpositive/union17.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/union17.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/union17.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/union17.q.out Tue Apr  9 06:33:16 2013
@@ -8,18 +8,14 @@ PREHOOK: type: CREATETABLE
 POSTHOOK: query: CREATE TABLE DEST2(key STRING, val1 STRING, val2 STRING) STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: default@DEST2
-PREHOOK: query: -- union case:map-reduce sub-queries followed by multi-table insert
-
-explain 
+PREHOOK: query: explain 
 FROM (select 'tst1' as key, cast(count(1) as string) as value from src s1
                          UNION  ALL  
       select s2.key as key, s2.value as value from src s2) unionsrc
 INSERT OVERWRITE TABLE DEST1 SELECT unionsrc.key, COUNT(DISTINCT SUBSTR(unionsrc.value,5)) GROUP BY unionsrc.key
 INSERT OVERWRITE TABLE DEST2 SELECT unionsrc.key, unionsrc.value, COUNT(DISTINCT SUBSTR(unionsrc.value,5)) GROUP BY unionsrc.key, unionsrc.value
 PREHOOK: type: QUERY
-POSTHOOK: query: -- union case:map-reduce sub-queries followed by multi-table insert
-
-explain 
+POSTHOOK: query: explain 
 FROM (select 'tst1' as key, cast(count(1) as string) as value from src s1
                          UNION  ALL  
       select s2.key as key, s2.value as value from src s2) unionsrc

Modified: hive/trunk/ql/src/test/results/clientpositive/union18.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/union18.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/union18.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/union18.q.out Tue Apr  9 06:33:16 2013
@@ -8,18 +8,14 @@ PREHOOK: type: CREATETABLE
 POSTHOOK: query: CREATE TABLE DEST2(key STRING, val1 STRING, val2 STRING) STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: default@DEST2
-PREHOOK: query: -- union case:map-reduce sub-queries followed by multi-table insert 
-
-explain 
+PREHOOK: query: explain 
 FROM (select 'tst1' as key, cast(count(1) as string) as value from src s1
                          UNION  ALL  
       select s2.key as key, s2.value as value from src s2) unionsrc
 INSERT OVERWRITE TABLE DEST1 SELECT unionsrc.key, unionsrc.value
 INSERT OVERWRITE TABLE DEST2 SELECT unionsrc.key, unionsrc.value, unionsrc.value
 PREHOOK: type: QUERY
-POSTHOOK: query: -- union case:map-reduce sub-queries followed by multi-table insert 
-
-explain 
+POSTHOOK: query: explain 
 FROM (select 'tst1' as key, cast(count(1) as string) as value from src s1
                          UNION  ALL  
       select s2.key as key, s2.value as value from src s2) unionsrc

Modified: hive/trunk/ql/src/test/results/clientpositive/union19.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/union19.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/union19.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/union19.q.out Tue Apr  9 06:33:16 2013
@@ -8,18 +8,14 @@ PREHOOK: type: CREATETABLE
 POSTHOOK: query: CREATE TABLE DEST2(key STRING, val1 STRING, val2 STRING) STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: default@DEST2
-PREHOOK: query: -- union case:map-reduce sub-queries followed by multi-table insert
-
-explain 
+PREHOOK: query: explain 
 FROM (select 'tst1' as key, cast(count(1) as string) as value from src s1
                          UNION  ALL  
       select s2.key as key, s2.value as value from src s2) unionsrc
 INSERT OVERWRITE TABLE DEST1 SELECT unionsrc.key, count(unionsrc.value) group by unionsrc.key
 INSERT OVERWRITE TABLE DEST2 SELECT unionsrc.key, unionsrc.value, unionsrc.value
 PREHOOK: type: QUERY
-POSTHOOK: query: -- union case:map-reduce sub-queries followed by multi-table insert
-
-explain 
+POSTHOOK: query: explain 
 FROM (select 'tst1' as key, cast(count(1) as string) as value from src s1
                          UNION  ALL  
       select s2.key as key, s2.value as value from src s2) unionsrc

Modified: hive/trunk/ql/src/test/results/clientpositive/union2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/union2.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/union2.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/union2.q.out Tue Apr  9 06:33:16 2013
@@ -1,12 +1,8 @@
-PREHOOK: query: -- union case: both subqueries are map-reduce jobs on same input, followed by reduce sink
-
-explain 
+PREHOOK: query: explain 
   select count(1) FROM (select s1.key as key, s1.value as value from src s1 UNION  ALL  
                         select s2.key as key, s2.value as value from src s2) unionsrc
 PREHOOK: type: QUERY
-POSTHOOK: query: -- union case: both subqueries are map-reduce jobs on same input, followed by reduce sink
-
-explain 
+POSTHOOK: query: explain 
   select count(1) FROM (select s1.key as key, s1.value as value from src s1 UNION  ALL  
                         select s2.key as key, s2.value as value from src s2) unionsrc
 POSTHOOK: type: QUERY

Modified: hive/trunk/ql/src/test/results/clientpositive/union20.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/union20.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/union20.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/union20.q.out Tue Apr  9 06:33:16 2013
@@ -1,6 +1,4 @@
-PREHOOK: query: -- union :map-reduce sub-queries followed by join
-
-explain 
+PREHOOK: query: explain 
 SELECT unionsrc1.key, unionsrc1.value, unionsrc2.key, unionsrc2.value
 FROM (select 'tst1' as key, cast(count(1) as string) as value from src s1
                          UNION  ALL  
@@ -11,9 +9,7 @@ JOIN 
       select s4.key as key, s4.value as value from src s4 where s4.key < 10) unionsrc2
 ON (unionsrc1.key = unionsrc2.key)
 PREHOOK: type: QUERY
-POSTHOOK: query: -- union :map-reduce sub-queries followed by join
-
-explain 
+POSTHOOK: query: explain 
 SELECT unionsrc1.key, unionsrc1.value, unionsrc2.key, unionsrc2.value
 FROM (select 'tst1' as key, cast(count(1) as string) as value from src s1
                          UNION  ALL  

Modified: hive/trunk/ql/src/test/results/clientpositive/union21.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/union21.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/union21.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/union21.q.out Tue Apr  9 06:33:16 2013
@@ -1,6 +1,4 @@
-PREHOOK: query: -- union of constants, udf outputs, and columns from text table and thrift table
-
-explain
+PREHOOK: query: explain
 SELECT key, count(1)
 FROM (
   SELECT '1' as key from src
@@ -15,9 +13,7 @@ FROM (
 ) union_output
 GROUP BY key
 PREHOOK: type: QUERY
-POSTHOOK: query: -- union of constants, udf outputs, and columns from text table and thrift table
-
-explain
+POSTHOOK: query: explain
 SELECT key, count(1)
 FROM (
   SELECT '1' as key from src

Modified: hive/trunk/ql/src/test/results/clientpositive/union22.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/union22.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/union22.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/union22.q.out Tue Apr  9 06:33:16 2013
@@ -42,9 +42,7 @@ POSTHOOK: Lineage: dst_union22_delta PAR
 POSTHOOK: Lineage: dst_union22_delta PARTITION(ds=1).k3 SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: dst_union22_delta PARTITION(ds=1).k4 SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: dst_union22_delta PARTITION(ds=1).k5 SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: -- Since the inputs are small, it should be automatically converted to mapjoin
-
-explain extended
+PREHOOK: query: explain extended
 insert overwrite table dst_union22 partition (ds='2')
 select * from
 (
@@ -57,9 +55,7 @@ where a.k1 > 20
 )
 subq
 PREHOOK: type: QUERY
-POSTHOOK: query: -- Since the inputs are small, it should be automatically converted to mapjoin
-
-explain extended
+POSTHOOK: query: explain extended
 insert overwrite table dst_union22 partition (ds='2')
 select * from
 (

Modified: hive/trunk/ql/src/test/results/clientpositive/union32.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/union32.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/union32.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/union32.q.out Tue Apr  9 06:33:16 2013
@@ -1,13 +1,7 @@
-PREHOOK: query: -- This tests various union queries which have columns on one side of the query
--- being of double type and those on the other side another
-
-CREATE TABLE t1 AS SELECT * FROM src WHERE key < 10
+PREHOOK: query: CREATE TABLE t1 AS SELECT * FROM src WHERE key < 10
 PREHOOK: type: CREATETABLE_AS_SELECT
 PREHOOK: Input: default@src
-POSTHOOK: query: -- This tests various union queries which have columns on one side of the query
--- being of double type and those on the other side another
-
-CREATE TABLE t1 AS SELECT * FROM src WHERE key < 10
+POSTHOOK: query: CREATE TABLE t1 AS SELECT * FROM src WHERE key < 10
 POSTHOOK: type: CREATETABLE_AS_SELECT
 POSTHOOK: Input: default@src
 POSTHOOK: Output: default@t1
@@ -18,16 +12,14 @@ POSTHOOK: query: CREATE TABLE t2 AS SELE
 POSTHOOK: type: CREATETABLE_AS_SELECT
 POSTHOOK: Input: default@src
 POSTHOOK: Output: default@t2
-PREHOOK: query: -- Test simple union with double
-EXPLAIN
+PREHOOK: query: EXPLAIN
 SELECT * FROM 
 (SELECT CAST(key AS DOUBLE) AS key FROM t1
 UNION ALL
 SELECT CAST(key AS BIGINT) AS key FROM t2) a
 ORDER BY key
 PREHOOK: type: QUERY
-POSTHOOK: query: -- Test simple union with double
-EXPLAIN
+POSTHOOK: query: EXPLAIN
 SELECT * FROM 
 (SELECT CAST(key AS DOUBLE) AS key FROM t1
 UNION ALL
@@ -143,16 +135,14 @@ POSTHOOK: Input: default@t2
 8.0
 9.0
 9.0
-PREHOOK: query: -- Test union with join on the left
-EXPLAIN
+PREHOOK: query: EXPLAIN
 SELECT * FROM 
 (SELECT CAST(a.key AS BIGINT) AS key FROM t1 a JOIN t2 b ON a.key = b.key
 UNION ALL
 SELECT CAST(key AS DOUBLE) AS key FROM t2) a
 ORDER BY key
 PREHOOK: type: QUERY
-POSTHOOK: query: -- Test union with join on the left
-EXPLAIN
+POSTHOOK: query: EXPLAIN
 SELECT * FROM 
 (SELECT CAST(a.key AS BIGINT) AS key FROM t1 a JOIN t2 b ON a.key = b.key
 UNION ALL
@@ -326,16 +316,14 @@ POSTHOOK: Input: default@t2
 8.0
 9.0
 9.0
-PREHOOK: query: -- Test union with join on the right
-EXPLAIN
+PREHOOK: query: EXPLAIN
 SELECT * FROM 
 (SELECT CAST(key AS DOUBLE) AS key FROM t2
 UNION ALL
 SELECT CAST(a.key AS BIGINT) AS key FROM t1 a JOIN t2 b ON a.key = b.key) a
 ORDER BY key
 PREHOOK: type: QUERY
-POSTHOOK: query: -- Test union with join on the right
-EXPLAIN
+POSTHOOK: query: EXPLAIN
 SELECT * FROM 
 (SELECT CAST(key AS DOUBLE) AS key FROM t2
 UNION ALL
@@ -509,16 +497,14 @@ POSTHOOK: Input: default@t2
 8.0
 9.0
 9.0
-PREHOOK: query: -- Test union with join on the left selecting multiple columns
-EXPLAIN
+PREHOOK: query: EXPLAIN
 SELECT * FROM 
 (SELECT CAST(a.key AS BIGINT) AS key, CAST(b.key AS DOUBLE) AS value FROM t1 a JOIN t2 b ON a.key = b.key
 UNION ALL
 SELECT CAST(key AS DOUBLE) AS key, CAST(key AS STRING) AS value FROM t2) a
 ORDER BY key
 PREHOOK: type: QUERY
-POSTHOOK: query: -- Test union with join on the left selecting multiple columns
-EXPLAIN
+POSTHOOK: query: EXPLAIN
 SELECT * FROM 
 (SELECT CAST(a.key AS BIGINT) AS key, CAST(b.key AS DOUBLE) AS value FROM t1 a JOIN t2 b ON a.key = b.key
 UNION ALL
@@ -707,16 +693,14 @@ POSTHOOK: Input: default@t2
 8.0	8.0
 9.0	9.0
 9.0	9
-PREHOOK: query: -- Test union with join on the right selecting multiple columns
-EXPLAIN
+PREHOOK: query: EXPLAIN
 SELECT * FROM 
 (SELECT CAST(key AS DOUBLE) AS key, CAST(key AS STRING) AS value FROM t2
 UNION ALL
 SELECT CAST(a.key AS BIGINT) AS key, CAST(b.key AS DOUBLE) AS value FROM t1 a JOIN t2 b ON a.key = b.key) a
 ORDER BY key
 PREHOOK: type: QUERY
-POSTHOOK: query: -- Test union with join on the right selecting multiple columns
-EXPLAIN
+POSTHOOK: query: EXPLAIN
 SELECT * FROM 
 (SELECT CAST(key AS DOUBLE) AS key, CAST(key AS STRING) AS value FROM t2
 UNION ALL

Modified: hive/trunk/ql/src/test/results/clientpositive/union33.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/union33.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/union33.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/union33.q.out Tue Apr  9 06:33:16 2013
@@ -1,12 +1,6 @@
-PREHOOK: query: -- This tests that a union all with a map only subquery on one side and a 
--- subquery involving two map reduce jobs on the other runs correctly.
-
-CREATE TABLE test_src (key STRING, value STRING)
+PREHOOK: query: CREATE TABLE test_src (key STRING, value STRING)
 PREHOOK: type: CREATETABLE
-POSTHOOK: query: -- This tests that a union all with a map only subquery on one side and a 
--- subquery involving two map reduce jobs on the other runs correctly.
-
-CREATE TABLE test_src (key STRING, value STRING)
+POSTHOOK: query: CREATE TABLE test_src (key STRING, value STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: default@test_src
 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE test_src 

Modified: hive/trunk/ql/src/test/results/clientpositive/union4.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/union4.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/union4.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/union4.q.out Tue Apr  9 06:33:16 2013
@@ -1,12 +1,6 @@
-PREHOOK: query: -- union case: both subqueries are map-reduce jobs on same input, followed by filesink
-
-
-create table tmptable(key string, value int)
+PREHOOK: query: create table tmptable(key string, value int)
 PREHOOK: type: CREATETABLE
-POSTHOOK: query: -- union case: both subqueries are map-reduce jobs on same input, followed by filesink
-
-
-create table tmptable(key string, value int)
+POSTHOOK: query: create table tmptable(key string, value int)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: default@tmptable
 PREHOOK: query: explain 

Modified: hive/trunk/ql/src/test/results/clientpositive/union5.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/union5.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/union5.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/union5.q.out Tue Apr  9 06:33:16 2013
@@ -1,13 +1,9 @@
-PREHOOK: query: -- union case: both subqueries are map-reduce jobs on same input, followed by reduce sink
-
-explain 
+PREHOOK: query: explain 
   select unionsrc.key, count(1) FROM (select 'tst1' as key, count(1) as value from src s1
                                     UNION  ALL  
                                       select 'tst2' as key, count(1) as value from src s2) unionsrc group by unionsrc.key
 PREHOOK: type: QUERY
-POSTHOOK: query: -- union case: both subqueries are map-reduce jobs on same input, followed by reduce sink
-
-explain 
+POSTHOOK: query: explain 
   select unionsrc.key, count(1) FROM (select 'tst1' as key, count(1) as value from src s1
                                     UNION  ALL  
                                       select 'tst2' as key, count(1) as value from src s2) unionsrc group by unionsrc.key

Modified: hive/trunk/ql/src/test/results/clientpositive/union6.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/union6.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/union6.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/union6.q.out Tue Apr  9 06:33:16 2013
@@ -1,12 +1,6 @@
-PREHOOK: query: -- union case: 1 subquery is a map-reduce job, different inputs for sub-queries, followed by filesink
-
-
-create table tmptable(key string, value string)
+PREHOOK: query: create table tmptable(key string, value string)
 PREHOOK: type: CREATETABLE
-POSTHOOK: query: -- union case: 1 subquery is a map-reduce job, different inputs for sub-queries, followed by filesink
-
-
-create table tmptable(key string, value string)
+POSTHOOK: query: create table tmptable(key string, value string)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: default@tmptable
 PREHOOK: query: explain 

Modified: hive/trunk/ql/src/test/results/clientpositive/union7.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/union7.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/union7.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/union7.q.out Tue Apr  9 06:33:16 2013
@@ -1,13 +1,9 @@
-PREHOOK: query: -- union case: 1 subquery is a map-reduce job, different inputs for sub-queries, followed by reducesink
-
-explain 
+PREHOOK: query: explain 
   select unionsrc.key, count(1) FROM (select 'tst1' as key, cast(count(1) as string) as value from src s1
                                         UNION  ALL  
                                             select s2.key as key, s2.value as value from src1 s2) unionsrc group by unionsrc.key
 PREHOOK: type: QUERY
-POSTHOOK: query: -- union case: 1 subquery is a map-reduce job, different inputs for sub-queries, followed by reducesink
-
-explain 
+POSTHOOK: query: explain 
   select unionsrc.key, count(1) FROM (select 'tst1' as key, cast(count(1) as string) as value from src s1
                                         UNION  ALL  
                                             select s2.key as key, s2.value as value from src1 s2) unionsrc group by unionsrc.key

Modified: hive/trunk/ql/src/test/results/clientpositive/union8.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/union8.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/union8.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/union8.q.out Tue Apr  9 06:33:16 2013
@@ -1,13 +1,9 @@
-PREHOOK: query: -- union case: all subqueries are a map-only jobs, 3 way union, same input for all sub-queries, followed by filesink
-
-explain 
+PREHOOK: query: explain 
   select unionsrc.key, unionsrc.value FROM (select s1.key as key, s1.value as value from src s1 UNION  ALL  
                                             select s2.key as key, s2.value as value from src s2 UNION  ALL  
                                             select s3.key as key, s3.value as value from src s3) unionsrc
 PREHOOK: type: QUERY
-POSTHOOK: query: -- union case: all subqueries are a map-only jobs, 3 way union, same input for all sub-queries, followed by filesink
-
-explain 
+POSTHOOK: query: explain 
   select unionsrc.key, unionsrc.value FROM (select s1.key as key, s1.value as value from src s1 UNION  ALL  
                                             select s2.key as key, s2.value as value from src s2 UNION  ALL  
                                             select s3.key as key, s3.value as value from src s3) unionsrc

Modified: hive/trunk/ql/src/test/results/clientpositive/union9.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/union9.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/union9.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/union9.q.out Tue Apr  9 06:33:16 2013
@@ -1,13 +1,9 @@
-PREHOOK: query: -- union case: all subqueries are a map-only jobs, 3 way union, same input for all sub-queries, followed by reducesink
-
-explain 
+PREHOOK: query: explain 
   select count(1) FROM (select s1.key as key, s1.value as value from src s1 UNION  ALL  
                         select s2.key as key, s2.value as value from src s2 UNION ALL
                         select s3.key as key, s3.value as value from src s3) unionsrc
 PREHOOK: type: QUERY
-POSTHOOK: query: -- union case: all subqueries are a map-only jobs, 3 way union, same input for all sub-queries, followed by reducesink
-
-explain 
+POSTHOOK: query: explain 
   select count(1) FROM (select s1.key as key, s1.value as value from src s1 UNION  ALL  
                         select s2.key as key, s2.value as value from src s2 UNION ALL
                         select s3.key as key, s3.value as value from src s3) unionsrc

Modified: hive/trunk/ql/src/test/results/clientpositive/union_null.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/union_null.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/union_null.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/union_null.q.out Tue Apr  9 06:33:16 2013
@@ -1,10 +1,8 @@
-PREHOOK: query: -- HIVE-2901
-select x from (select value as x from src union all select NULL as x from src)a limit 10
+PREHOOK: query: select x from (select value as x from src union all select NULL as x from src)a limit 10
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
 #### A masked pattern was here ####
-POSTHOOK: query: -- HIVE-2901
-select x from (select value as x from src union all select NULL as x from src)a limit 10
+POSTHOOK: query: select x from (select value as x from src union all select NULL as x from src)a limit 10
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####

Modified: hive/trunk/ql/src/test/results/clientpositive/union_remove_6.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/union_remove_6.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/union_remove_6.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/union_remove_6.q.out Tue Apr  9 06:33:16 2013
@@ -1,20 +1,6 @@
-PREHOOK: query: -- This is to test the union->selectstar->filesink optimization
--- Union of 2 subqueries is performed (all of which are mapred queries)
--- followed by select star and a file sink in 2 output tables.
--- The optimiaztion does not take affect since it is a multi-table insert.
--- It does not matter, whether the output is merged or not. In this case,
--- merging is turned off
-
-create table inputTbl1(key string, val string) stored as textfile
+PREHOOK: query: create table inputTbl1(key string, val string) stored as textfile
 PREHOOK: type: CREATETABLE
-POSTHOOK: query: -- This is to test the union->selectstar->filesink optimization
--- Union of 2 subqueries is performed (all of which are mapred queries)
--- followed by select star and a file sink in 2 output tables.
--- The optimiaztion does not take affect since it is a multi-table insert.
--- It does not matter, whether the output is merged or not. In this case,
--- merging is turned off
-
-create table inputTbl1(key string, val string) stored as textfile
+POSTHOOK: query: create table inputTbl1(key string, val string) stored as textfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: default@inputTbl1
 PREHOOK: query: create table outputTbl1(key string, values bigint) stored as textfile

Modified: hive/trunk/ql/src/test/results/clientpositive/unset_table_view_property.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/unset_table_view_property.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/unset_table_view_property.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/unset_table_view_property.q.out Tue Apr  9 06:33:16 2013
@@ -9,13 +9,11 @@ POSTHOOK: query: SHOW TBLPROPERTIES test
 POSTHOOK: type: SHOW_TBLPROPERTIES
 	 
 #### A masked pattern was here ####
-PREHOOK: query: -- UNSET TABLE PROPERTIES
-ALTER TABLE testTable SET TBLPROPERTIES ('a'='1', 'c'='3')
+PREHOOK: query: ALTER TABLE testTable SET TBLPROPERTIES ('a'='1', 'c'='3')
 PREHOOK: type: ALTERTABLE_PROPERTIES
 PREHOOK: Input: default@testtable
 PREHOOK: Output: default@testtable
-POSTHOOK: query: -- UNSET TABLE PROPERTIES
-ALTER TABLE testTable SET TBLPROPERTIES ('a'='1', 'c'='3')
+POSTHOOK: query: ALTER TABLE testTable SET TBLPROPERTIES ('a'='1', 'c'='3')
 POSTHOOK: type: ALTERTABLE_PROPERTIES
 POSTHOOK: Input: default@testtable
 POSTHOOK: Output: default@testtable
@@ -29,13 +27,11 @@ c	3
 #### A masked pattern was here ####
 a	1
 #### A masked pattern was here ####
-PREHOOK: query: -- UNSET all the properties
-ALTER TABLE testTable UNSET TBLPROPERTIES ('a', 'c')
+PREHOOK: query: ALTER TABLE testTable UNSET TBLPROPERTIES ('a', 'c')
 PREHOOK: type: ALTERTABLE_PROPERTIES
 PREHOOK: Input: default@testtable
 PREHOOK: Output: default@testtable
-POSTHOOK: query: -- UNSET all the properties
-ALTER TABLE testTable UNSET TBLPROPERTIES ('a', 'c')
+POSTHOOK: query: ALTER TABLE testTable UNSET TBLPROPERTIES ('a', 'c')
 POSTHOOK: type: ALTERTABLE_PROPERTIES
 POSTHOOK: Input: default@testtable
 POSTHOOK: Output: default@testtable
@@ -64,13 +60,11 @@ c	3
 #### A masked pattern was here ####
 a	1
 #### A masked pattern was here ####
-PREHOOK: query: -- UNSET a subset of the properties
-ALTER TABLE testTable UNSET TBLPROPERTIES ('a', 'd')
+PREHOOK: query: ALTER TABLE testTable UNSET TBLPROPERTIES ('a', 'd')
 PREHOOK: type: ALTERTABLE_PROPERTIES
 PREHOOK: Input: default@testtable
 PREHOOK: Output: default@testtable
-POSTHOOK: query: -- UNSET a subset of the properties
-ALTER TABLE testTable UNSET TBLPROPERTIES ('a', 'd')
+POSTHOOK: query: ALTER TABLE testTable UNSET TBLPROPERTIES ('a', 'd')
 POSTHOOK: type: ALTERTABLE_PROPERTIES
 POSTHOOK: Input: default@testtable
 POSTHOOK: Output: default@testtable
@@ -82,13 +76,11 @@ POSTHOOK: type: SHOW_TBLPROPERTIES
 #### A masked pattern was here ####
 c	3
 #### A masked pattern was here ####
-PREHOOK: query: -- the same property being UNSET multiple times
-ALTER TABLE testTable UNSET TBLPROPERTIES ('c', 'c', 'c')
+PREHOOK: query: ALTER TABLE testTable UNSET TBLPROPERTIES ('c', 'c', 'c')
 PREHOOK: type: ALTERTABLE_PROPERTIES
 PREHOOK: Input: default@testtable
 PREHOOK: Output: default@testtable
-POSTHOOK: query: -- the same property being UNSET multiple times
-ALTER TABLE testTable UNSET TBLPROPERTIES ('c', 'c', 'c')
+POSTHOOK: query: ALTER TABLE testTable UNSET TBLPROPERTIES ('c', 'c', 'c')
 POSTHOOK: type: ALTERTABLE_PROPERTIES
 POSTHOOK: Input: default@testtable
 POSTHOOK: Output: default@testtable
@@ -118,13 +110,11 @@ c	3
 #### A masked pattern was here ####
 a	1
 #### A masked pattern was here ####
-PREHOOK: query: -- UNSET a subset of the properties and some non-existed properties using IF EXISTS
-ALTER TABLE testTable UNSET TBLPROPERTIES IF EXISTS ('b', 'd', 'b', 'f')
+PREHOOK: query: ALTER TABLE testTable UNSET TBLPROPERTIES IF EXISTS ('b', 'd', 'b', 'f')
 PREHOOK: type: ALTERTABLE_PROPERTIES
 PREHOOK: Input: default@testtable
 PREHOOK: Output: default@testtable
-POSTHOOK: query: -- UNSET a subset of the properties and some non-existed properties using IF EXISTS
-ALTER TABLE testTable UNSET TBLPROPERTIES IF EXISTS ('b', 'd', 'b', 'f')
+POSTHOOK: query: ALTER TABLE testTable UNSET TBLPROPERTIES IF EXISTS ('b', 'd', 'b', 'f')
 POSTHOOK: type: ALTERTABLE_PROPERTIES
 POSTHOOK: Input: default@testtable
 POSTHOOK: Output: default@testtable
@@ -138,13 +128,11 @@ c	3
 #### A masked pattern was here ####
 a	1
 #### A masked pattern was here ####
-PREHOOK: query: -- UNSET a subset of the properties and some non-existed properties using IF EXISTS
-ALTER TABLE testTable UNSET TBLPROPERTIES IF EXISTS ('b', 'd', 'c', 'f', 'x', 'y', 'z')
+PREHOOK: query: ALTER TABLE testTable UNSET TBLPROPERTIES IF EXISTS ('b', 'd', 'c', 'f', 'x', 'y', 'z')
 PREHOOK: type: ALTERTABLE_PROPERTIES
 PREHOOK: Input: default@testtable
 PREHOOK: Output: default@testtable
-POSTHOOK: query: -- UNSET a subset of the properties and some non-existed properties using IF EXISTS
-ALTER TABLE testTable UNSET TBLPROPERTIES IF EXISTS ('b', 'd', 'c', 'f', 'x', 'y', 'z')
+POSTHOOK: query: ALTER TABLE testTable UNSET TBLPROPERTIES IF EXISTS ('b', 'd', 'c', 'f', 'x', 'y', 'z')
 POSTHOOK: type: ALTERTABLE_PROPERTIES
 POSTHOOK: Input: default@testtable
 POSTHOOK: Output: default@testtable
@@ -156,11 +144,9 @@ POSTHOOK: type: SHOW_TBLPROPERTIES
 #### A masked pattern was here ####
 a	1
 #### A masked pattern was here ####
-PREHOOK: query: -- UNSET VIEW PROPERTIES
-CREATE VIEW testView AS SELECT value FROM src WHERE key=86
+PREHOOK: query: CREATE VIEW testView AS SELECT value FROM src WHERE key=86
 PREHOOK: type: CREATEVIEW
-POSTHOOK: query: -- UNSET VIEW PROPERTIES
-CREATE VIEW testView AS SELECT value FROM src WHERE key=86
+POSTHOOK: query: CREATE VIEW testView AS SELECT value FROM src WHERE key=86
 POSTHOOK: type: CREATEVIEW
 POSTHOOK: Output: default@testView
 PREHOOK: query: ALTER VIEW testView SET TBLPROPERTIES ('propA'='100', 'propB'='200')
@@ -180,13 +166,11 @@ POSTHOOK: type: SHOW_TBLPROPERTIES
 propA	100
 propB	200
 #### A masked pattern was here ####
-PREHOOK: query: -- UNSET all the properties
-ALTER VIEW testView UNSET TBLPROPERTIES ('propA', 'propB')
+PREHOOK: query: ALTER VIEW testView UNSET TBLPROPERTIES ('propA', 'propB')
 PREHOOK: type: ALTERVIEW_PROPERTIES
 PREHOOK: Input: default@testview
 PREHOOK: Output: default@testview
-POSTHOOK: query: -- UNSET all the properties
-ALTER VIEW testView UNSET TBLPROPERTIES ('propA', 'propB')
+POSTHOOK: query: ALTER VIEW testView UNSET TBLPROPERTIES ('propA', 'propB')
 POSTHOOK: type: ALTERVIEW_PROPERTIES
 POSTHOOK: Input: default@testview
 POSTHOOK: Output: default@testview
@@ -214,13 +198,11 @@ propA	100
 #### A masked pattern was here ####
 propD	400
 propC	300
-PREHOOK: query: -- UNSET a subset of the properties
-ALTER VIEW testView UNSET TBLPROPERTIES ('propA', 'propC')
+PREHOOK: query: ALTER VIEW testView UNSET TBLPROPERTIES ('propA', 'propC')
 PREHOOK: type: ALTERVIEW_PROPERTIES
 PREHOOK: Input: default@testview
 PREHOOK: Output: default@testview
-POSTHOOK: query: -- UNSET a subset of the properties
-ALTER VIEW testView UNSET TBLPROPERTIES ('propA', 'propC')
+POSTHOOK: query: ALTER VIEW testView UNSET TBLPROPERTIES ('propA', 'propC')
 POSTHOOK: type: ALTERVIEW_PROPERTIES
 POSTHOOK: Input: default@testview
 POSTHOOK: Output: default@testview
@@ -231,13 +213,11 @@ POSTHOOK: type: SHOW_TBLPROPERTIES
 	 
 #### A masked pattern was here ####
 propD	400
-PREHOOK: query: -- the same property being UNSET multiple times
-ALTER VIEW testView UNSET TBLPROPERTIES ('propD', 'propD', 'propD')
+PREHOOK: query: ALTER VIEW testView UNSET TBLPROPERTIES ('propD', 'propD', 'propD')
 PREHOOK: type: ALTERVIEW_PROPERTIES
 PREHOOK: Input: default@testview
 PREHOOK: Output: default@testview
-POSTHOOK: query: -- the same property being UNSET multiple times
-ALTER VIEW testView UNSET TBLPROPERTIES ('propD', 'propD', 'propD')
+POSTHOOK: query: ALTER VIEW testView UNSET TBLPROPERTIES ('propD', 'propD', 'propD')
 POSTHOOK: type: ALTERVIEW_PROPERTIES
 POSTHOOK: Input: default@testview
 POSTHOOK: Output: default@testview
@@ -266,13 +246,11 @@ propB	200
 #### A masked pattern was here ####
 propD	400
 propC	300
-PREHOOK: query: -- UNSET a subset of the properties and some non-existed properties using IF EXISTS
-ALTER VIEW testView UNSET TBLPROPERTIES IF EXISTS ('propC', 'propD', 'propD', 'propC', 'propZ')
+PREHOOK: query: ALTER VIEW testView UNSET TBLPROPERTIES IF EXISTS ('propC', 'propD', 'propD', 'propC', 'propZ')
 PREHOOK: type: ALTERVIEW_PROPERTIES
 PREHOOK: Input: default@testview
 PREHOOK: Output: default@testview
-POSTHOOK: query: -- UNSET a subset of the properties and some non-existed properties using IF EXISTS
-ALTER VIEW testView UNSET TBLPROPERTIES IF EXISTS ('propC', 'propD', 'propD', 'propC', 'propZ')
+POSTHOOK: query: ALTER VIEW testView UNSET TBLPROPERTIES IF EXISTS ('propC', 'propD', 'propD', 'propC', 'propZ')
 POSTHOOK: type: ALTERVIEW_PROPERTIES
 POSTHOOK: Input: default@testview
 POSTHOOK: Output: default@testview
@@ -285,13 +263,11 @@ POSTHOOK: type: SHOW_TBLPROPERTIES
 propA	100
 propB	200
 #### A masked pattern was here ####
-PREHOOK: query: -- UNSET a subset of the properties and some non-existed properties using IF EXISTS
-ALTER VIEW testView UNSET TBLPROPERTIES IF EXISTS ('propB', 'propC', 'propD', 'propF')
+PREHOOK: query: ALTER VIEW testView UNSET TBLPROPERTIES IF EXISTS ('propB', 'propC', 'propD', 'propF')
 PREHOOK: type: ALTERVIEW_PROPERTIES
 PREHOOK: Input: default@testview
 PREHOOK: Output: default@testview
-POSTHOOK: query: -- UNSET a subset of the properties and some non-existed properties using IF EXISTS
-ALTER VIEW testView UNSET TBLPROPERTIES IF EXISTS ('propB', 'propC', 'propD', 'propF')
+POSTHOOK: query: ALTER VIEW testView UNSET TBLPROPERTIES IF EXISTS ('propB', 'propC', 'propD', 'propF')
 POSTHOOK: type: ALTERVIEW_PROPERTIES
 POSTHOOK: Input: default@testview
 POSTHOOK: Output: default@testview

Modified: hive/trunk/ql/src/test/results/clientpositive/view.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/view.q.out?rev=1465903&r1=1465902&r2=1465903&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/view.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/view.q.out Tue Apr  9 06:33:16 2013
@@ -36,60 +36,44 @@ POSTHOOK: query: LOAD DATA LOCAL INPATH 
 OVERWRITE INTO TABLE table2
 POSTHOOK: type: LOAD
 POSTHOOK: Output: db1@table2
-PREHOOK: query: -- relative reference, no alias
-CREATE VIEW v1 AS SELECT * FROM table1
+PREHOOK: query: CREATE VIEW v1 AS SELECT * FROM table1
 PREHOOK: type: CREATEVIEW
-POSTHOOK: query: -- relative reference, no alias
-CREATE VIEW v1 AS SELECT * FROM table1
+POSTHOOK: query: CREATE VIEW v1 AS SELECT * FROM table1
 POSTHOOK: type: CREATEVIEW
 POSTHOOK: Output: db1@v1
-PREHOOK: query: -- relative reference, aliased
-CREATE VIEW v2 AS SELECT t1.* FROM table1 t1
+PREHOOK: query: CREATE VIEW v2 AS SELECT t1.* FROM table1 t1
 PREHOOK: type: CREATEVIEW
-POSTHOOK: query: -- relative reference, aliased
-CREATE VIEW v2 AS SELECT t1.* FROM table1 t1
+POSTHOOK: query: CREATE VIEW v2 AS SELECT t1.* FROM table1 t1
 POSTHOOK: type: CREATEVIEW
 POSTHOOK: Output: db1@v2
-PREHOOK: query: -- relative reference, multiple tables
-CREATE VIEW v3 AS SELECT t1.*, t2.key k FROM table1 t1 JOIN table2 t2 ON t1.key = t2.key
+PREHOOK: query: CREATE VIEW v3 AS SELECT t1.*, t2.key k FROM table1 t1 JOIN table2 t2 ON t1.key = t2.key
 PREHOOK: type: CREATEVIEW
-POSTHOOK: query: -- relative reference, multiple tables
-CREATE VIEW v3 AS SELECT t1.*, t2.key k FROM table1 t1 JOIN table2 t2 ON t1.key = t2.key
+POSTHOOK: query: CREATE VIEW v3 AS SELECT t1.*, t2.key k FROM table1 t1 JOIN table2 t2 ON t1.key = t2.key
 POSTHOOK: type: CREATEVIEW
 POSTHOOK: Output: db1@v3
-PREHOOK: query: -- absolute reference, no alias
-CREATE VIEW v4 AS SELECT * FROM db1.table1
+PREHOOK: query: CREATE VIEW v4 AS SELECT * FROM db1.table1
 PREHOOK: type: CREATEVIEW
-POSTHOOK: query: -- absolute reference, no alias
-CREATE VIEW v4 AS SELECT * FROM db1.table1
+POSTHOOK: query: CREATE VIEW v4 AS SELECT * FROM db1.table1
 POSTHOOK: type: CREATEVIEW
 POSTHOOK: Output: db1@v4
-PREHOOK: query: -- absolute reference, aliased
-CREATE VIEW v5 AS SELECT t1.* FROM db1.table1 t1
+PREHOOK: query: CREATE VIEW v5 AS SELECT t1.* FROM db1.table1 t1
 PREHOOK: type: CREATEVIEW
-POSTHOOK: query: -- absolute reference, aliased
-CREATE VIEW v5 AS SELECT t1.* FROM db1.table1 t1
+POSTHOOK: query: CREATE VIEW v5 AS SELECT t1.* FROM db1.table1 t1
 POSTHOOK: type: CREATEVIEW
 POSTHOOK: Output: db1@v5
-PREHOOK: query: -- absolute reference, multiple tables
-CREATE VIEW v6 AS SELECT t1.*, t2.key k FROM db1.table1 t1 JOIN db1.table2 t2 ON t1.key = t2.key
+PREHOOK: query: CREATE VIEW v6 AS SELECT t1.*, t2.key k FROM db1.table1 t1 JOIN db1.table2 t2 ON t1.key = t2.key
 PREHOOK: type: CREATEVIEW
-POSTHOOK: query: -- absolute reference, multiple tables
-CREATE VIEW v6 AS SELECT t1.*, t2.key k FROM db1.table1 t1 JOIN db1.table2 t2 ON t1.key = t2.key
+POSTHOOK: query: CREATE VIEW v6 AS SELECT t1.*, t2.key k FROM db1.table1 t1 JOIN db1.table2 t2 ON t1.key = t2.key
 POSTHOOK: type: CREATEVIEW
 POSTHOOK: Output: db1@v6
-PREHOOK: query: -- relative reference, explicit column
-CREATE VIEW v7 AS SELECT key from table1
+PREHOOK: query: CREATE VIEW v7 AS SELECT key from table1
 PREHOOK: type: CREATEVIEW
-POSTHOOK: query: -- relative reference, explicit column
-CREATE VIEW v7 AS SELECT key from table1
+POSTHOOK: query: CREATE VIEW v7 AS SELECT key from table1
 POSTHOOK: type: CREATEVIEW
 POSTHOOK: Output: db1@v7
-PREHOOK: query: -- absolute reference, explicit column
-CREATE VIEW v8 AS SELECT key from db1.table1
+PREHOOK: query: CREATE VIEW v8 AS SELECT key from db1.table1
 PREHOOK: type: CREATEVIEW
-POSTHOOK: query: -- absolute reference, explicit column
-CREATE VIEW v8 AS SELECT key from db1.table1
+POSTHOOK: query: CREATE VIEW v8 AS SELECT key from db1.table1
 POSTHOOK: type: CREATEVIEW
 POSTHOOK: Output: db1@v8
 PREHOOK: query: CREATE DATABASE db2



Mime
View raw message