You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by rm...@apache.org on 2009/09/29 03:25:30 UTC

svn commit: r819792 [20/24] - in /hadoop/hive/trunk: ./ common/src/java/org/apache/hadoop/hive/conf/ contrib/src/test/results/clientnegative/ contrib/src/test/results/clientpositive/ data/conf/ ql/src/java/org/apache/hadoop/hive/ql/ ql/src/java/org/apa...

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_locate.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_locate.q.out?rev=819792&r1=819791&r2=819792&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_locate.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_locate.q.out Tue Sep 29 01:25:15 2009
@@ -1,4 +1,4 @@
-query: EXPLAIN
+PREHOOK: query: EXPLAIN
 SELECT locate('abc', 'abcd'),
        locate('ccc', 'abcabc'),
        locate('23', 123),
@@ -17,6 +17,27 @@
        locate('abc', 'abcd', null),
        locate('abc', 'abcd', 'invalid number')
 FROM src LIMIT 1
+PREHOOK: type: QUERY
+POSTHOOK: query: EXPLAIN
+SELECT locate('abc', 'abcd'),
+       locate('ccc', 'abcabc'),
+       locate('23', 123),
+       locate(23, 123),
+       locate('abc', 'abcabc', 2),
+       locate('abc', 'abcabc', '2'),
+       locate(1, TRUE),
+       locate(1, FALSE),
+       locate(CAST('2' AS TINYINT), '12345'),
+       locate('34', CAST('12345' AS SMALLINT)),
+       locate('456', CAST('123456789012' AS BIGINT)),
+       locate('.25', CAST(1.25 AS FLOAT)),
+       locate('.0', CAST(16.0 AS DOUBLE)),
+       locate(null, 'abc'),
+       locate('abc', null),
+       locate('abc', 'abcd', null),
+       locate('abc', 'abcd', 'invalid number')
+FROM src LIMIT 1
+POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_TABREF src)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_FUNCTION locate 'abc' 'abcd')) (TOK_SELEXPR (TOK_FUNCTION locate 'ccc' 'abcabc')) (TOK_SELEXPR (TOK_FUNCTION locate '23' 123)) (TOK_SELEXPR (TOK_FUNCTION locate 23 123)) (TOK_SELEXPR (TOK_FUNCTION locate 'abc' 'abcabc' 2)) (TOK_SELEXPR (TOK_FUNCTION locate 'abc' 'abcabc' '2')) (TOK_SELEXPR (TOK_FUNCTION locate 1 TRUE)) (TOK_SELEXPR (TOK_FUNCTION locate 1 FALSE)) (TOK_SELEXPR (TOK_FUNCTION locate (TOK_FUNCTION TOK_TINYINT '2') '12345')) (TOK_SELEXPR (TOK_FUNCTION locate '34' (TOK_FUNCTION TOK_SMALLINT '12345'))) (TOK_SELEXPR (TOK_FUNCTION locate '456' (TOK_FUNCTION TOK_BIGINT '123456789012'))) (TOK_SELEXPR (TOK_FUNCTION locate '.25' (TOK_FUNCTION TOK_FLOAT 1.25))) (TOK_SELEXPR (TOK_FUNCTION locate '.0' (TOK_FUNCTION TOK_DOUBLE 16.0))) (TOK_SELEXPR (TOK_FUNCTION locate TOK_NULL 'abc')) (TOK_SELEXPR (TOK_FUNCTION locate 'abc' TOK_NULL)) (TOK_SELEXPR (TOK_F
 UNCTION locate 'abc' 'abcd' TOK_NULL)) (TOK_SELEXPR (TOK_FUNCTION locate 'abc' 'abcd' 'invalid number'))) (TOK_LIMIT 1)))
 
@@ -81,7 +102,28 @@
       limit: 1
 
 
-query: SELECT locate('abc', 'abcd'),
+PREHOOK: query: SELECT locate('abc', 'abcd'),
+       locate('ccc', 'abcabc'),
+       locate('23', 123),
+       locate(23, 123),
+       locate('abc', 'abcabc', 2),
+       locate('abc', 'abcabc', '2'),
+       locate(1, TRUE),
+       locate(1, FALSE),
+       locate(CAST('2' AS TINYINT), '12345'),
+       locate('34', CAST('12345' AS SMALLINT)),
+       locate('456', CAST('123456789012' AS BIGINT)),
+       locate('.25', CAST(1.25 AS FLOAT)),
+       locate('.0', CAST(16.0 AS DOUBLE)),
+       locate(null, 'abc'),
+       locate('abc', null),
+       locate('abc', 'abcd', null),
+       locate('abc', 'abcd', 'invalid number')
+FROM src LIMIT 1
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/572327680/10000
+POSTHOOK: query: SELECT locate('abc', 'abcd'),
        locate('ccc', 'abcabc'),
        locate('23', 123),
        locate(23, 123),
@@ -99,6 +141,7 @@
        locate('abc', 'abcd', null),
        locate('abc', 'abcd', 'invalid number')
 FROM src LIMIT 1
-Input: default/src
-Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/436151757/10000
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/572327680/10000
 1	0	2	2	4	4	0	0	2	3	4	2	3	NULL	NULL	0	0

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_lower.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_lower.q.out?rev=819792&r1=819791&r2=819792&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_lower.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_lower.q.out Tue Sep 29 01:25:15 2009
@@ -1,5 +1,9 @@
-query: EXPLAIN
+PREHOOK: query: EXPLAIN
 SELECT lower('AbC 123'), upper('AbC 123') FROM src WHERE key = 86
+PREHOOK: type: QUERY
+POSTHOOK: query: EXPLAIN
+SELECT lower('AbC 123'), upper('AbC 123') FROM src WHERE key = 86
+POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_TABREF src)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_FUNCTION lower 'AbC 123')) (TOK_SELEXPR (TOK_FUNCTION upper 'AbC 123'))) (TOK_WHERE (= (TOK_TABLE_OR_COL key) 86))))
 
@@ -41,7 +45,12 @@
       limit: -1
 
 
-query: SELECT lower('AbC 123'), upper('AbC 123') FROM src WHERE key = 86
-Input: default/src
-Output: file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_1/build/ql/tmp/838466259/10000
+PREHOOK: query: SELECT lower('AbC 123'), upper('AbC 123') FROM src WHERE key = 86
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/655858125/10000
+POSTHOOK: query: SELECT lower('AbC 123'), upper('AbC 123') FROM src WHERE key = 86
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/655858125/10000
 abc 123	ABC 123

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_lpad_rpad.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_lpad_rpad.q.out?rev=819792&r1=819791&r2=819792&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_lpad_rpad.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_lpad_rpad.q.out Tue Sep 29 01:25:15 2009
@@ -1,8 +1,15 @@
-query: EXPLAIN SELECT
+PREHOOK: query: EXPLAIN SELECT
   lpad('hi', 1, '?'),
   lpad('hi', 5, '.'),
   lpad('hi', 6, '123')
 FROM src LIMIT 1
+PREHOOK: type: QUERY
+POSTHOOK: query: EXPLAIN SELECT
+  lpad('hi', 1, '?'),
+  lpad('hi', 5, '.'),
+  lpad('hi', 6, '123')
+FROM src LIMIT 1
+POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_TABREF src)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_FUNCTION lpad 'hi' 1 '?')) (TOK_SELEXPR (TOK_FUNCTION lpad 'hi' 5 '.')) (TOK_SELEXPR (TOK_FUNCTION lpad 'hi' 6 '123'))) (TOK_LIMIT 1)))
 
@@ -39,19 +46,35 @@
       limit: 1
 
 
-query: SELECT
+PREHOOK: query: SELECT
+  lpad('hi', 1, '?'),
+  lpad('hi', 5, '.'),
+  lpad('hi', 6, '123')
+FROM src LIMIT 1
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/369345424/10000
+POSTHOOK: query: SELECT
   lpad('hi', 1, '?'),
   lpad('hi', 5, '.'),
   lpad('hi', 6, '123')
 FROM src LIMIT 1
-Input: default/src
-Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/440914656/10000
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/369345424/10000
 h	...hi	1231hi
-query: EXPLAIN SELECT
+PREHOOK: query: EXPLAIN SELECT
   rpad('hi', 1, '?'),
   rpad('hi', 5, '.'),
   rpad('hi', 6, '123')
 FROM src LIMIT 1
+PREHOOK: type: QUERY
+POSTHOOK: query: EXPLAIN SELECT
+  rpad('hi', 1, '?'),
+  rpad('hi', 5, '.'),
+  rpad('hi', 6, '123')
+FROM src LIMIT 1
+POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_TABREF src)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_FUNCTION rpad 'hi' 1 '?')) (TOK_SELEXPR (TOK_FUNCTION rpad 'hi' 5 '.')) (TOK_SELEXPR (TOK_FUNCTION rpad 'hi' 6 '123'))) (TOK_LIMIT 1)))
 
@@ -88,11 +111,20 @@
       limit: 1
 
 
-query: SELECT
+PREHOOK: query: SELECT
+  rpad('hi', 1, '?'),
+  rpad('hi', 5, '.'),
+  rpad('hi', 6, '123')
+FROM src LIMIT 1
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/975123871/10000
+POSTHOOK: query: SELECT
   rpad('hi', 1, '?'),
   rpad('hi', 5, '.'),
   rpad('hi', 6, '123')
 FROM src LIMIT 1
-Input: default/src
-Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1578755009/10000
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/975123871/10000
 h	hi...	hi1231

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_parse_url.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_parse_url.q.out?rev=819792&r1=819791&r2=819792&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_parse_url.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_parse_url.q.out Tue Sep 29 01:25:15 2009
@@ -1,4 +1,4 @@
-query: EXPLAIN
+PREHOOK: query: EXPLAIN
 SELECT parse_url('http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1', 'HOST'), 
 parse_url('http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1', 'PATH'), 
 parse_url('http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1', 'QUERY') ,
@@ -11,6 +11,21 @@
 parse_url('http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1', 'USERINFO') ,
 parse_url('http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1', 'AUTHORITY') 
   FROM src WHERE key = 86
+PREHOOK: type: QUERY
+POSTHOOK: query: EXPLAIN
+SELECT parse_url('http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1', 'HOST'), 
+parse_url('http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1', 'PATH'), 
+parse_url('http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1', 'QUERY') ,
+parse_url('http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1', 'REF') ,
+parse_url('http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1', 'QUERY', 'k2') ,
+parse_url('http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1', 'QUERY', 'k1') ,
+parse_url('http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1', 'QUERY', 'k3') ,
+parse_url('http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1', 'FILE') ,
+parse_url('http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1', 'PROTOCOL') ,
+parse_url('http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1', 'USERINFO') ,
+parse_url('http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1', 'AUTHORITY') 
+  FROM src WHERE key = 86
+POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_TABREF src)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_FUNCTION parse_url 'http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1' 'HOST')) (TOK_SELEXPR (TOK_FUNCTION parse_url 'http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1' 'PATH')) (TOK_SELEXPR (TOK_FUNCTION parse_url 'http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1' 'QUERY')) (TOK_SELEXPR (TOK_FUNCTION parse_url 'http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1' 'REF')) (TOK_SELEXPR (TOK_FUNCTION parse_url 'http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1' 'QUERY' 'k2')) (TOK_SELEXPR (TOK_FUNCTION parse_url 'http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1' 'QUERY' 'k1')) (TOK_SELEXPR (TOK_FUNCTION parse_url 'http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1' 'QUERY' 'k3')) (TOK_SELEXPR (TOK_FUNCTION parse_url 'http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1' 'FILE')) (TOK_SELEXPR (TOK_FUNCTION parse_url 'http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1' '
 PROTOCOL')) (TOK_SELEXPR (TOK_FUNCTION parse_url 'http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1' 'USERINFO')) (TOK_SELEXPR (TOK_FUNCTION parse_url 'http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1' 'AUTHORITY'))) (TOK_WHERE (= (TOK_TABLE_OR_COL key) 86))))
 
@@ -70,7 +85,22 @@
       limit: -1
 
 
-query: SELECT parse_url('http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1', 'HOST'), 
+PREHOOK: query: SELECT parse_url('http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1', 'HOST'), 
+parse_url('http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1', 'PATH'), 
+parse_url('http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1', 'QUERY') ,
+parse_url('http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1', 'REF') ,
+parse_url('http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1', 'QUERY', 'k2') ,
+parse_url('http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1', 'QUERY', 'k1') ,
+parse_url('http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1', 'QUERY', 'k3') ,
+parse_url('http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1', 'FILE') ,
+parse_url('http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1', 'PROTOCOL') ,
+parse_url('http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1', 'USERINFO') ,
+parse_url('http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1', 'AUTHORITY') 
+  FROM src WHERE key = 86
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/1215092102/10000
+POSTHOOK: query: SELECT parse_url('http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1', 'HOST'), 
 parse_url('http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1', 'PATH'), 
 parse_url('http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1', 'QUERY') ,
 parse_url('http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1', 'REF') ,
@@ -82,6 +112,7 @@
 parse_url('http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1', 'USERINFO') ,
 parse_url('http://facebook.com/path1/p.php?k1=v1&k2=v2#Ref1', 'AUTHORITY') 
   FROM src WHERE key = 86
-Input: default/src
-Output: file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_0/build/ql/tmp/2056987249/10000
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/1215092102/10000
 facebook.com	/path1/p.php	k1=v1&k2=v2	Ref1	v2	v1	NULL	/path1/p.php?k1=v1&k2=v2	http	NULL	facebook.com

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_pmod.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_pmod.q.out?rev=819792&r1=819791&r2=819792&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_pmod.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_pmod.q.out Tue Sep 29 01:25:15 2009
@@ -1,15 +1,33 @@
-query: SELECT pmod(null, null)
+PREHOOK: query: SELECT pmod(null, null)
 FROM src LIMIT 1
-Input: default/src
-Output: file:/mnt/vol/devrs001.snc1/schen/hive-trunk/build/ql/tmp/770960285/10000
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/1384517913/10000
+POSTHOOK: query: SELECT pmod(null, null)
+FROM src LIMIT 1
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/1384517913/10000
 NULL
-query: SELECT pmod(-100,9), pmod(-50,101), pmod(-1000,29)
+PREHOOK: query: SELECT pmod(-100,9), pmod(-50,101), pmod(-1000,29)
+FROM src LIMIT 1
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/1606180544/10000
+POSTHOOK: query: SELECT pmod(-100,9), pmod(-50,101), pmod(-1000,29)
 FROM src LIMIT 1
-Input: default/src
-Output: file:/mnt/vol/devrs001.snc1/schen/hive-trunk/build/ql/tmp/1004944279/10000
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/1606180544/10000
 8	51	15
-query: SELECT pmod(100,19), pmod(50,125), pmod(300,15)
+PREHOOK: query: SELECT pmod(100,19), pmod(50,125), pmod(300,15)
+FROM src LIMIT 1
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/1250421811/10000
+POSTHOOK: query: SELECT pmod(100,19), pmod(50,125), pmod(300,15)
 FROM src LIMIT 1
-Input: default/src
-Output: file:/mnt/vol/devrs001.snc1/schen/hive-trunk/build/ql/tmp/1063528154/10000
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/1250421811/10000
 5	50	0

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_repeat.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_repeat.q.out?rev=819792&r1=819791&r2=819792&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_repeat.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_repeat.q.out Tue Sep 29 01:25:15 2009
@@ -1,9 +1,17 @@
-query: EXPLAIN SELECT
+PREHOOK: query: EXPLAIN SELECT
   repeat("Facebook", 3),
   repeat("", 4),
   repeat("asd", 0),
   repeat("asdf", -1)
 FROM src LIMIT 1
+PREHOOK: type: QUERY
+POSTHOOK: query: EXPLAIN SELECT
+  repeat("Facebook", 3),
+  repeat("", 4),
+  repeat("asd", 0),
+  repeat("asdf", -1)
+FROM src LIMIT 1
+POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_TABREF src)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_FUNCTION repeat "Facebook" 3)) (TOK_SELEXPR (TOK_FUNCTION repeat "" 4)) (TOK_SELEXPR (TOK_FUNCTION repeat "asd" 0)) (TOK_SELEXPR (TOK_FUNCTION repeat "asdf" (- 1)))) (TOK_LIMIT 1)))
 
@@ -42,12 +50,22 @@
       limit: 1
 
 
-query: SELECT
+PREHOOK: query: SELECT
+  repeat("Facebook", 3),
+  repeat("", 4),
+  repeat("asd", 0),
+  repeat("asdf", -1)
+FROM src LIMIT 1
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/208533019/10000
+POSTHOOK: query: SELECT
   repeat("Facebook", 3),
   repeat("", 4),
   repeat("asd", 0),
   repeat("asdf", -1)
 FROM src LIMIT 1
-Input: default/src
-Output: file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_2/build/ql/tmp/302987092/10000
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/208533019/10000
 FacebookFacebookFacebook			

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_reverse.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_reverse.q.out?rev=819792&r1=819791&r2=819792&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_reverse.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_reverse.q.out Tue Sep 29 01:25:15 2009
@@ -1,5 +1,12 @@
-query: CREATE TABLE dest1(len STRING)
-query: EXPLAIN FROM src1 INSERT OVERWRITE TABLE dest1 SELECT reverse(src1.value)
+PREHOOK: query: CREATE TABLE dest1(len STRING)
+PREHOOK: type: CREATETABLE
+POSTHOOK: query: CREATE TABLE dest1(len STRING)
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: default@dest1
+PREHOOK: query: EXPLAIN FROM src1 INSERT OVERWRITE TABLE dest1 SELECT reverse(src1.value)
+PREHOOK: type: QUERY
+POSTHOOK: query: EXPLAIN FROM src1 INSERT OVERWRITE TABLE dest1 SELECT reverse(src1.value)
+POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_TABREF src1)) (TOK_INSERT (TOK_DESTINATION (TOK_TAB dest1)) (TOK_SELECT (TOK_SELEXPR (TOK_FUNCTION reverse (. (TOK_TABLE_OR_COL src1) value))))))
 
@@ -35,10 +42,10 @@
           Move Operator
             files:
                 hdfs directory: true
-                destination: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2139233776/10000
+                destination: file:/data/users/njain/hive5/hive5/build/ql/tmp/1305154928/10000
           Map Reduce
             Alias -> Map Operator Tree:
-              file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1684174409/10002 
+              file:/data/users/njain/hive5/hive5/build/ql/tmp/925020569/10002 
                   Reduce Output Operator
                     sort order: 
                     Map-reduce partition columns:
@@ -70,12 +77,22 @@
               name: dest1
 
 
-query: FROM src1 INSERT OVERWRITE TABLE dest1 SELECT reverse(src1.value)
-Input: default/src1
-Output: default/dest1
-query: SELECT dest1.* FROM dest1
-Input: default/dest1
-Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/38069188/10000
+PREHOOK: query: FROM src1 INSERT OVERWRITE TABLE dest1 SELECT reverse(src1.value)
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src1
+PREHOOK: Output: default@dest1
+POSTHOOK: query: FROM src1 INSERT OVERWRITE TABLE dest1 SELECT reverse(src1.value)
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src1
+POSTHOOK: Output: default@dest1
+PREHOOK: query: SELECT dest1.* FROM dest1
+PREHOOK: type: QUERY
+PREHOOK: Input: default@dest1
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/516796328/10000
+POSTHOOK: query: SELECT dest1.* FROM dest1
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@dest1
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/516796328/10000
 832_lav
 
 113_lav
@@ -101,14 +118,38 @@
 
 
 
-query: DROP TABLE dest1
-query: -- Test with non-ascii characters
+PREHOOK: query: DROP TABLE dest1
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: DROP TABLE dest1
+POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: default@dest1
+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
-query: LOAD DATA LOCAL INPATH '../data/files/kv4.txt' INTO TABLE dest1
-query: SELECT count(1) FROM dest1 WHERE reverse(dest1.name) = _UTF-8 0xE993AEE982B5
-Input: default/dest1
-Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/484118/10000
+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: type: CREATETABLE
+POSTHOOK: Output: default@dest1
+PREHOOK: query: LOAD DATA LOCAL INPATH '../data/files/kv4.txt' INTO TABLE dest1
+PREHOOK: type: LOAD
+POSTHOOK: query: LOAD DATA LOCAL INPATH '../data/files/kv4.txt' INTO TABLE dest1
+POSTHOOK: type: LOAD
+POSTHOOK: Output: default@dest1
+PREHOOK: query: SELECT count(1) FROM dest1 WHERE reverse(dest1.name) = _UTF-8 0xE993AEE982B5
+PREHOOK: type: QUERY
+PREHOOK: Input: default@dest1
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/465925440/10000
+POSTHOOK: query: SELECT count(1) FROM dest1 WHERE reverse(dest1.name) = _UTF-8 0xE993AEE982B5
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@dest1
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/465925440/10000
 1
-query: DROP TABLE dest1
+PREHOOK: query: DROP TABLE dest1
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: DROP TABLE dest1
+POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: default@dest1

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_round.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_round.q.out?rev=819792&r1=819791&r2=819792&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_round.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_round.q.out Tue Sep 29 01:25:15 2009
@@ -1,17 +1,43 @@
-query: SELECT round(null), round(null, 0), round(125, null)
+PREHOOK: query: SELECT round(null), round(null, 0), round(125, null)
 FROM src LIMIT 1
-Input: default/src
-Output: /data/users/athusoo/commits/hive_trunk_ws8/ql/../build/ql/tmp/165813041/1303869.10000
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/1931880581/10000
+POSTHOOK: query: SELECT round(null), round(null, 0), round(125, null)
+FROM src LIMIT 1
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/1931880581/10000
 NULL	NULL	NULL
-query: SELECT
+PREHOOK: query: SELECT
+  round(55555), round(55555, 0), round(55555, 1), round(55555, 2), round(55555, 3),
+  round(55555, -1), round(55555, -2), round(55555, -3), round(55555, -4),
+  round(55555, -5), round(55555, -6), round(55555, -7), round(55555, -8)
+FROM src LIMIT 1
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/1954748857/10000
+POSTHOOK: query: SELECT
   round(55555), round(55555, 0), round(55555, 1), round(55555, 2), round(55555, 3),
   round(55555, -1), round(55555, -2), round(55555, -3), round(55555, -4),
   round(55555, -5), round(55555, -6), round(55555, -7), round(55555, -8)
 FROM src LIMIT 1
-Input: default/src
-Output: /data/users/athusoo/commits/hive_trunk_ws8/ql/../build/ql/tmp/388417828/112328812.10000
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/1954748857/10000
 55555	55555.0	55555.0	55555.0	55555.0	55560.0	55600.0	56000.0	60000.0	100000.0	0.0	0.0	0.0
-query: SELECT
+PREHOOK: query: SELECT
+  round(125.315), round(125.315, 0),
+  round(125.315, 1), round(125.315, 2), round(125.315, 3), round(125.315, 4),
+  round(125.315, -1), round(125.315, -2), round(125.315, -3), round(125.315, -4),
+  round(-125.315), round(-125.315, 0),
+  round(-125.315, 1), round(-125.315, 2), round(-125.315, 3), round(-125.315, 4),
+  round(-125.315, -1), round(-125.315, -2), round(-125.315, -3), round(-125.315, -4)
+FROM src LIMIT 1
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/372474214/10000
+POSTHOOK: query: SELECT
   round(125.315), round(125.315, 0),
   round(125.315, 1), round(125.315, 2), round(125.315, 3), round(125.315, 4),
   round(125.315, -1), round(125.315, -2), round(125.315, -3), round(125.315, -4),
@@ -19,10 +45,11 @@
   round(-125.315, 1), round(-125.315, 2), round(-125.315, 3), round(-125.315, 4),
   round(-125.315, -1), round(-125.315, -2), round(-125.315, -3), round(-125.315, -4)
 FROM src LIMIT 1
-Input: default/src
-Output: /data/users/athusoo/commits/hive_trunk_ws8/ql/../build/ql/tmp/14344880/300835303.10000
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/372474214/10000
 125	125.0	125.3	125.32	125.315	125.315	130.0	100.0	0.0	0.0	-125	-125.0	-125.3	-125.32	-125.315	-125.315	-130.0	-100.0	0.0	0.0
-query: SELECT
+PREHOOK: query: SELECT
   round(3.141592653589793, -15), round(3.141592653589793, -16),
   round(3.141592653589793, -13), round(3.141592653589793, -14),
   round(3.141592653589793, -11), round(3.141592653589793, -12),
@@ -41,11 +68,40 @@
   round(3.141592653589793, 13), round(3.141592653589793, 14),
   round(3.141592653589793, 15), round(3.141592653589793, 16)
 FROM src LIMIT 1
-Input: default/src
-Output: /data/users/athusoo/commits/hive_trunk_ws8/ql/../build/ql/tmp/243474525/32427733.10000
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/412153419/10000
+POSTHOOK: query: SELECT
+  round(3.141592653589793, -15), round(3.141592653589793, -16),
+  round(3.141592653589793, -13), round(3.141592653589793, -14),
+  round(3.141592653589793, -11), round(3.141592653589793, -12),
+  round(3.141592653589793, -9), round(3.141592653589793, -10),
+  round(3.141592653589793, -7), round(3.141592653589793, -8),
+  round(3.141592653589793, -5), round(3.141592653589793, -6),
+  round(3.141592653589793, -3), round(3.141592653589793, -4),
+  round(3.141592653589793, -1), round(3.141592653589793, -2),
+  round(3.141592653589793, 0), round(3.141592653589793, 1),
+  round(3.141592653589793, 2), round(3.141592653589793, 3),
+  round(3.141592653589793, 4), round(3.141592653589793, 5),
+  round(3.141592653589793, 6), round(3.141592653589793, 7),
+  round(3.141592653589793, 8), round(3.141592653589793, 9),
+  round(3.141592653589793, 10), round(3.141592653589793, 11),
+  round(3.141592653589793, 12), round(3.141592653589793, 13),
+  round(3.141592653589793, 13), round(3.141592653589793, 14),
+  round(3.141592653589793, 15), round(3.141592653589793, 16)
+FROM src LIMIT 1
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/412153419/10000
 0.0	0.0	0.0	0.0	0.0	0.0	0.0	0.0	0.0	0.0	0.0	0.0	0.0	0.0	0.0	0.0	3.0	3.1	3.14	3.142	3.1416	3.14159	3.141593	3.1415927	3.14159265	3.141592654	3.1415926536	3.14159265359	3.14159265359	3.1415926535898	3.1415926535898	3.14159265358979	3.141592653589793	3.141592653589793
-query: SELECT round(1809242.3151111344, 9), round(-1809242.3151111344, 9)
+PREHOOK: query: SELECT round(1809242.3151111344, 9), round(-1809242.3151111344, 9)
+FROM src LIMIT 1
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/667136403/10000
+POSTHOOK: query: SELECT round(1809242.3151111344, 9), round(-1809242.3151111344, 9)
 FROM src LIMIT 1
-Input: default/src
-Output: /data/users/athusoo/commits/hive_trunk_ws8/ql/../build/ql/tmp/798926241/339405158.10000
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/667136403/10000
 1809242.315111134	-1809242.315111134

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_sin.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_sin.q.out?rev=819792&r1=819791&r2=819792&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_sin.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_sin.q.out Tue Sep 29 01:25:15 2009
@@ -1,10 +1,22 @@
-query: SELECT sin(null)
+PREHOOK: query: SELECT sin(null)
 FROM src LIMIT 1
-Input: default/src
-Output: file:/home/kmangla/hive/build/ql/tmp/2092943307/10000
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/1281720904/10000
+POSTHOOK: query: SELECT sin(null)
+FROM src LIMIT 1
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/1281720904/10000
 NULL
-query: SELECT sin(0.98), sin(1.57), sin(-0.5)
+PREHOOK: query: SELECT sin(0.98), sin(1.57), sin(-0.5)
+FROM src LIMIT 1
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/820458381/10000
+POSTHOOK: query: SELECT sin(0.98), sin(1.57), sin(-0.5)
 FROM src LIMIT 1
-Input: default/src
-Output: file:/home/kmangla/hive/build/ql/tmp/1611665044/10000
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/820458381/10000
 0.8304973704919705	0.9999996829318346	-0.479425538604203

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_size.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_size.q.out?rev=819792&r1=819791&r2=819792&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_size.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_size.q.out Tue Sep 29 01:25:15 2009
@@ -1,4 +1,4 @@
-query: EXPLAIN
+PREHOOK: query: EXPLAIN
 FROM src_thrift
 SELECT size(src_thrift.lint), 
        size(src_thrift.lintstring), 
@@ -6,6 +6,16 @@
        size(null)
 WHERE  src_thrift.lint IS NOT NULL 
        AND NOT (src_thrift.mstringstring IS NULL) LIMIT 1
+PREHOOK: type: QUERY
+POSTHOOK: query: EXPLAIN
+FROM src_thrift
+SELECT size(src_thrift.lint), 
+       size(src_thrift.lintstring), 
+       size(src_thrift.mstringstring),
+       size(null)
+WHERE  src_thrift.lint IS NOT NULL 
+       AND NOT (src_thrift.mstringstring IS NULL) LIMIT 1
+POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_TABREF src_thrift)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_FUNCTION size (. (TOK_TABLE_OR_COL src_thrift) lint))) (TOK_SELEXPR (TOK_FUNCTION size (. (TOK_TABLE_OR_COL src_thrift) lintstring))) (TOK_SELEXPR (TOK_FUNCTION size (. (TOK_TABLE_OR_COL src_thrift) mstringstring))) (TOK_SELEXPR (TOK_FUNCTION size TOK_NULL))) (TOK_WHERE (AND (TOK_FUNCTION TOK_ISNOTNULL (. (TOK_TABLE_OR_COL src_thrift) lint)) (NOT (TOK_FUNCTION TOK_ISNULL (. (TOK_TABLE_OR_COL src_thrift) mstringstring))))) (TOK_LIMIT 1)))
 
@@ -52,13 +62,24 @@
       limit: 1
 
 
-query: FROM src_thrift
+PREHOOK: query: FROM src_thrift
+SELECT size(src_thrift.lint), 
+       size(src_thrift.lintstring), 
+       size(src_thrift.mstringstring),
+       size(null)
+WHERE  src_thrift.lint IS NOT NULL 
+       AND NOT (src_thrift.mstringstring IS NULL) LIMIT 1
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src_thrift
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/1116336737/10000
+POSTHOOK: query: FROM src_thrift
 SELECT size(src_thrift.lint), 
        size(src_thrift.lintstring), 
        size(src_thrift.mstringstring),
        size(null)
 WHERE  src_thrift.lint IS NOT NULL 
        AND NOT (src_thrift.mstringstring IS NULL) LIMIT 1
-Input: default/src_thrift
-Output: file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_0/build/ql/tmp/914164736/10000
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src_thrift
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/1116336737/10000
 3	1	1	-1

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_space.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_space.q.out?rev=819792&r1=819791&r2=819792&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_space.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_space.q.out Tue Sep 29 01:25:15 2009
@@ -1,10 +1,19 @@
-query: EXPLAIN SELECT
+PREHOOK: query: EXPLAIN SELECT
   space(10),
   space(0),
   space(1),
   space(-1),
   space(-100)
 FROM src LIMIT 1
+PREHOOK: type: QUERY
+POSTHOOK: query: EXPLAIN SELECT
+  space(10),
+  space(0),
+  space(1),
+  space(-1),
+  space(-100)
+FROM src LIMIT 1
+POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_TABREF src)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_FUNCTION space 10)) (TOK_SELEXPR (TOK_FUNCTION space 0)) (TOK_SELEXPR (TOK_FUNCTION space 1)) (TOK_SELEXPR (TOK_FUNCTION space (- 1))) (TOK_SELEXPR (TOK_FUNCTION space (- 100)))) (TOK_LIMIT 1)))
 
@@ -45,23 +54,45 @@
       limit: 1
 
 
-query: SELECT
+PREHOOK: query: SELECT
+  length(space(10)),
+  length(space(0)),
+  length(space(1)),
+  length(space(-1)),
+  length(space(-100))
+FROM src LIMIT 1
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/228561399/10000
+POSTHOOK: query: SELECT
   length(space(10)),
   length(space(0)),
   length(space(1)),
   length(space(-1)),
   length(space(-100))
 FROM src LIMIT 1
-Input: default/src
-Output: file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_1/build/ql/tmp/1516911469/10000
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/228561399/10000
 10	0	1	0	0
-query: SELECT
+PREHOOK: query: SELECT
+  space(10),
+  space(0),
+  space(1),
+  space(-1),
+  space(-100)
+FROM src LIMIT 1
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/201745127/10000
+POSTHOOK: query: SELECT
   space(10),
   space(0),
   space(1),
   space(-1),
   space(-100)
 FROM src LIMIT 1
-Input: default/src
-Output: file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_1/build/ql/tmp/1726324605/10000
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/201745127/10000
           		 		

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_split.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_split.q.out?rev=819792&r1=819791&r2=819792&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_split.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_split.q.out Tue Sep 29 01:25:15 2009
@@ -1,9 +1,17 @@
-query: EXPLAIN SELECT 
+PREHOOK: query: EXPLAIN SELECT 
   split('a b c', ' '),
   split('oneAtwoBthreeC', '[ABC]'),
   split('', '.'),
   split(50401020, 0)
 FROM src LIMIT 1
+PREHOOK: type: QUERY
+POSTHOOK: query: EXPLAIN SELECT 
+  split('a b c', ' '),
+  split('oneAtwoBthreeC', '[ABC]'),
+  split('', '.'),
+  split(50401020, 0)
+FROM src LIMIT 1
+POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_TABREF src)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_FUNCTION split 'a b c' ' ')) (TOK_SELEXPR (TOK_FUNCTION split 'oneAtwoBthreeC' '[ABC]')) (TOK_SELEXPR (TOK_FUNCTION split '' '.')) (TOK_SELEXPR (TOK_FUNCTION split 50401020 0))) (TOK_LIMIT 1)))
 
@@ -42,12 +50,22 @@
       limit: 1
 
 
-query: SELECT 
+PREHOOK: query: SELECT 
+  split('a b c', ' '),
+  split('oneAtwoBthreeC', '[ABC]'),
+  split('', '.'),
+  split(50401020, 0)
+FROM src LIMIT 1
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/415947738/10000
+POSTHOOK: query: SELECT 
   split('a b c', ' '),
   split('oneAtwoBthreeC', '[ABC]'),
   split('', '.'),
   split(50401020, 0)
 FROM src LIMIT 1
-Input: default/src
-Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2093678093/10000
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/415947738/10000
 ["a","b","c"]	["one","two","three"]	[]	["5","4","1","2"]

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_substr.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_substr.q.out?rev=819792&r1=819791&r2=819792&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_substr.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_substr.q.out Tue Sep 29 01:25:15 2009
@@ -1,12 +1,32 @@
-query: SELECT
+PREHOOK: query: SELECT
   substr(null, 1), substr(null, 1, 1),
   substr('ABC', null), substr('ABC', null, 1),
   substr('ABC', 1, null)
 FROM src LIMIT 1
-Input: default/src
-Output: file:/data/users/emil/hive1/hive1/build/ql/tmp/1003484703/10000
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/1163670295/10000
+POSTHOOK: query: SELECT
+  substr(null, 1), substr(null, 1, 1),
+  substr('ABC', null), substr('ABC', null, 1),
+  substr('ABC', 1, null)
+FROM src LIMIT 1
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/1163670295/10000
 NULL	NULL	NULL	NULL	NULL
-query: SELECT
+PREHOOK: query: SELECT
+  substr('ABC', 1, 0), substr('ABC', 1, -1), substr('ABC', 2, -100),
+  substr('ABC', 4), substr('ABC', 4, 100),
+  substr('ABC', -4), substr('ABC', -4, 100),
+  substr('ABC', 100), substr('ABC', 100, 100),
+  substr('ABC', -100), substr('ABC', -100, 100),
+  substr('ABC', 2147483647), substr('ABC', 2147483647, 2147483647)
+FROM src LIMIT 1
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/1047004193/10000
+POSTHOOK: query: SELECT
   substr('ABC', 1, 0), substr('ABC', 1, -1), substr('ABC', 2, -100),
   substr('ABC', 4), substr('ABC', 4, 100),
   substr('ABC', -4), substr('ABC', -4, 100),
@@ -14,39 +34,83 @@
   substr('ABC', -100), substr('ABC', -100, 100),
   substr('ABC', 2147483647), substr('ABC', 2147483647, 2147483647)
 FROM src LIMIT 1
-Input: default/src
-Output: file:/data/users/emil/hive1/hive1/build/ql/tmp/250165013/10000
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/1047004193/10000
 												
-query: SELECT
+PREHOOK: query: SELECT
   substr('ABCDEFG', 3, 4), substr('ABCDEFG', -5, 4),
   substr('ABCDEFG', 3), substr('ABCDEFG', -5),
   substr('ABC', 0), substr('ABC', 1), substr('ABC', 2), substr('ABC', 3),
   substr('ABC', 1, 2147483647), substr('ABC', 2, 2147483647),
   substr('A', 0), substr('A', 1), substr('A', -1)
 FROM src LIMIT 1
-Input: default/src
-Output: file:/data/users/emil/hive1/hive1/build/ql/tmp/1628096586/10000
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/633389211/10000
+POSTHOOK: query: SELECT
+  substr('ABCDEFG', 3, 4), substr('ABCDEFG', -5, 4),
+  substr('ABCDEFG', 3), substr('ABCDEFG', -5),
+  substr('ABC', 0), substr('ABC', 1), substr('ABC', 2), substr('ABC', 3),
+  substr('ABC', 1, 2147483647), substr('ABC', 2, 2147483647),
+  substr('A', 0), substr('A', 1), substr('A', -1)
+FROM src LIMIT 1
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/633389211/10000
 CDEF	CDEF	CDEFG	CDEFG	ABC	ABC	BC	C	ABC	BC	A	A	A
-query: SELECT
+PREHOOK: query: SELECT
   substr('ABC', 0, 1), substr('ABC', 0, 2), substr('ABC', 0, 3), substr('ABC', 0, 4),
   substr('ABC', 1, 1), substr('ABC', 1, 2), substr('ABC', 1, 3), substr('ABC', 1, 4),
   substr('ABC', 2, 1), substr('ABC', 2, 2), substr('ABC', 2, 3), substr('ABC', 2, 4),
   substr('ABC', 3, 1), substr('ABC', 3, 2), substr('ABC', 3, 3), substr('ABC', 3, 4),
   substr('ABC', 4, 1)
 FROM src LIMIT 1
-Input: default/src
-Output: file:/data/users/emil/hive1/hive1/build/ql/tmp/1508843983/10000
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/1247257569/10000
+POSTHOOK: query: SELECT
+  substr('ABC', 0, 1), substr('ABC', 0, 2), substr('ABC', 0, 3), substr('ABC', 0, 4),
+  substr('ABC', 1, 1), substr('ABC', 1, 2), substr('ABC', 1, 3), substr('ABC', 1, 4),
+  substr('ABC', 2, 1), substr('ABC', 2, 2), substr('ABC', 2, 3), substr('ABC', 2, 4),
+  substr('ABC', 3, 1), substr('ABC', 3, 2), substr('ABC', 3, 3), substr('ABC', 3, 4),
+  substr('ABC', 4, 1)
+FROM src LIMIT 1
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/1247257569/10000
 A	AB	ABC	ABC	A	AB	ABC	ABC	B	BC	BC	BC	C	C	C	C	
-query: SELECT
+PREHOOK: query: SELECT
   substr('ABC', -1, 1), substr('ABC', -1, 2), substr('ABC', -1, 3), substr('ABC', -1, 4),
   substr('ABC', -2, 1), substr('ABC', -2, 2), substr('ABC', -2, 3), substr('ABC', -2, 4),
   substr('ABC', -3, 1), substr('ABC', -3, 2), substr('ABC', -3, 3), substr('ABC', -3, 4),
   substr('ABC', -4, 1)
 FROM src LIMIT 1
-Input: default/src
-Output: file:/data/users/emil/hive1/hive1/build/ql/tmp/1953689668/10000
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/1569190573/10000
+POSTHOOK: query: SELECT
+  substr('ABC', -1, 1), substr('ABC', -1, 2), substr('ABC', -1, 3), substr('ABC', -1, 4),
+  substr('ABC', -2, 1), substr('ABC', -2, 2), substr('ABC', -2, 3), substr('ABC', -2, 4),
+  substr('ABC', -3, 1), substr('ABC', -3, 2), substr('ABC', -3, 3), substr('ABC', -3, 4),
+  substr('ABC', -4, 1)
+FROM src LIMIT 1
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/1569190573/10000
 C	C	C	C	B	BC	BC	BC	A	AB	ABC	ABC	
-query: -- substring() is a synonim of substr(), so just perform some basic tests
+PREHOOK: query: -- substring() is a synonim of substr(), so just perform some basic tests
+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),
+  substring('ABC', 1, 2147483647), substring('ABC', 2, 2147483647),
+  substring('A', 0), substring('A', 1), substring('A', -1)
+FROM src LIMIT 1
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/1899515229/10000
+POSTHOOK: query: -- substring() is a synonim of substr(), so just perform some basic tests
 SELECT
   substring('ABCDEFG', 3, 4), substring('ABCDEFG', -5, 4),
   substring('ABCDEFG', 3), substring('ABCDEFG', -5),
@@ -54,6 +118,7 @@
   substring('ABC', 1, 2147483647), substring('ABC', 2, 2147483647),
   substring('A', 0), substring('A', 1), substring('A', -1)
 FROM src LIMIT 1
-Input: default/src
-Output: file:/data/users/emil/hive1/hive1/build/ql/tmp/17245713/10000
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/1899515229/10000
 CDEF	CDEF	CDEFG	CDEFG	ABC	ABC	BC	C	ABC	BC	A	A	A

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_testlength.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_testlength.q.out?rev=819792&r1=819791&r2=819792&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_testlength.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_testlength.q.out Tue Sep 29 01:25:15 2009
@@ -1,5 +1,9 @@
-query: EXPLAIN
+PREHOOK: query: EXPLAIN
 CREATE TEMPORARY FUNCTION testlength AS 'org.apache.hadoop.hive.ql.udf.UDFTestLength'
+PREHOOK: type: CREATEFUNCTION
+POSTHOOK: query: EXPLAIN
+CREATE TEMPORARY FUNCTION testlength AS 'org.apache.hadoop.hive.ql.udf.UDFTestLength'
+POSTHOOK: type: CREATEFUNCTION
 ABSTRACT SYNTAX TREE:
   (TOK_CREATEFUNCTION testlength 'org.apache.hadoop.hive.ql.udf.UDFTestLength')
 
@@ -10,14 +14,31 @@
   Stage: Stage-0
 
 
-query: CREATE TEMPORARY FUNCTION testlength AS 'org.apache.hadoop.hive.ql.udf.UDFTestLength'
-query: CREATE TABLE dest1(len INT)
-query: FROM src INSERT OVERWRITE TABLE dest1 SELECT testlength(src.value)
-Input: default/src
-Output: default/dest1
-query: SELECT dest1.* FROM dest1
-Input: default/dest1
-Output: file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/1256922669/10000
+PREHOOK: query: CREATE TEMPORARY FUNCTION testlength AS 'org.apache.hadoop.hive.ql.udf.UDFTestLength'
+PREHOOK: type: CREATEFUNCTION
+POSTHOOK: query: CREATE TEMPORARY FUNCTION testlength AS 'org.apache.hadoop.hive.ql.udf.UDFTestLength'
+POSTHOOK: type: CREATEFUNCTION
+PREHOOK: query: CREATE TABLE dest1(len INT)
+PREHOOK: type: CREATETABLE
+POSTHOOK: query: CREATE TABLE dest1(len INT)
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: default@dest1
+PREHOOK: query: FROM src INSERT OVERWRITE TABLE dest1 SELECT testlength(src.value)
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1
+POSTHOOK: query: FROM src INSERT OVERWRITE TABLE dest1 SELECT testlength(src.value)
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1
+PREHOOK: query: SELECT dest1.* FROM dest1
+PREHOOK: type: QUERY
+PREHOOK: Input: default@dest1
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/1188390737/10000
+POSTHOOK: query: SELECT dest1.* FROM dest1
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@dest1
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/1188390737/10000
 7
 6
 7
@@ -518,4 +539,7 @@
 7
 7
 6
-query: DROP TEMPORARY FUNCTION testlength
+PREHOOK: query: DROP TEMPORARY FUNCTION testlength
+PREHOOK: type: DROPFUNCTION
+POSTHOOK: query: DROP TEMPORARY FUNCTION testlength
+POSTHOOK: type: DROPFUNCTION

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_testlength2.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_testlength2.q.out?rev=819792&r1=819791&r2=819792&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_testlength2.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_testlength2.q.out Tue Sep 29 01:25:15 2009
@@ -1,5 +1,9 @@
-query: EXPLAIN
+PREHOOK: query: EXPLAIN
 CREATE TEMPORARY FUNCTION testlength2 AS 'org.apache.hadoop.hive.ql.udf.UDFTestLength2'
+PREHOOK: type: CREATEFUNCTION
+POSTHOOK: query: EXPLAIN
+CREATE TEMPORARY FUNCTION testlength2 AS 'org.apache.hadoop.hive.ql.udf.UDFTestLength2'
+POSTHOOK: type: CREATEFUNCTION
 ABSTRACT SYNTAX TREE:
   (TOK_CREATEFUNCTION testlength2 'org.apache.hadoop.hive.ql.udf.UDFTestLength2')
 
@@ -10,14 +14,31 @@
   Stage: Stage-0
 
 
-query: CREATE TEMPORARY FUNCTION testlength2 AS 'org.apache.hadoop.hive.ql.udf.UDFTestLength2'
-query: CREATE TABLE dest1(len INT)
-query: FROM src INSERT OVERWRITE TABLE dest1 SELECT testlength2(src.value)
-Input: default/src
-Output: default/dest1
-query: SELECT dest1.* FROM dest1
-Input: default/dest1
-Output: file:/data/users/njain/hive_commit1/hive_commit1/build/ql/tmp/744584966/10000
+PREHOOK: query: CREATE TEMPORARY FUNCTION testlength2 AS 'org.apache.hadoop.hive.ql.udf.UDFTestLength2'
+PREHOOK: type: CREATEFUNCTION
+POSTHOOK: query: CREATE TEMPORARY FUNCTION testlength2 AS 'org.apache.hadoop.hive.ql.udf.UDFTestLength2'
+POSTHOOK: type: CREATEFUNCTION
+PREHOOK: query: CREATE TABLE dest1(len INT)
+PREHOOK: type: CREATETABLE
+POSTHOOK: query: CREATE TABLE dest1(len INT)
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: default@dest1
+PREHOOK: query: FROM src INSERT OVERWRITE TABLE dest1 SELECT testlength2(src.value)
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1
+POSTHOOK: query: FROM src INSERT OVERWRITE TABLE dest1 SELECT testlength2(src.value)
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1
+PREHOOK: query: SELECT dest1.* FROM dest1
+PREHOOK: type: QUERY
+PREHOOK: Input: default@dest1
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/1473790346/10000
+POSTHOOK: query: SELECT dest1.* FROM dest1
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@dest1
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/1473790346/10000
 7
 6
 7
@@ -518,4 +539,7 @@
 7
 7
 6
-query: DROP TEMPORARY FUNCTION testlength2
+PREHOOK: query: DROP TEMPORARY FUNCTION testlength2
+PREHOOK: type: DROPFUNCTION
+POSTHOOK: query: DROP TEMPORARY FUNCTION testlength2
+POSTHOOK: type: DROPFUNCTION

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_unhex.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_unhex.q.out?rev=819792&r1=819791&r2=819792&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_unhex.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_unhex.q.out Tue Sep 29 01:25:15 2009
@@ -1,4 +1,4 @@
-query: -- Good inputs
+PREHOOK: query: -- Good inputs
 
 SELECT
   unhex('4D7953514C'),
@@ -7,15 +7,38 @@
   unhex('2D34'),
   unhex('')
 FROM src limit 1
-Input: default/src
-Output: file:/mnt/vol/devrs002.snc1/mkedia/hive_trunk/build/ql/tmp/1289795595/10000
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/791570897/10000
+POSTHOOK: query: -- Good inputs
+
+SELECT
+  unhex('4D7953514C'),
+  unhex('31323637'),
+  unhex('61'),
+  unhex('2D34'),
+  unhex('')
+FROM src limit 1
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/791570897/10000
 MySQL	1267	a	-4	
-query: -- Bad inputs
+PREHOOK: query: -- Bad inputs
+SELECT
+  unhex('MySQL'),
+  unhex('G123'),
+  unhex('\0')
+FROM src limit 1
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/1722929824/10000
+POSTHOOK: query: -- Bad inputs
 SELECT
   unhex('MySQL'),
   unhex('G123'),
   unhex('\0')
 FROM src limit 1
-Input: default/src
-Output: file:/mnt/vol/devrs002.snc1/mkedia/hive_trunk/build/ql/tmp/328234582/10000
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/1722929824/10000
 NULL	NULL	NULL

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_unix_timestamp.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_unix_timestamp.q.out?rev=819792&r1=819791&r2=819792&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_unix_timestamp.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_unix_timestamp.q.out Tue Sep 29 01:25:15 2009
@@ -1,28 +1,60 @@
-query: SELECT
+PREHOOK: query: SELECT
   '2009-03-20 11:30:01',
   unix_timestamp('2009-03-20 11:30:01')
 FROM src LIMIT 1
-Input: default/src
-Output: /data/users/athusoo/commits/hive_trunk_ws8/ql/../build/ql/tmp/1312227505/619820167.10000
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/490859379/10000
+POSTHOOK: query: SELECT
+  '2009-03-20 11:30:01',
+  unix_timestamp('2009-03-20 11:30:01')
+FROM src LIMIT 1
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/490859379/10000
 2009-03-20 11:30:01	1237573801
-query: SELECT
+PREHOOK: query: SELECT
+  '2009-03-20',
+  unix_timestamp('2009-03-20', 'yyyy-MM-dd')
+FROM src LIMIT 1
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/1674908517/10000
+POSTHOOK: query: SELECT
   '2009-03-20',
   unix_timestamp('2009-03-20', 'yyyy-MM-dd')
 FROM src LIMIT 1
-Input: default/src
-Output: /data/users/athusoo/commits/hive_trunk_ws8/ql/../build/ql/tmp/24449050/574490019.10000
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/1674908517/10000
 2009-03-20	1237532400
-query: SELECT
+PREHOOK: query: SELECT
   '2009 Mar 20 11:30:01 am',
   unix_timestamp('2009 Mar 20 11:30:01 am', 'yyyy MMM dd h:mm:ss a')
 FROM src LIMIT 1
-Input: default/src
-Output: /data/users/athusoo/commits/hive_trunk_ws8/ql/../build/ql/tmp/113858045/511496819.10000
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/265278879/10000
+POSTHOOK: query: SELECT
+  '2009 Mar 20 11:30:01 am',
+  unix_timestamp('2009 Mar 20 11:30:01 am', 'yyyy MMM dd h:mm:ss a')
+FROM src LIMIT 1
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/265278879/10000
 2009 Mar 20 11:30:01 am	1237573801
-query: SELECT
+PREHOOK: query: SELECT
+  'random_string',
+  unix_timestamp('random_string')
+FROM src LIMIT 1
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/568226360/10000
+POSTHOOK: query: SELECT
   'random_string',
   unix_timestamp('random_string')
 FROM src LIMIT 1
-Input: default/src
-Output: /data/users/athusoo/commits/hive_trunk_ws8/ql/../build/ql/tmp/7890380/263814004.10000
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/568226360/10000
 random_string	NULL

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_when.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_when.q.out?rev=819792&r1=819791&r2=819792&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_when.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/udf_when.q.out Tue Sep 29 01:25:15 2009
@@ -1,4 +1,4 @@
-query: EXPLAIN
+PREHOOK: query: EXPLAIN
 SELECT CASE
         WHEN 1=1 THEN 2
         WHEN 1=3 THEN 4
@@ -25,6 +25,35 @@
         WHEN 28=28 THEN NULL
        END
 FROM src LIMIT 1
+PREHOOK: type: QUERY
+POSTHOOK: query: EXPLAIN
+SELECT CASE
+        WHEN 1=1 THEN 2
+        WHEN 1=3 THEN 4
+        ELSE 5
+       END,
+       CASE
+        WHEN 6=7 THEN 8
+        ELSE 9
+       END,
+       CASE
+        WHEN 10=11 THEN 12
+        WHEN 13=13 THEN 14
+       END,
+       CASE
+        WHEN 15=16 THEN 17
+        WHEN 18=19 THEN 20
+       END,
+       CASE
+        WHEN 21=22 THEN NULL
+        WHEN 23=23 THEN 24
+       END,
+       CASE
+        WHEN 25=26 THEN 27
+        WHEN 28=28 THEN NULL
+       END
+FROM src LIMIT 1
+POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_TABREF src)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_FUNCTION WHEN (= 1 1) 2 (= 1 3) 4 5)) (TOK_SELEXPR (TOK_FUNCTION WHEN (= 6 7) 8 9)) (TOK_SELEXPR (TOK_FUNCTION WHEN (= 10 11) 12 (= 13 13) 14)) (TOK_SELEXPR (TOK_FUNCTION WHEN (= 15 16) 17 (= 18 19) 20)) (TOK_SELEXPR (TOK_FUNCTION WHEN (= 21 22) TOK_NULL (= 23 23) 24)) (TOK_SELEXPR (TOK_FUNCTION WHEN (= 25 26) 27 (= 28 28) TOK_NULL))) (TOK_LIMIT 1)))
 
@@ -67,7 +96,36 @@
       limit: 1
 
 
-query: SELECT CASE
+PREHOOK: query: SELECT CASE
+        WHEN 1=1 THEN 2
+        WHEN 1=3 THEN 4
+        ELSE 5
+       END,
+       CASE
+        WHEN 6=7 THEN 8
+        ELSE 9
+       END,
+       CASE
+        WHEN 10=11 THEN 12
+        WHEN 13=13 THEN 14
+       END,
+       CASE
+        WHEN 15=16 THEN 17
+        WHEN 18=19 THEN 20
+       END,
+       CASE
+        WHEN 21=22 THEN NULL
+        WHEN 23=23 THEN 24
+       END,
+       CASE
+        WHEN 25=26 THEN 27
+        WHEN 28=28 THEN NULL
+       END
+FROM src LIMIT 1
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/1103797531/10000
+POSTHOOK: query: SELECT CASE
         WHEN 1=1 THEN 2
         WHEN 1=3 THEN 4
         ELSE 5
@@ -93,6 +151,7 @@
         WHEN 28=28 THEN NULL
        END
 FROM src LIMIT 1
-Input: default/src
-Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/93135016/10000
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/1103797531/10000
 2	9	14	NULL	24	NULL

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/union.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/union.q.out?rev=819792&r1=819791&r2=819792&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/union.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/union.q.out Tue Sep 29 01:25:15 2009
@@ -1,4 +1,4 @@
-query: -- union case: both subqueries are map jobs on same input, followed by filesink
+PREHOOK: query: -- union case: both subqueries are map jobs on same input, followed by filesink
 
 EXPLAIN
 FROM (
@@ -7,6 +7,17 @@
   FROM src SELECT src.* WHERE src.key > 100
 ) 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
+FROM (
+  FROM src select src.key, src.value WHERE src.key < 100
+  UNION ALL
+  FROM src SELECT src.* WHERE src.key > 100
+) unioninput
+INSERT OVERWRITE DIRECTORY '../build/ql/test/data/warehouse/union.out' SELECT unioninput.*
+POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_SUBQUERY (TOK_UNION (TOK_QUERY (TOK_FROM (TOK_TABREF src)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL src) key)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL src) value))) (TOK_WHERE (< (. (TOK_TABLE_OR_COL src) key) 100)))) (TOK_QUERY (TOK_FROM (TOK_TABREF src)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_ALLCOLREF src))) (TOK_WHERE (> (. (TOK_TABLE_OR_COL src) key) 100))))) unioninput)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR '../build/ql/test/data/warehouse/union.out')) (TOK_SELECT (TOK_SELEXPR (TOK_ALLCOLREF unioninput)))))
 
@@ -90,10 +101,10 @@
           Move Operator
             files:
                 hdfs directory: true
-                destination: file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_2/build/ql/tmp/1824192644/10000
+                destination: file:/data/users/njain/hive5/hive5/build/ql/tmp/580876099/10000
           Map Reduce
             Alias -> Map Operator Tree:
-              file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_2/build/ql/tmp/24944303/10001 
+              file:/data/users/njain/hive5/hive5/build/ql/tmp/925373364/10001 
                   Reduce Output Operator
                     sort order: 
                     Map-reduce partition columns:
@@ -121,14 +132,24 @@
           destination: ../build/ql/test/data/warehouse/union.out
 
 
-query: FROM (
+PREHOOK: query: FROM (
+  FROM src select src.key, src.value WHERE src.key < 100
+  UNION ALL
+  FROM src SELECT src.* WHERE src.key > 100
+) unioninput
+INSERT OVERWRITE DIRECTORY '../build/ql/test/data/warehouse/union.out' SELECT unioninput.*
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: ../build/ql/test/data/warehouse/union.out
+POSTHOOK: query: FROM (
   FROM src select src.key, src.value WHERE src.key < 100
   UNION ALL
   FROM src SELECT src.* WHERE src.key > 100
 ) unioninput
 INSERT OVERWRITE DIRECTORY '../build/ql/test/data/warehouse/union.out' SELECT unioninput.*
-Input: default/src
-Output: ../build/ql/test/data/warehouse/union.out
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: ../build/ql/test/data/warehouse/union.out
 238val_238
 86val_86
 311val_311

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/union10.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/union10.q.out?rev=819792&r1=819791&r2=819792&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/union10.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/union10.q.out Tue Sep 29 01:25:15 2009
@@ -1,14 +1,32 @@
-query: -- union case: all subqueries are a map-reduce jobs, 3 way union, same input for all sub-queries, followed by filesink
+PREHOOK: query: -- union case: all subqueries are a map-reduce jobs, 3 way union, same input for all sub-queries, followed by filesink
 
 drop table tmptable
-query: create table tmptable(key string, value int)
-query: explain 
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: -- union case: all subqueries are a map-reduce jobs, 3 way union, same input for all sub-queries, followed by filesink
+
+drop table tmptable
+POSTHOOK: type: DROPTABLE
+PREHOOK: query: create table tmptable(key string, value int)
+PREHOOK: type: CREATETABLE
+POSTHOOK: query: create table tmptable(key string, value int)
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: default@tmptable
+PREHOOK: query: explain 
 insert overwrite table tmptable
   select unionsrc.key, unionsrc.value 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
+PREHOOK: type: QUERY
+POSTHOOK: query: explain 
+insert overwrite table tmptable
+  select unionsrc.key, unionsrc.value 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
+POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_SUBQUERY (TOK_UNION (TOK_UNION (TOK_QUERY (TOK_FROM (TOK_TABREF src s1)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR 'tst1' key) (TOK_SELEXPR (TOK_FUNCTION count 1) value)))) (TOK_QUERY (TOK_FROM (TOK_TABREF src s2)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR 'tst2' key) (TOK_SELEXPR (TOK_FUNCTION count 1) value))))) (TOK_QUERY (TOK_FROM (TOK_TABREF src s3)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR 'tst3' key) (TOK_SELEXPR (TOK_FUNCTION count 1) value))))) unionsrc)) (TOK_INSERT (TOK_DESTINATION (TOK_TAB tmptable)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL unionsrc) key)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL unionsrc) value)))))
 
@@ -68,7 +86,7 @@
   Stage: Stage-2
     Map Reduce
       Alias -> Map Operator Tree:
-        file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1115593242/10002 
+        file:/data/users/njain/hive5/hive5/build/ql/tmp/1143376812/10002 
           Union
             Select Operator
               expressions:
@@ -92,7 +110,7 @@
                       output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                       serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                       name: tmptable
-        file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1115593242/10004 
+        file:/data/users/njain/hive5/hive5/build/ql/tmp/1143376812/10004 
           Union
             Select Operator
               expressions:
@@ -116,7 +134,7 @@
                       output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                       serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                       name: tmptable
-        file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1115593242/10005 
+        file:/data/users/njain/hive5/hive5/build/ql/tmp/1143376812/10005 
           Union
             Select Operator
               expressions:
@@ -147,10 +165,10 @@
           Move Operator
             files:
                 hdfs directory: true
-                destination: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1365326225/10000
+                destination: file:/data/users/njain/hive5/hive5/build/ql/tmp/21983870/10000
           Map Reduce
             Alias -> Map Operator Tree:
-              file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1115593242/10003 
+              file:/data/users/njain/hive5/hive5/build/ql/tmp/1143376812/10003 
                   Reduce Output Operator
                     sort order: 
                     Map-reduce partition columns:
@@ -260,18 +278,37 @@
                   output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
 
 
-query: insert overwrite table tmptable
+PREHOOK: query: insert overwrite table tmptable
+  select unionsrc.key, unionsrc.value 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
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@tmptable
+POSTHOOK: query: insert overwrite table tmptable
   select unionsrc.key, unionsrc.value 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
-Input: default/src
-Output: default/tmptable
-query: select * from tmptable x sort by x.key
-Input: default/tmptable
-Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/994551833/10000
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@tmptable
+PREHOOK: query: select * from tmptable x sort by x.key
+PREHOOK: type: QUERY
+PREHOOK: Input: default@tmptable
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/1366944384/10000
+POSTHOOK: query: select * from tmptable x sort by x.key
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tmptable
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/1366944384/10000
 tst1	500
 tst2	500
 tst3	500
-query: drop table tmptable
+PREHOOK: query: drop table tmptable
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: drop table tmptable
+POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: default@tmptable

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/union11.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/union11.q.out?rev=819792&r1=819791&r2=819792&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/union11.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/union11.q.out Tue Sep 29 01:25:15 2009
@@ -1,4 +1,4 @@
-query: -- union case: all subqueries are a map-reduce jobs, 3 way union, same input for all sub-queries, followed by reducesink
+PREHOOK: query: -- union case: all subqueries are a map-reduce jobs, 3 way union, same input for all sub-queries, followed by reducesink
 
 explain 
   select unionsrc.key, count(1) FROM (select 'tst1' as key, count(1) as value from src s1
@@ -6,6 +6,16 @@
                                             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 
+  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
+POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_SUBQUERY (TOK_UNION (TOK_UNION (TOK_QUERY (TOK_FROM (TOK_TABREF src s1)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR 'tst1' key) (TOK_SELEXPR (TOK_FUNCTION count 1) value)))) (TOK_QUERY (TOK_FROM (TOK_TABREF src s2)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR 'tst2' key) (TOK_SELEXPR (TOK_FUNCTION count 1) value))))) (TOK_QUERY (TOK_FROM (TOK_TABREF src s3)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR 'tst3' key) (TOK_SELEXPR (TOK_FUNCTION count 1) value))))) unionsrc)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL unionsrc) key)) (TOK_SELEXPR (TOK_FUNCTION count 1))) (TOK_GROUPBY (. (TOK_TABLE_OR_COL unionsrc) key))))
 
@@ -60,7 +70,7 @@
   Stage: Stage-2
     Map Reduce
       Alias -> Map Operator Tree:
-        file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/204278214/10002 
+        file:/data/users/njain/hive5/hive5/build/ql/tmp/184424474/10002 
           Union
             Select Operator
               expressions:
@@ -87,7 +97,7 @@
                   value expressions:
                         expr: _col1
                         type: bigint
-        file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/204278214/10003 
+        file:/data/users/njain/hive5/hive5/build/ql/tmp/184424474/10003 
           Union
             Select Operator
               expressions:
@@ -114,7 +124,7 @@
                   value expressions:
                         expr: _col1
                         type: bigint
-        file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/204278214/10004 
+        file:/data/users/njain/hive5/hive5/build/ql/tmp/184424474/10004 
           Union
             Select Operator
               expressions:
@@ -245,13 +255,22 @@
       limit: -1
 
 
-query: select unionsrc.key, count(1) FROM (select 'tst1' as key, count(1) as value from src s1
+PREHOOK: query: 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
+PREHOOK: Input: default@src
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/506166067/10000
+POSTHOOK: query: 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
-Input: default/src
-Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/225927230/10000
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/506166067/10000
 tst1	1
 tst2	1
 tst3	1

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/union12.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/union12.q.out?rev=819792&r1=819791&r2=819792&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/union12.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/union12.q.out Tue Sep 29 01:25:15 2009
@@ -1,14 +1,32 @@
-query: -- union case: all subqueries are a map-reduce jobs, 3 way union, different inputs for all sub-queries, followed by filesink
+PREHOOK: query: -- union case: all subqueries are a map-reduce jobs, 3 way union, different inputs for all sub-queries, followed by filesink
 
 drop table tmptable
-query: create table tmptable(key string, value int)
-query: explain 
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: -- union case: all subqueries are a map-reduce jobs, 3 way union, different inputs for all sub-queries, followed by filesink
+
+drop table tmptable
+POSTHOOK: type: DROPTABLE
+PREHOOK: query: create table tmptable(key string, value int)
+PREHOOK: type: CREATETABLE
+POSTHOOK: query: create table tmptable(key string, value int)
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: default@tmptable
+PREHOOK: query: explain 
 insert overwrite table tmptable
   select unionsrc.key, unionsrc.value FROM (select 'tst1' as key, count(1) as value from src s1
                                         UNION  ALL  
                                             select 'tst2' as key, count(1) as value from src1 s2
                                         UNION ALL
                                             select 'tst3' as key, count(1) as value from srcbucket s3) unionsrc
+PREHOOK: type: QUERY
+POSTHOOK: query: explain 
+insert overwrite table tmptable
+  select unionsrc.key, unionsrc.value FROM (select 'tst1' as key, count(1) as value from src s1
+                                        UNION  ALL  
+                                            select 'tst2' as key, count(1) as value from src1 s2
+                                        UNION ALL
+                                            select 'tst3' as key, count(1) as value from srcbucket s3) unionsrc
+POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_SUBQUERY (TOK_UNION (TOK_UNION (TOK_QUERY (TOK_FROM (TOK_TABREF src s1)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR 'tst1' key) (TOK_SELEXPR (TOK_FUNCTION count 1) value)))) (TOK_QUERY (TOK_FROM (TOK_TABREF src1 s2)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR 'tst2' key) (TOK_SELEXPR (TOK_FUNCTION count 1) value))))) (TOK_QUERY (TOK_FROM (TOK_TABREF srcbucket s3)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR 'tst3' key) (TOK_SELEXPR (TOK_FUNCTION count 1) value))))) unionsrc)) (TOK_INSERT (TOK_DESTINATION (TOK_TAB tmptable)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL unionsrc) key)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL unionsrc) value)))))
 
@@ -68,7 +86,7 @@
   Stage: Stage-2
     Map Reduce
       Alias -> Map Operator Tree:
-        file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/317852044/10002 
+        file:/data/users/njain/hive5/hive5/build/ql/tmp/810798431/10002 
           Union
             Select Operator
               expressions:
@@ -92,7 +110,7 @@
                       output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                       serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                       name: tmptable
-        file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/317852044/10004 
+        file:/data/users/njain/hive5/hive5/build/ql/tmp/810798431/10004 
           Union
             Select Operator
               expressions:
@@ -116,7 +134,7 @@
                       output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                       serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                       name: tmptable
-        file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/317852044/10005 
+        file:/data/users/njain/hive5/hive5/build/ql/tmp/810798431/10005 
           Union
             Select Operator
               expressions:
@@ -147,10 +165,10 @@
           Move Operator
             files:
                 hdfs directory: true
-                destination: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/847490196/10000
+                destination: file:/data/users/njain/hive5/hive5/build/ql/tmp/246166891/10000
           Map Reduce
             Alias -> Map Operator Tree:
-              file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/317852044/10003 
+              file:/data/users/njain/hive5/hive5/build/ql/tmp/810798431/10003 
                   Reduce Output Operator
                     sort order: 
                     Map-reduce partition columns:
@@ -260,20 +278,41 @@
                   output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
 
 
-query: insert overwrite table tmptable
+PREHOOK: query: insert overwrite table tmptable
+  select unionsrc.key, unionsrc.value FROM (select 'tst1' as key, count(1) as value from src s1
+                                        UNION  ALL  
+                                            select 'tst2' as key, count(1) as value from src1 s2
+                                        UNION ALL
+                                            select 'tst3' as key, count(1) as value from srcbucket s3) unionsrc
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@src1
+PREHOOK: Input: default@srcbucket
+PREHOOK: Output: default@tmptable
+POSTHOOK: query: insert overwrite table tmptable
   select unionsrc.key, unionsrc.value FROM (select 'tst1' as key, count(1) as value from src s1
                                         UNION  ALL  
                                             select 'tst2' as key, count(1) as value from src1 s2
                                         UNION ALL
                                             select 'tst3' as key, count(1) as value from srcbucket s3) unionsrc
-Input: default/src
-Input: default/src1
-Input: default/srcbucket
-Output: default/tmptable
-query: select * from tmptable x sort by x.key
-Input: default/tmptable
-Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/983094247/10000
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@src1
+POSTHOOK: Input: default@srcbucket
+POSTHOOK: Output: default@tmptable
+PREHOOK: query: select * from tmptable x sort by x.key
+PREHOOK: type: QUERY
+PREHOOK: Input: default@tmptable
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/1490799066/10000
+POSTHOOK: query: select * from tmptable x sort by x.key
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tmptable
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/1490799066/10000
 tst1	500
 tst2	25
 tst3	1000
-query: drop table tmptable
+PREHOOK: query: drop table tmptable
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: drop table tmptable
+POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: default@tmptable

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/union13.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/union13.q.out?rev=819792&r1=819791&r2=819792&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/union13.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/union13.q.out Tue Sep 29 01:25:15 2009
@@ -1,8 +1,15 @@
-query: -- union case: both subqueries are a map-only jobs, same input, followed by filesink
+PREHOOK: query: -- union case: both subqueries are a map-only jobs, same input, followed by filesink
 
 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 
+  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
 ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_SUBQUERY (TOK_UNION (TOK_QUERY (TOK_FROM (TOK_TABREF src s1)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL s1) key) key) (TOK_SELEXPR (. (TOK_TABLE_OR_COL s1) value) value)))) (TOK_QUERY (TOK_FROM (TOK_TABREF src s2)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL s2) key) key) (TOK_SELEXPR (. (TOK_TABLE_OR_COL s2) value) value))))) unionsrc)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL unionsrc) key)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL unionsrc) value)))))
 
@@ -68,10 +75,16 @@
       limit: -1
 
 
-query: select unionsrc.key, unionsrc.value FROM (select s1.key as key, s1.value as value from src s1 UNION  ALL  
+PREHOOK: query: 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
+PREHOOK: Input: default@src
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/1376179139/10000
+POSTHOOK: query: 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
-Input: default/src
-Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/49034053/10000
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/1376179139/10000
 238	val_238
 238	val_238
 86	val_86

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/union14.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/union14.q.out?rev=819792&r1=819791&r2=819792&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/union14.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/union14.q.out Tue Sep 29 01:25:15 2009
@@ -1,10 +1,19 @@
-query: -- union case: 1 subquery is a map-reduce job, different inputs for sub-queries, followed by reducesink
+PREHOOK: query: -- union case: 1 subquery is a map-reduce job, different inputs for sub-queries, followed by reducesink
 
 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 
+  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
+POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_SUBQUERY (TOK_UNION (TOK_QUERY (TOK_FROM (TOK_TABREF src1 s2)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL s2) key) key) (TOK_SELEXPR (. (TOK_TABLE_OR_COL s2) value) value)))) (TOK_QUERY (TOK_FROM (TOK_TABREF src s1)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR 'tst1' key) (TOK_SELEXPR (TOK_FUNCTION TOK_STRING (TOK_FUNCTION count 1)) value))))) unionsrc)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL unionsrc) key)) (TOK_SELEXPR (TOK_FUNCTION count 1))) (TOK_GROUPBY (. (TOK_TABLE_OR_COL unionsrc) key))))
 
@@ -39,7 +48,7 @@
   Stage: Stage-2
     Map Reduce
       Alias -> Map Operator Tree:
-        file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1650267347/10002 
+        file:/data/users/njain/hive5/hive5/build/ql/tmp/29089879/10002 
           Union
             Select Operator
               expressions:
@@ -66,7 +75,7 @@
                   value expressions:
                         expr: _col1
                         type: bigint
-        file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1650267347/10003 
+        file:/data/users/njain/hive5/hive5/build/ql/tmp/29089879/10003 
           Union
             Select Operator
               expressions:
@@ -159,13 +168,22 @@
       limit: -1
 
 
-query: select unionsrc.key, count(1) FROM (select s2.key as key, s2.value as value from src1 s2
+PREHOOK: query: 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
+PREHOOK: Input: default@src1
+PREHOOK: Input: default@src
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/1661700727/10000
+POSTHOOK: query: 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
-Input: default/src1
-Input: default/src
-Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/368749311/10000
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src1
+POSTHOOK: Input: default@src
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/1661700727/10000
 	10
 128	1
 146	1