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 [8/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/apac...

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/input18.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/input18.q.out?rev=819792&r1=819791&r2=819792&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/input18.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/input18.q.out Tue Sep 29 01:25:15 2009
@@ -1,5 +1,9 @@
-query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE
-query: EXPLAIN
+PREHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE
+PREHOOK: type: CREATETABLE
+POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: default@dest1
+PREHOOK: query: EXPLAIN
 FROM (
   FROM src
   SELECT TRANSFORM(src.key, src.value, 1+2, 3+4)
@@ -7,6 +11,16 @@
   CLUSTER BY key
 ) tmap
 INSERT OVERWRITE TABLE dest1 SELECT tmap.key, regexp_replace(tmap.value,'\t','+') WHERE tmap.key < 100
+PREHOOK: type: QUERY
+POSTHOOK: query: EXPLAIN
+FROM (
+  FROM src
+  SELECT TRANSFORM(src.key, src.value, 1+2, 3+4)
+         USING '/bin/cat'
+  CLUSTER BY key
+) tmap
+INSERT OVERWRITE TABLE dest1 SELECT tmap.key, regexp_replace(tmap.value,'\t','+') WHERE tmap.key < 100
+POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_TABREF src)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TRANSFORM (TOK_EXPLIST (. (TOK_TABLE_OR_COL src) key) (. (TOK_TABLE_OR_COL src) value) (+ 1 2) (+ 3 4)) TOK_SERDE TOK_RECORDWRITER '/bin/cat' TOK_SERDE TOK_RECORDREADER))) (TOK_CLUSTERBY (TOK_TABLE_OR_COL key)))) tmap)) (TOK_INSERT (TOK_DESTINATION (TOK_TAB dest1)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL tmap) key)) (TOK_SELEXPR (TOK_FUNCTION regexp_replace (. (TOK_TABLE_OR_COL tmap) value) '\t' '+'))) (TOK_WHERE (< (. (TOK_TABLE_OR_COL tmap) key) 100))))
 
@@ -91,18 +105,34 @@
               name: dest1
 
 
-query: FROM (
+PREHOOK: query: FROM (
+  FROM src
+  SELECT TRANSFORM(src.key, src.value, 1+2, 3+4)
+         USING '/bin/cat'
+  CLUSTER BY key
+) tmap
+INSERT OVERWRITE TABLE dest1 SELECT tmap.key, regexp_replace(tmap.value,'\t','+') WHERE tmap.key < 100
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1
+POSTHOOK: query: FROM (
   FROM src
   SELECT TRANSFORM(src.key, src.value, 1+2, 3+4)
          USING '/bin/cat'
   CLUSTER BY key
 ) tmap
 INSERT OVERWRITE TABLE dest1 SELECT tmap.key, regexp_replace(tmap.value,'\t','+') WHERE tmap.key < 100
-Input: default/src
-Output: default/dest1
-query: SELECT dest1.* FROM dest1
-Input: default/dest1
-Output: file:/data/users/njain/hive3/hive3/build/ql/tmp/1548205579/10000
+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/1911474046/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/1911474046/10000
 0	val_0+3+7
 0	val_0+3+7
 0	val_0+3+7

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/input19.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/input19.q.out?rev=819792&r1=819791&r2=819792&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/input19.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/input19.q.out Tue Sep 29 01:25:15 2009
@@ -1,8 +1,28 @@
-query: drop table apachelog
-query: create table apachelog(ipaddress STRING,identd STRING,user STRING,finishtime STRING,requestline string,returncode INT,size INT) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.dynamic_type.DynamicSerDe' WITH SERDEPROPERTIES (  'serialization.format'= 'org.apache.hadoop.hive.serde2.thrift.TCTLSeparatedProtocol',  'quote.delim'= '("|\\[|\\])',  'field.delim'=' ',  'serialization.null.format'='-'  ) STORED AS TEXTFILE
-query: LOAD DATA LOCAL INPATH '../data/files/apache.access.log' INTO TABLE apachelog
-query: SELECT a.* FROM apachelog a
-Input: default/apachelog
-Output: /data/users/athusoo/commits/hive_trunk_ws8/ql/../build/ql/tmp/102182399/358987266.10000
+PREHOOK: query: drop table apachelog
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: drop table apachelog
+POSTHOOK: type: DROPTABLE
+PREHOOK: query: create table apachelog(ipaddress STRING,identd STRING,user STRING,finishtime STRING,requestline string,returncode INT,size INT) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.dynamic_type.DynamicSerDe' WITH SERDEPROPERTIES (  'serialization.format'= 'org.apache.hadoop.hive.serde2.thrift.TCTLSeparatedProtocol',  'quote.delim'= '("|\\[|\\])',  'field.delim'=' ',  'serialization.null.format'='-'  ) STORED AS TEXTFILE
+PREHOOK: type: CREATETABLE
+POSTHOOK: query: create table apachelog(ipaddress STRING,identd STRING,user STRING,finishtime STRING,requestline string,returncode INT,size INT) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.dynamic_type.DynamicSerDe' WITH SERDEPROPERTIES (  'serialization.format'= 'org.apache.hadoop.hive.serde2.thrift.TCTLSeparatedProtocol',  'quote.delim'= '("|\\[|\\])',  'field.delim'=' ',  'serialization.null.format'='-'  ) STORED AS TEXTFILE
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: default@apachelog
+PREHOOK: query: LOAD DATA LOCAL INPATH '../data/files/apache.access.log' INTO TABLE apachelog
+PREHOOK: type: LOAD
+POSTHOOK: query: LOAD DATA LOCAL INPATH '../data/files/apache.access.log' INTO TABLE apachelog
+POSTHOOK: type: LOAD
+POSTHOOK: Output: default@apachelog
+PREHOOK: query: SELECT a.* FROM apachelog a
+PREHOOK: type: QUERY
+PREHOOK: Input: default@apachelog
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/.ptest_3/build/ql/tmp/1231763776/10000
+POSTHOOK: query: SELECT a.* FROM apachelog a
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@apachelog
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/.ptest_3/build/ql/tmp/1231763776/10000
 127.0.0.1	NULL	frank	10/Oct/2000:13:55:36 -0700	GET /apache_pb.gif HTTP/1.0	200	2326
-query: drop table apachelog
+PREHOOK: query: drop table apachelog
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: drop table apachelog
+POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: default@apachelog

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/input1_limit.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/input1_limit.q.out?rev=819792&r1=819791&r2=819792&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/input1_limit.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/input1_limit.q.out Tue Sep 29 01:25:15 2009
@@ -1,9 +1,23 @@
-query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE
-query: CREATE TABLE dest2(key INT, value STRING) STORED AS TEXTFILE
-query: EXPLAIN
+PREHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE
+PREHOOK: type: CREATETABLE
+POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: default@dest1
+PREHOOK: query: CREATE TABLE dest2(key INT, value STRING) STORED AS TEXTFILE
+PREHOOK: type: CREATETABLE
+POSTHOOK: query: CREATE TABLE dest2(key INT, value STRING) STORED AS TEXTFILE
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: default@dest2
+PREHOOK: query: EXPLAIN
 FROM src
 INSERT OVERWRITE TABLE dest1 SELECT src.key, src.value WHERE src.key < 100 LIMIT 10
 INSERT OVERWRITE TABLE dest2 SELECT src.key, src.value WHERE src.key < 100 LIMIT 5
+PREHOOK: type: QUERY
+POSTHOOK: query: EXPLAIN
+FROM src
+INSERT OVERWRITE TABLE dest1 SELECT src.key, src.value WHERE src.key < 100 LIMIT 10
+INSERT OVERWRITE TABLE dest2 SELECT src.key, src.value WHERE src.key < 100 LIMIT 5
+POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_TABREF src)) (TOK_INSERT (TOK_DESTINATION (TOK_TAB dest1)) (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_LIMIT 10)) (TOK_INSERT (TOK_DESTINATION (TOK_TAB dest2)) (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_LIMIT 5)))
 
@@ -90,7 +104,7 @@
   Stage: Stage-3
     Map Reduce
       Alias -> Map Operator Tree:
-        file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_0/build/ql/tmp/1991354827/10004 
+        file:/data/users/njain/hive5/hive5/build/ql/tmp/1197694849/10004 
             Reduce Output Operator
               sort order: 
               tag: -1
@@ -129,15 +143,28 @@
               name: dest2
 
 
-query: FROM src
+PREHOOK: query: FROM src
+INSERT OVERWRITE TABLE dest1 SELECT src.key, src.value WHERE src.key < 100 LIMIT 10
+INSERT OVERWRITE TABLE dest2 SELECT src.key, src.value WHERE src.key < 100 LIMIT 5
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1
+PREHOOK: Output: default@dest2
+POSTHOOK: query: FROM src
 INSERT OVERWRITE TABLE dest1 SELECT src.key, src.value WHERE src.key < 100 LIMIT 10
 INSERT OVERWRITE TABLE dest2 SELECT src.key, src.value WHERE src.key < 100 LIMIT 5
-Input: default/src
-Output: default/dest1
-Output: default/dest2
-query: SELECT dest1.* FROM dest1
-Input: default/dest1
-Output: file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_0/build/ql/tmp/1070027433/10000
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1
+POSTHOOK: Output: default@dest2
+PREHOOK: query: SELECT dest1.* FROM dest1
+PREHOOK: type: QUERY
+PREHOOK: Input: default@dest1
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/1527068792/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/1527068792/10000
 86	val_86
 27	val_27
 98	val_98
@@ -148,13 +175,26 @@
 17	val_17
 0	val_0
 57	val_57
-query: SELECT dest2.* FROM dest2
-Input: default/dest2
-Output: file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_0/build/ql/tmp/1883602206/10000
+PREHOOK: query: SELECT dest2.* FROM dest2
+PREHOOK: type: QUERY
+PREHOOK: Input: default@dest2
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/651013402/10000
+POSTHOOK: query: SELECT dest2.* FROM dest2
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@dest2
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/651013402/10000
 86	val_86
 27	val_27
 98	val_98
 66	val_66
 37	val_37
-query: DROP TABLE dest1
-query: DROP TABLE dest2
+PREHOOK: query: DROP TABLE dest1
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: DROP TABLE dest1
+POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: default@dest1
+PREHOOK: query: DROP TABLE dest2
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: DROP TABLE dest2
+POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: default@dest2

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/input2.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/input2.q.out?rev=819792&r1=819791&r2=819792&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/input2.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/input2.q.out Tue Sep 29 01:25:15 2009
@@ -1,15 +1,38 @@
-query: DROP TABLE TEST2a
-query: DROP TABLE TEST2b
-query: CREATE TABLE TEST2a(A INT, B DOUBLE) STORED AS TEXTFILE
-query: DESCRIBE TEST2a
+PREHOOK: query: DROP TABLE TEST2a
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: DROP TABLE TEST2a
+POSTHOOK: type: DROPTABLE
+PREHOOK: query: DROP TABLE TEST2b
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: DROP TABLE TEST2b
+POSTHOOK: type: DROPTABLE
+PREHOOK: query: CREATE TABLE TEST2a(A INT, B DOUBLE) STORED AS TEXTFILE
+PREHOOK: type: CREATETABLE
+POSTHOOK: query: CREATE TABLE TEST2a(A INT, B DOUBLE) STORED AS TEXTFILE
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: default@TEST2a
+PREHOOK: query: DESCRIBE TEST2a
+PREHOOK: type: DESCTABLE
+POSTHOOK: query: DESCRIBE TEST2a
+POSTHOOK: type: DESCTABLE
 a	int	
 b	double	
-query: CREATE TABLE TEST2b(A ARRAY<INT>, B DOUBLE, C MAP<DOUBLE, INT>) STORED AS TEXTFILE
-query: DESCRIBE TEST2b
+PREHOOK: query: CREATE TABLE TEST2b(A ARRAY<INT>, B DOUBLE, C MAP<DOUBLE, INT>) STORED AS TEXTFILE
+PREHOOK: type: CREATETABLE
+POSTHOOK: query: CREATE TABLE TEST2b(A ARRAY<INT>, B DOUBLE, C MAP<DOUBLE, INT>) STORED AS TEXTFILE
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: default@TEST2b
+PREHOOK: query: DESCRIBE TEST2b
+PREHOOK: type: DESCTABLE
+POSTHOOK: query: DESCRIBE TEST2b
+POSTHOOK: type: DESCTABLE
 a	array<int>	
 b	double	
 c	map<double,int>	
-query: SHOW TABLES
+PREHOOK: query: SHOW TABLES
+PREHOOK: type: SHOWTABLES
+POSTHOOK: query: SHOW TABLES
+POSTHOOK: type: SHOWTABLES
 src
 src1
 src_json
@@ -19,8 +42,15 @@
 srcpart
 test2a
 test2b
-query: DROP TABLE TEST2a
-query: SHOW TABLES
+PREHOOK: query: DROP TABLE TEST2a
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: DROP TABLE TEST2a
+POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: default@test2a
+PREHOOK: query: SHOW TABLES
+PREHOOK: type: SHOWTABLES
+POSTHOOK: query: SHOW TABLES
+POSTHOOK: type: SHOWTABLES
 src
 src1
 src_json
@@ -29,9 +59,17 @@
 srcbucket
 srcpart
 test2b
-query: DROP TABLE TEST2b
-query: EXPLAIN
+PREHOOK: query: DROP TABLE TEST2b
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: DROP TABLE TEST2b
+POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: default@test2b
+PREHOOK: query: EXPLAIN
 SHOW TABLES
+PREHOOK: type: SHOWTABLES
+POSTHOOK: query: EXPLAIN
+SHOW TABLES
+POSTHOOK: type: SHOWTABLES
 ABSTRACT SYNTAX TREE:
   TOK_SHOWTABLES
 
@@ -49,5 +87,11 @@
       limit: -1
 
 
-query: DROP TABLE TEST2a
-query: DROP TABLE TEST2b
+PREHOOK: query: DROP TABLE TEST2a
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: DROP TABLE TEST2a
+POSTHOOK: type: DROPTABLE
+PREHOOK: query: DROP TABLE TEST2b
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: DROP TABLE TEST2b
+POSTHOOK: type: DROPTABLE

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/input20.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/input20.q.out?rev=819792&r1=819791&r2=819792&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/input20.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/input20.q.out Tue Sep 29 01:25:15 2009
@@ -1,5 +1,9 @@
-query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE
-query: EXPLAIN
+PREHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE
+PREHOOK: type: CREATETABLE
+POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: default@dest1
+PREHOOK: query: EXPLAIN
 FROM (
   FROM src
   MAP src.key, src.key 
@@ -11,6 +15,20 @@
 REDUCE tmap.key, tmap.value
 USING '../data/scripts/input20_script'
 AS key, value
+PREHOOK: type: QUERY
+POSTHOOK: query: EXPLAIN
+FROM (
+  FROM src
+  MAP src.key, src.key 
+  USING 'cat'
+  DISTRIBUTE BY key
+  SORT BY key, value
+) tmap
+INSERT OVERWRITE TABLE dest1
+REDUCE tmap.key, tmap.value
+USING '../data/scripts/input20_script'
+AS key, value
+POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_TABREF src)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TRANSFORM (TOK_EXPLIST (. (TOK_TABLE_OR_COL src) key) (. (TOK_TABLE_OR_COL src) key)) TOK_SERDE TOK_RECORDWRITER 'cat' TOK_SERDE TOK_RECORDREADER))) (TOK_DISTRIBUTEBY (TOK_TABLE_OR_COL key)) (TOK_SORTBY (TOK_TABSORTCOLNAMEASC (TOK_TABLE_OR_COL key)) (TOK_TABSORTCOLNAMEASC (TOK_TABLE_OR_COL value))))) tmap)) (TOK_INSERT (TOK_DESTINATION (TOK_TAB dest1)) (TOK_SELECT (TOK_SELEXPR (TOK_TRANSFORM (TOK_EXPLIST (. (TOK_TABLE_OR_COL tmap) key) (. (TOK_TABLE_OR_COL tmap) value)) TOK_SERDE TOK_RECORDWRITER '../data/scripts/input20_script' TOK_SERDE TOK_RECORDREADER (TOK_ALIASLIST key value))))))
 
@@ -94,7 +112,21 @@
               name: dest1
 
 
-query: FROM (
+PREHOOK: query: FROM (
+  FROM src
+  MAP src.key, src.key
+  USING 'cat' 
+  DISTRIBUTE BY key
+  SORT BY key, value
+) tmap
+INSERT OVERWRITE TABLE dest1
+REDUCE tmap.key, tmap.value
+USING '../data/scripts/input20_script'
+AS key, value
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1
+POSTHOOK: query: FROM (
   FROM src
   MAP src.key, src.key
   USING 'cat' 
@@ -105,11 +137,17 @@
 REDUCE tmap.key, tmap.value
 USING '../data/scripts/input20_script'
 AS key, value
-Input: default/src
-Output: default/dest1
-query: SELECT * FROM dest1 SORT BY key, value
-Input: default/dest1
-Output: file:/data/users/njain/hive3/hive3/build/ql/tmp/635279294/10000
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1
+PREHOOK: query: SELECT * FROM dest1 SORT BY key, value
+PREHOOK: type: QUERY
+PREHOOK: Input: default@dest1
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/1617315543/10000
+POSTHOOK: query: SELECT * FROM dest1 SORT BY key, value
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@dest1
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/1617315543/10000
 1	105_105
 1	10_10
 1	111_111

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/input21.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/input21.q.out?rev=819792&r1=819791&r2=819792&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/input21.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/input21.q.out Tue Sep 29 01:25:15 2009
@@ -1,7 +1,21 @@
-query: DROP TABLE src_null
-query: CREATE TABLE src_null(a STRING, b STRING, c STRING, d STRING) STORED AS TEXTFILE
-query: LOAD DATA LOCAL INPATH '../data/files/null.txt' INTO TABLE src_null
-query: EXPLAIN SELECT * FROM src_null DISTRIBUTE BY c SORT BY d
+PREHOOK: query: DROP TABLE src_null
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: DROP TABLE src_null
+POSTHOOK: type: DROPTABLE
+PREHOOK: query: CREATE TABLE src_null(a STRING, b STRING, c STRING, d STRING) STORED AS TEXTFILE
+PREHOOK: type: CREATETABLE
+POSTHOOK: query: CREATE TABLE src_null(a STRING, b STRING, c STRING, d STRING) STORED AS TEXTFILE
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: default@src_null
+PREHOOK: query: LOAD DATA LOCAL INPATH '../data/files/null.txt' INTO TABLE src_null
+PREHOOK: type: LOAD
+POSTHOOK: query: LOAD DATA LOCAL INPATH '../data/files/null.txt' INTO TABLE src_null
+POSTHOOK: type: LOAD
+POSTHOOK: Output: default@src_null
+PREHOOK: query: EXPLAIN SELECT * FROM src_null DISTRIBUTE BY c SORT BY d
+PREHOOK: type: QUERY
+POSTHOOK: query: EXPLAIN SELECT * FROM src_null DISTRIBUTE BY c SORT BY d
+POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_TABREF src_null)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR TOK_ALLCOLREF)) (TOK_DISTRIBUTEBY (TOK_TABLE_OR_COL c)) (TOK_SORTBY (TOK_TABSORTCOLNAMEASC (TOK_TABLE_OR_COL d)))))
 
@@ -59,9 +73,14 @@
       limit: -1
 
 
-query: SELECT * FROM src_null DISTRIBUTE BY c SORT BY d
-Input: default/src_null
-Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/497061078/10000
+PREHOOK: query: SELECT * FROM src_null DISTRIBUTE BY c SORT BY d
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src_null
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/944884170/10000
+POSTHOOK: query: SELECT * FROM src_null DISTRIBUTE BY c SORT BY d
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src_null
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/944884170/10000
 1.0	1	same	0
 1.0	1	same	1
 1.0	1	same	2
@@ -72,4 +91,8 @@
 1.0	NULL	same	7
 1.0	1	same	8
 1.0	1	same	9
-query: DROP TABLE src_null
+PREHOOK: query: DROP TABLE src_null
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: DROP TABLE src_null
+POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: default@src_null

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/input22.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/input22.q.out?rev=819792&r1=819791&r2=819792&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/input22.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/input22.q.out Tue Sep 29 01:25:15 2009
@@ -1,10 +1,25 @@
-query: CREATE TABLE INPUT4(KEY STRING, VALUE STRING) STORED AS TEXTFILE
-query: LOAD DATA LOCAL INPATH '../data/files/kv1.txt' INTO TABLE INPUT4
-query: EXPLAIN
+PREHOOK: query: CREATE TABLE INPUT4(KEY STRING, VALUE STRING) STORED AS TEXTFILE
+PREHOOK: type: CREATETABLE
+POSTHOOK: query: CREATE TABLE INPUT4(KEY STRING, VALUE STRING) STORED AS TEXTFILE
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: default@INPUT4
+PREHOOK: query: LOAD DATA LOCAL INPATH '../data/files/kv1.txt' INTO TABLE INPUT4
+PREHOOK: type: LOAD
+POSTHOOK: query: LOAD DATA LOCAL INPATH '../data/files/kv1.txt' INTO TABLE INPUT4
+POSTHOOK: type: LOAD
+POSTHOOK: Output: default@input4
+PREHOOK: query: EXPLAIN
 SELECT a.KEY2
 FROM (SELECT INPUT4.*, INPUT4.KEY as KEY2
       FROM INPUT4) a
 ORDER BY KEY2 LIMIT 10
+PREHOOK: type: QUERY
+POSTHOOK: query: EXPLAIN
+SELECT a.KEY2
+FROM (SELECT INPUT4.*, INPUT4.KEY as KEY2
+      FROM INPUT4) a
+ORDER BY KEY2 LIMIT 10
+POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_TABREF INPUT4)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_ALLCOLREF INPUT4)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL INPUT4) KEY) KEY2)))) a)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL a) KEY2))) (TOK_ORDERBY (TOK_TABSORTCOLNAMEASC (TOK_TABLE_OR_COL KEY2))) (TOK_LIMIT 10)))
 
@@ -53,12 +68,20 @@
       limit: 10
 
 
-query: SELECT a.KEY2
+PREHOOK: query: SELECT a.KEY2
+FROM (SELECT INPUT4.*, INPUT4.KEY as KEY2
+      FROM INPUT4) a
+ORDER BY KEY2 LIMIT 10
+PREHOOK: type: QUERY
+PREHOOK: Input: default@input4
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/569155063/10000
+POSTHOOK: query: SELECT a.KEY2
 FROM (SELECT INPUT4.*, INPUT4.KEY as KEY2
       FROM INPUT4) a
 ORDER BY KEY2 LIMIT 10
-Input: default/input4
-Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1382133902/10000
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@input4
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/569155063/10000
 0
 0
 0
@@ -69,4 +92,8 @@
 103
 104
 104
-query: DROP TABLE INPUT4
+PREHOOK: query: DROP TABLE INPUT4
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: DROP TABLE INPUT4
+POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: default@input4

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/input23.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/input23.q.out?rev=819792&r1=819791&r2=819792&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/input23.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/input23.q.out Tue Sep 29 01:25:15 2009
@@ -1,5 +1,9 @@
-query: explain extended
+PREHOOK: query: explain extended
  select * from srcpart a join srcpart b where a.ds = '2008-04-08' and a.hr = '11' and b.ds = '2008-04-08' and b.hr = '14' limit 5
+PREHOOK: type: QUERY
+POSTHOOK: query: explain extended
+ select * from srcpart a join srcpart b where a.ds = '2008-04-08' and a.hr = '11' and b.ds = '2008-04-08' and b.hr = '14' limit 5
+POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_JOIN (TOK_TABREF srcpart a) (TOK_TABREF srcpart b))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR TOK_ALLCOLREF)) (TOK_WHERE (and (and (and (= (. (TOK_TABLE_OR_COL a) ds) '2008-04-08') (= (. (TOK_TABLE_OR_COL a) hr) '11')) (= (. (TOK_TABLE_OR_COL b) ds) '2008-04-08')) (= (. (TOK_TABLE_OR_COL b) hr) '14'))) (TOK_LIMIT 5)))
 
@@ -53,9 +57,9 @@
                       type: string
       Needs Tagging: true
       Path -> Alias:
-        file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 
+        file:/data/users/njain/hive5/hive5/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 [a]
       Path -> Partition:
-        file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 
+        file:/data/users/njain/hive5/hive5/build/ql/test/data/warehouse/srcpart/ds=2008-04-08/hr=11 
           Partition
             partition values:
               ds 2008-04-08
@@ -74,7 +78,7 @@
                 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                 file.inputformat org.apache.hadoop.mapred.TextInputFormat
                 file.outputformat org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                location file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/test/data/warehouse/srcpart
+                location file:/data/users/njain/hive5/hive5/build/ql/test/data/warehouse/srcpart
               serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
               name: srcpart
       Reduce Operator Tree:
@@ -113,7 +117,7 @@
                 File Output Operator
                   compressed: false
                   GlobalTableId: 0
-                  directory: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1962615553/10001
+                  directory: file:/data/users/njain/hive5/hive5/build/ql/tmp/2142286893/10001
                   table:
                       input format: org.apache.hadoop.mapred.TextInputFormat
                       output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -127,6 +131,11 @@
       limit: 5
 
 
-query: select * from srcpart a join srcpart b where a.ds = '2008-04-08' and a.hr = '11' and b.ds = '2008-04-08' and b.hr = '14' limit 5
-Input: default/srcpart/ds=2008-04-08/hr=11
-Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/107545677/10000
+PREHOOK: query: select * from srcpart a join srcpart b where a.ds = '2008-04-08' and a.hr = '11' and b.ds = '2008-04-08' and b.hr = '14' limit 5
+PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/53416358/10000
+POSTHOOK: query: select * from srcpart a join srcpart b where a.ds = '2008-04-08' and a.hr = '11' and b.ds = '2008-04-08' and b.hr = '14' limit 5
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/53416358/10000

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/input24.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/input24.q.out?rev=819792&r1=819791&r2=819792&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/input24.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/input24.q.out Tue Sep 29 01:25:15 2009
@@ -1,8 +1,23 @@
-query: drop table tst
-query: create table tst(a int, b int) partitioned by (d string)
-query: alter table tst add partition (d='2009-01-01')
-query: explain
+PREHOOK: query: drop table tst
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: drop table tst
+POSTHOOK: type: DROPTABLE
+PREHOOK: query: create table tst(a int, b int) partitioned by (d string)
+PREHOOK: type: CREATETABLE
+POSTHOOK: query: create table tst(a int, b int) partitioned by (d string)
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: default@tst
+PREHOOK: query: alter table tst add partition (d='2009-01-01')
+PREHOOK: type: ALTERTABLE_ADDPARTS
+POSTHOOK: query: alter table tst add partition (d='2009-01-01')
+POSTHOOK: type: ALTERTABLE_ADDPARTS
+POSTHOOK: Output: default@tst@d=2009-01-01
+PREHOOK: query: explain
 select count(1) from tst x where x.d='2009-01-01'
+PREHOOK: type: QUERY
+POSTHOOK: query: explain
+select count(1) from tst x where x.d='2009-01-01'
+POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_TABREF tst x)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_FUNCTION count 1))) (TOK_WHERE (= (. (TOK_TABLE_OR_COL x) d) '2009-01-01'))))
 
@@ -60,8 +75,17 @@
       limit: -1
 
 
-query: select count(1) from tst x where x.d='2009-01-01'
-Input: default/tst/d=2009-01-01
-Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1878605126/10000
+PREHOOK: query: select count(1) from tst x where x.d='2009-01-01'
+PREHOOK: type: QUERY
+PREHOOK: Input: default@tst@d=2009-01-01
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/1710334544/10000
+POSTHOOK: query: select count(1) from tst x where x.d='2009-01-01'
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tst@d=2009-01-01
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/1710334544/10000
 0
-query: drop table tst
+PREHOOK: query: drop table tst
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: drop table tst
+POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: default@tst

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/input25.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/input25.q.out?rev=819792&r1=819791&r2=819792&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/input25.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/input25.q.out Tue Sep 29 01:25:15 2009
@@ -1,13 +1,36 @@
-query: drop table tst
-query: create table tst(a int, b int) partitioned by (d string)
-query: alter table tst add partition (d='2009-01-01')
-query: alter table tst add partition (d='2009-02-02')
-query: explain
+PREHOOK: query: drop table tst
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: drop table tst
+POSTHOOK: type: DROPTABLE
+PREHOOK: query: create table tst(a int, b int) partitioned by (d string)
+PREHOOK: type: CREATETABLE
+POSTHOOK: query: create table tst(a int, b int) partitioned by (d string)
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: default@tst
+PREHOOK: query: alter table tst add partition (d='2009-01-01')
+PREHOOK: type: ALTERTABLE_ADDPARTS
+POSTHOOK: query: alter table tst add partition (d='2009-01-01')
+POSTHOOK: type: ALTERTABLE_ADDPARTS
+POSTHOOK: Output: default@tst@d=2009-01-01
+PREHOOK: query: alter table tst add partition (d='2009-02-02')
+PREHOOK: type: ALTERTABLE_ADDPARTS
+POSTHOOK: query: alter table tst add partition (d='2009-02-02')
+POSTHOOK: type: ALTERTABLE_ADDPARTS
+POSTHOOK: Output: default@tst@d=2009-02-02
+PREHOOK: query: explain
 select * from (
   select * from tst x where x.d='2009-01-01' limit 10
     union all
   select * from tst x where x.d='2009-02-02' limit 10
 ) subq
+PREHOOK: type: QUERY
+POSTHOOK: query: explain
+select * from (
+  select * from tst x where x.d='2009-01-01' limit 10
+    union all
+  select * from tst x where x.d='2009-02-02' limit 10
+) subq
+POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_SUBQUERY (TOK_UNION (TOK_QUERY (TOK_FROM (TOK_TABREF tst x)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR TOK_ALLCOLREF)) (TOK_WHERE (= (. (TOK_TABLE_OR_COL x) d) '2009-01-01')) (TOK_LIMIT 10))) (TOK_QUERY (TOK_FROM (TOK_TABREF tst x)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR TOK_ALLCOLREF)) (TOK_WHERE (= (. (TOK_TABLE_OR_COL x) d) '2009-02-02')) (TOK_LIMIT 10)))) subq)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR TOK_ALLCOLREF))))
 
@@ -66,7 +89,7 @@
   Stage: Stage-2
     Map Reduce
       Alias -> Map Operator Tree:
-        file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/197206999/10002 
+        file:/data/users/njain/hive5/hive5/build/ql/tmp/1731789138/10002 
           Union
             Select Operator
               expressions:
@@ -83,7 +106,7 @@
                 table:
                     input format: org.apache.hadoop.mapred.TextInputFormat
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-        file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/197206999/10003 
+        file:/data/users/njain/hive5/hive5/build/ql/tmp/1731789138/10003 
           Union
             Select Operator
               expressions:
@@ -150,12 +173,26 @@
       limit: -1
 
 
-query: select * from (
+PREHOOK: query: select * from (
+  select * from tst x where x.d='2009-01-01' limit 10
+    union all
+  select * from tst x where x.d='2009-02-02' limit 10
+) subq
+PREHOOK: type: QUERY
+PREHOOK: Input: default@tst@d=2009-01-01
+PREHOOK: Input: default@tst@d=2009-02-02
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/288203570/10000
+POSTHOOK: query: select * from (
   select * from tst x where x.d='2009-01-01' limit 10
     union all
   select * from tst x where x.d='2009-02-02' limit 10
 ) subq
-Input: default/tst/d=2009-01-01
-Input: default/tst/d=2009-02-02
-Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1412410730/10000
-query: drop table tst
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tst@d=2009-01-01
+POSTHOOK: Input: default@tst@d=2009-02-02
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/288203570/10000
+PREHOOK: query: drop table tst
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: drop table tst
+POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: default@tst

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/input26.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/input26.q.out?rev=819792&r1=819791&r2=819792&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/input26.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/input26.q.out Tue Sep 29 01:25:15 2009
@@ -1,9 +1,17 @@
-query: explain
+PREHOOK: query: explain
 select * from (
   select * from srcpart a where a.ds = '2008-04-08' and a.hr = '11' order by a.key limit 5
     union all
   select * from srcpart b where b.ds = '2008-04-08' and b.hr = '14' limit 5
 )subq
+PREHOOK: type: QUERY
+POSTHOOK: query: explain
+select * from (
+  select * from srcpart a where a.ds = '2008-04-08' and a.hr = '11' order by a.key limit 5
+    union all
+  select * from srcpart b where b.ds = '2008-04-08' and b.hr = '14' limit 5
+)subq
+POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_SUBQUERY (TOK_UNION (TOK_QUERY (TOK_FROM (TOK_TABREF srcpart a)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR TOK_ALLCOLREF)) (TOK_WHERE (and (= (. (TOK_TABLE_OR_COL a) ds) '2008-04-08') (= (. (TOK_TABLE_OR_COL a) hr) '11'))) (TOK_ORDERBY (TOK_TABSORTCOLNAMEASC (. (TOK_TABLE_OR_COL a) key))) (TOK_LIMIT 5))) (TOK_QUERY (TOK_FROM (TOK_TABREF srcpart b)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR TOK_ALLCOLREF)) (TOK_WHERE (and (= (. (TOK_TABLE_OR_COL b) ds) '2008-04-08') (= (. (TOK_TABLE_OR_COL b) hr) '14'))) (TOK_LIMIT 5)))) subq)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR TOK_ALLCOLREF))))
 
@@ -68,7 +76,7 @@
   Stage: Stage-2
     Map Reduce
       Alias -> Map Operator Tree:
-        file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1082108429/10002 
+        file:/data/users/njain/hive5/hive5/build/ql/tmp/931895538/10002 
           Union
             Select Operator
               expressions:
@@ -87,7 +95,7 @@
                 table:
                     input format: org.apache.hadoop.mapred.TextInputFormat
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-        file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1082108429/10003 
+        file:/data/users/njain/hive5/hive5/build/ql/tmp/931895538/10003 
           Union
             Select Operator
               expressions:
@@ -160,13 +168,22 @@
       limit: -1
 
 
-query: select * from (
+PREHOOK: query: select * from (
+  select * from srcpart a where a.ds = '2008-04-08' and a.hr = '11' order by a.key limit 5
+    union all
+  select * from srcpart b where b.ds = '2008-04-08' and b.hr = '14' limit 5
+)subq
+PREHOOK: type: QUERY
+PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/1999598065/10000
+POSTHOOK: query: select * from (
   select * from srcpart a where a.ds = '2008-04-08' and a.hr = '11' order by a.key limit 5
     union all
   select * from srcpart b where b.ds = '2008-04-08' and b.hr = '14' limit 5
 )subq
-Input: default/srcpart/ds=2008-04-08/hr=11
-Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/168463886/10000
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/1999598065/10000
 0	val_0	2008-04-08	11
 0	val_0	2008-04-08	11
 0	val_0	2008-04-08	11

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/input28.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/input28.q.out?rev=819792&r1=819791&r2=819792&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/input28.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/input28.q.out Tue Sep 29 01:25:15 2009
@@ -1,12 +1,39 @@
-query: drop table tst
-query: create table tst(a string, b string) partitioned by (d string)
-query: alter table tst add partition (d='2009-01-01')
-query: insert overwrite table tst partition(d='2009-01-01')
+PREHOOK: query: drop table tst
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: drop table tst
+POSTHOOK: type: DROPTABLE
+PREHOOK: query: create table tst(a string, b string) partitioned by (d string)
+PREHOOK: type: CREATETABLE
+POSTHOOK: query: create table tst(a string, b string) partitioned by (d string)
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: default@tst
+PREHOOK: query: alter table tst add partition (d='2009-01-01')
+PREHOOK: type: ALTERTABLE_ADDPARTS
+POSTHOOK: query: alter table tst add partition (d='2009-01-01')
+POSTHOOK: type: ALTERTABLE_ADDPARTS
+POSTHOOK: Output: default@tst@d=2009-01-01
+PREHOOK: query: insert overwrite table tst partition(d='2009-01-01')
 select tst.a, src.value from tst join src ON (tst.a = src.key)
-Input: default/tst/d=2009-01-01
-Input: default/src
-Output: default/tst/d=2009-01-01
-query: select * from tst where tst.d='2009-01-01'
-Input: default/tst/d=2009-01-01
-Output: /data/users/njain/hive6/hive6/ql/../build/ql/tmp/29384498/467749736.10000
-query: drop table tst
+PREHOOK: type: QUERY
+PREHOOK: Input: default@tst@d=2009-01-01
+PREHOOK: Input: default@src
+PREHOOK: Output: default@tst@d=2009-01-01
+POSTHOOK: query: insert overwrite table tst partition(d='2009-01-01')
+select tst.a, src.value from tst join src ON (tst.a = src.key)
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tst@d=2009-01-01
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@tst@d=2009-01-01
+PREHOOK: query: select * from tst where tst.d='2009-01-01'
+PREHOOK: type: QUERY
+PREHOOK: Input: default@tst@d=2009-01-01
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/203929646/10000
+POSTHOOK: query: select * from tst where tst.d='2009-01-01'
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tst@d=2009-01-01
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/203929646/10000
+PREHOOK: query: drop table tst
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: drop table tst
+POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: default@tst

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/input2_limit.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/input2_limit.q.out?rev=819792&r1=819791&r2=819792&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/input2_limit.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/input2_limit.q.out Tue Sep 29 01:25:15 2009
@@ -1,5 +1,9 @@
-query: EXPLAIN
+PREHOOK: query: EXPLAIN
 SELECT x.* FROM SRC x WHERE x.key < 300 LIMIT 5
+PREHOOK: type: QUERY
+POSTHOOK: query: EXPLAIN
+SELECT x.* FROM SRC x WHERE x.key < 300 LIMIT 5
+POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_TABREF SRC x)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_ALLCOLREF x))) (TOK_WHERE (< (. (TOK_TABLE_OR_COL x) key) 300)) (TOK_LIMIT 5)))
 
@@ -42,9 +46,14 @@
       limit: 5
 
 
-query: SELECT x.* FROM SRC x WHERE x.key < 300 LIMIT 5
-Input: default/src
-Output: file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_0/build/ql/tmp/268148023/10000
+PREHOOK: query: SELECT x.* FROM SRC x WHERE x.key < 300 LIMIT 5
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/535409987/10000
+POSTHOOK: query: SELECT x.* FROM SRC x WHERE x.key < 300 LIMIT 5
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/535409987/10000
 238	val_238
 86	val_86
 27	val_27

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/input3.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/input3.q.out?rev=819792&r1=819791&r2=819792&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/input3.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/input3.q.out Tue Sep 29 01:25:15 2009
@@ -1,16 +1,42 @@
-query: DROP TABLE TEST3a
-query: DROP TABLE TEST3b
-query: DROP TABLE TEST3c
-query: CREATE TABLE TEST3a(A INT, B DOUBLE) STORED AS TEXTFILE
-query: DESCRIBE TEST3a
+PREHOOK: query: DROP TABLE TEST3a
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: DROP TABLE TEST3a
+POSTHOOK: type: DROPTABLE
+PREHOOK: query: DROP TABLE TEST3b
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: DROP TABLE TEST3b
+POSTHOOK: type: DROPTABLE
+PREHOOK: query: DROP TABLE TEST3c
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: DROP TABLE TEST3c
+POSTHOOK: type: DROPTABLE
+PREHOOK: query: CREATE TABLE TEST3a(A INT, B DOUBLE) STORED AS TEXTFILE
+PREHOOK: type: CREATETABLE
+POSTHOOK: query: CREATE TABLE TEST3a(A INT, B DOUBLE) STORED AS TEXTFILE
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: default@TEST3a
+PREHOOK: query: DESCRIBE TEST3a
+PREHOOK: type: DESCTABLE
+POSTHOOK: query: DESCRIBE TEST3a
+POSTHOOK: type: DESCTABLE
 a	int	
 b	double	
-query: CREATE TABLE TEST3b(A ARRAY<INT>, B DOUBLE, C MAP<DOUBLE, INT>) STORED AS TEXTFILE
-query: DESCRIBE TEST3b
+PREHOOK: query: CREATE TABLE TEST3b(A ARRAY<INT>, B DOUBLE, C MAP<DOUBLE, INT>) STORED AS TEXTFILE
+PREHOOK: type: CREATETABLE
+POSTHOOK: query: CREATE TABLE TEST3b(A ARRAY<INT>, B DOUBLE, C MAP<DOUBLE, INT>) STORED AS TEXTFILE
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: default@TEST3b
+PREHOOK: query: DESCRIBE TEST3b
+PREHOOK: type: DESCTABLE
+POSTHOOK: query: DESCRIBE TEST3b
+POSTHOOK: type: DESCTABLE
 a	array<int>	
 b	double	
 c	map<double,int>	
-query: SHOW TABLES
+PREHOOK: query: SHOW TABLES
+PREHOOK: type: SHOWTABLES
+POSTHOOK: query: SHOW TABLES
+POSTHOOK: type: SHOWTABLES
 src
 src1
 src_json
@@ -20,8 +46,12 @@
 srcpart
 test3a
 test3b
-query: EXPLAIN
+PREHOOK: query: EXPLAIN
 ALTER TABLE TEST3b ADD COLUMNS (X DOUBLE)
+PREHOOK: type: ALTERTABLE_ADDCOLS
+POSTHOOK: query: EXPLAIN
+ALTER TABLE TEST3b ADD COLUMNS (X DOUBLE)
+POSTHOOK: type: ALTERTABLE_ADDCOLS
 ABSTRACT SYNTAX TREE:
   (TOK_ALTERTABLE_ADDCOLS TEST3b (TOK_TABCOLLIST (TOK_TABCOL X TOK_DOUBLE)))
 
@@ -37,14 +67,26 @@
           old name: TEST3b
 
 
-query: ALTER TABLE TEST3b ADD COLUMNS (X DOUBLE)
-query: DESCRIBE TEST3b
+PREHOOK: query: ALTER TABLE TEST3b ADD COLUMNS (X DOUBLE)
+PREHOOK: type: ALTERTABLE_ADDCOLS
+POSTHOOK: query: ALTER TABLE TEST3b ADD COLUMNS (X DOUBLE)
+POSTHOOK: type: ALTERTABLE_ADDCOLS
+POSTHOOK: Input: default@test3b
+POSTHOOK: Output: default@test3b
+PREHOOK: query: DESCRIBE TEST3b
+PREHOOK: type: DESCTABLE
+POSTHOOK: query: DESCRIBE TEST3b
+POSTHOOK: type: DESCTABLE
 a	array<int>	
 b	double	
 c	map<double,int>	
 x	double	
-query: EXPLAIN
+PREHOOK: query: EXPLAIN
+ALTER TABLE TEST3b RENAME TO TEST3c
+PREHOOK: type: ALTERTABLE_RENAME
+POSTHOOK: query: EXPLAIN
 ALTER TABLE TEST3b RENAME TO TEST3c
+POSTHOOK: type: ALTERTABLE_RENAME
 ABSTRACT SYNTAX TREE:
   (TOK_ALTERTABLE_RENAME TEST3b TEST3c)
 
@@ -60,13 +102,24 @@
           old name: TEST3b
 
 
-query: ALTER TABLE TEST3b RENAME TO TEST3c
-query: DESCRIBE TEST3c
+PREHOOK: query: ALTER TABLE TEST3b RENAME TO TEST3c
+PREHOOK: type: ALTERTABLE_RENAME
+POSTHOOK: query: ALTER TABLE TEST3b RENAME TO TEST3c
+POSTHOOK: type: ALTERTABLE_RENAME
+POSTHOOK: Input: default@test3b
+POSTHOOK: Output: default@TEST3c
+PREHOOK: query: DESCRIBE TEST3c
+PREHOOK: type: DESCTABLE
+POSTHOOK: query: DESCRIBE TEST3c
+POSTHOOK: type: DESCTABLE
 a	array<int>	
 b	double	
 c	map<double,int>	
 x	double	
-query: SHOW TABLES
+PREHOOK: query: SHOW TABLES
+PREHOOK: type: SHOWTABLES
+POSTHOOK: query: SHOW TABLES
+POSTHOOK: type: SHOWTABLES
 src
 src1
 src_json
@@ -76,8 +129,12 @@
 srcpart
 test3a
 test3c
-query: EXPLAIN
+PREHOOK: query: EXPLAIN
+ALTER TABLE TEST3c REPLACE COLUMNS (R1 INT, R2 DOUBLE)
+PREHOOK: type: ALTERTABLE_REPLACECOLS
+POSTHOOK: query: EXPLAIN
 ALTER TABLE TEST3c REPLACE COLUMNS (R1 INT, R2 DOUBLE)
+POSTHOOK: type: ALTERTABLE_REPLACECOLS
 ABSTRACT SYNTAX TREE:
   (TOK_ALTERTABLE_REPLACECOLS TEST3c (TOK_TABCOLLIST (TOK_TABCOL R1 TOK_INT) (TOK_TABCOL R2 TOK_DOUBLE)))
 
@@ -93,12 +150,31 @@
           old name: TEST3c
 
 
-query: ALTER TABLE TEST3c REPLACE COLUMNS (R1 INT, R2 DOUBLE)
-query: DESCRIBE EXTENDED TEST3c
+PREHOOK: query: ALTER TABLE TEST3c REPLACE COLUMNS (R1 INT, R2 DOUBLE)
+PREHOOK: type: ALTERTABLE_REPLACECOLS
+POSTHOOK: query: ALTER TABLE TEST3c REPLACE COLUMNS (R1 INT, R2 DOUBLE)
+POSTHOOK: type: ALTERTABLE_REPLACECOLS
+POSTHOOK: Input: default@test3c
+POSTHOOK: Output: default@test3c
+PREHOOK: query: DESCRIBE EXTENDED TEST3c
+PREHOOK: type: DESCTABLE
+POSTHOOK: query: DESCRIBE EXTENDED TEST3c
+POSTHOOK: type: DESCTABLE
 r1	int	
 r2	double	
 	 	 
-Detailed Table Information	Table(tableName:test3c,dbName:default,owner:athusoo,createTime:1241278187,lastAccessTime:0,retention:0,sd:StorageDescriptor(cols:[FieldSchema(name:r1,type:int,comment:null), FieldSchema(name:r2,type:double,comment:null)],location:file:/data/users/athusoo/commits/hive_trunk_ws8/build/ql/test/data/warehouse/test3b,inputFormat:org.apache.hadoop.mapred.TextInputFormat,outputFormat:org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat,compressed:false,numBuckets:-1,serdeInfo:SerDeInfo(name:null,serializationLib:org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe,parameters:{serialization.format=1}),bucketCols:[],sortCols:[],parameters:{}),partitionKeys:[],parameters:{last_modified_by=athusoo,last_modified_time=1241278187})	
-query: DROP TABLE TEST3a
-query: DROP TABLE TEST3b
-query: DROP TABLE TEST3c
+Detailed Table Information	Table(tableName:test3c, dbName:default, owner:njain, createTime:1253780443, lastAccessTime:0, retention:0, sd:StorageDescriptor(cols:[FieldSchema(name:r1, type:int, comment:null), FieldSchema(name:r2, type:double, comment:null)], location:file:/data/users/njain/hive5/hive5/build/ql/test/data/warehouse/test3c, inputFormat:org.apache.hadoop.mapred.TextInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat, compressed:false, numBuckets:-1, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe, parameters:{serialization.format=1}), bucketCols:[], sortCols:[], parameters:{}), partitionKeys:[], parameters:{last_modified_by=njain,last_modified_time=1253780444})	
+PREHOOK: query: DROP TABLE TEST3a
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: DROP TABLE TEST3a
+POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: default@test3a
+PREHOOK: query: DROP TABLE TEST3b
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: DROP TABLE TEST3b
+POSTHOOK: type: DROPTABLE
+PREHOOK: query: DROP TABLE TEST3c
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: DROP TABLE TEST3c
+POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: default@test3c

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/input30.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/input30.q.out?rev=819792&r1=819791&r2=819792&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/input30.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/input30.q.out Tue Sep 29 01:25:15 2009
@@ -1,10 +1,29 @@
-query: drop table tst_dest30
-query: drop table dest30
-query: create table dest30(a int)
-query: create table tst_dest30(a int)
-query: explain 
+PREHOOK: query: drop table tst_dest30
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: drop table tst_dest30
+POSTHOOK: type: DROPTABLE
+PREHOOK: query: drop table dest30
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: drop table dest30
+POSTHOOK: type: DROPTABLE
+PREHOOK: query: create table dest30(a int)
+PREHOOK: type: CREATETABLE
+POSTHOOK: query: create table dest30(a int)
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: default@dest30
+PREHOOK: query: create table tst_dest30(a int)
+PREHOOK: type: CREATETABLE
+POSTHOOK: query: create table tst_dest30(a int)
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: default@tst_dest30
+PREHOOK: query: explain 
 insert overwrite table dest30
 select count(1) from src
+PREHOOK: type: QUERY
+POSTHOOK: query: explain 
+insert overwrite table dest30
+select count(1) from src
+POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_TABREF src)) (TOK_INSERT (TOK_DESTINATION (TOK_TAB dest30)) (TOK_SELECT (TOK_SELEXPR (TOK_FUNCTION count 1)))))
 
@@ -71,13 +90,32 @@
               name: tst_dest30
 
 
-query: insert overwrite table dest30
+PREHOOK: query: insert overwrite table dest30
+select count(1) from src
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@tst_dest30
+POSTHOOK: query: insert overwrite table dest30
 select count(1) from src
-Input: default/src
-Output: default/tst_dest30
-query: select * from tst_dest30
-Input: default/tst_dest30
-Output: file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_2/build/ql/tmp/606603037/10000
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@tst_dest30
+PREHOOK: query: select * from tst_dest30
+PREHOOK: type: QUERY
+PREHOOK: Input: default@tst_dest30
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/423372483/10000
+POSTHOOK: query: select * from tst_dest30
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tst_dest30
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/423372483/10000
 18
-query: drop table tst_dest30
-query: drop table dest30
+PREHOOK: query: drop table tst_dest30
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: drop table tst_dest30
+POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: default@tst_dest30
+PREHOOK: query: drop table dest30
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: drop table dest30
+POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: default@dest30

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/input31.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/input31.q.out?rev=819792&r1=819791&r2=819792&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/input31.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/input31.q.out Tue Sep 29 01:25:15 2009
@@ -1,10 +1,29 @@
-query: drop table tst_dest31
-query: drop table dest31
-query: create table tst_dest31(a int)
-query: create table dest31(a int)
-query: explain 
+PREHOOK: query: drop table tst_dest31
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: drop table tst_dest31
+POSTHOOK: type: DROPTABLE
+PREHOOK: query: drop table dest31
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: drop table dest31
+POSTHOOK: type: DROPTABLE
+PREHOOK: query: create table tst_dest31(a int)
+PREHOOK: type: CREATETABLE
+POSTHOOK: query: create table tst_dest31(a int)
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: default@tst_dest31
+PREHOOK: query: create table dest31(a int)
+PREHOOK: type: CREATETABLE
+POSTHOOK: query: create table dest31(a int)
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: default@dest31
+PREHOOK: query: explain 
 insert overwrite table dest31
 select count(1) from srcbucket
+PREHOOK: type: QUERY
+POSTHOOK: query: explain 
+insert overwrite table dest31
+select count(1) from srcbucket
+POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_TABREF srcbucket)) (TOK_INSERT (TOK_DESTINATION (TOK_TAB dest31)) (TOK_SELECT (TOK_SELEXPR (TOK_FUNCTION count 1)))))
 
@@ -67,13 +86,32 @@
               name: tst_dest31
 
 
-query: insert overwrite table dest31
+PREHOOK: query: insert overwrite table dest31
+select count(1) from srcbucket
+PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket
+PREHOOK: Output: default@tst_dest31
+POSTHOOK: query: insert overwrite table dest31
 select count(1) from srcbucket
-Input: default/srcbucket
-Output: default/tst_dest31
-query: select * from tst_dest31
-Input: default/tst_dest31
-Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/2034201146/10000
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket
+POSTHOOK: Output: default@tst_dest31
+PREHOOK: query: select * from tst_dest31
+PREHOOK: type: QUERY
+PREHOOK: Input: default@tst_dest31
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/1444121473/10000
+POSTHOOK: query: select * from tst_dest31
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tst_dest31
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/1444121473/10000
 493
-query: drop table tst_dest31
-query: drop table dest31
+PREHOOK: query: drop table tst_dest31
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: drop table tst_dest31
+POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: default@tst_dest31
+PREHOOK: query: drop table dest31
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: drop table dest31
+POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: default@dest31

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/input32.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/input32.q.out?rev=819792&r1=819791&r2=819792&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/input32.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/input32.q.out Tue Sep 29 01:25:15 2009
@@ -1,10 +1,29 @@
-query: drop table tst_dest32
-query: drop table dest32
-query: create table dest32(a int)
-query: create table tst_dest32(a int)
-query: explain 
+PREHOOK: query: drop table tst_dest32
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: drop table tst_dest32
+POSTHOOK: type: DROPTABLE
+PREHOOK: query: drop table dest32
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: drop table dest32
+POSTHOOK: type: DROPTABLE
+PREHOOK: query: create table dest32(a int)
+PREHOOK: type: CREATETABLE
+POSTHOOK: query: create table dest32(a int)
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: default@dest32
+PREHOOK: query: create table tst_dest32(a int)
+PREHOOK: type: CREATETABLE
+POSTHOOK: query: create table tst_dest32(a int)
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: default@tst_dest32
+PREHOOK: query: explain 
 insert overwrite table dest32
 select count(1) from srcbucket
+PREHOOK: type: QUERY
+POSTHOOK: query: explain 
+insert overwrite table dest32
+select count(1) from srcbucket
+POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_TABREF srcbucket)) (TOK_INSERT (TOK_DESTINATION (TOK_TAB dest32)) (TOK_SELECT (TOK_SELEXPR (TOK_FUNCTION count 1)))))
 
@@ -67,13 +86,32 @@
               name: tst_dest32
 
 
-query: insert overwrite table dest32
+PREHOOK: query: insert overwrite table dest32
+select count(1) from srcbucket
+PREHOOK: type: QUERY
+PREHOOK: Input: default@srcbucket
+PREHOOK: Output: default@tst_dest32
+POSTHOOK: query: insert overwrite table dest32
 select count(1) from srcbucket
-Input: default/srcbucket
-Output: default/tst_dest32
-query: select * from tst_dest32
-Input: default/tst_dest32
-Output: file:/data/users/athusoo/commits/hive_trunk_ws1/build/ql/tmp/1142748652/10000
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@srcbucket
+POSTHOOK: Output: default@tst_dest32
+PREHOOK: query: select * from tst_dest32
+PREHOOK: type: QUERY
+PREHOOK: Input: default@tst_dest32
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/617724755/10000
+POSTHOOK: query: select * from tst_dest32
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tst_dest32
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/617724755/10000
 1000
-query: drop table tst_dest32
-query: drop table dest32
+PREHOOK: query: drop table tst_dest32
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: drop table tst_dest32
+POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: default@tst_dest32
+PREHOOK: query: drop table dest32
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: drop table dest32
+POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: default@dest32

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/input33.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/input33.q.out?rev=819792&r1=819791&r2=819792&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/input33.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/input33.q.out Tue Sep 29 01:25:15 2009
@@ -1,5 +1,9 @@
-query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE
-query: EXPLAIN
+PREHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE
+PREHOOK: type: CREATETABLE
+POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: default@dest1
+PREHOOK: query: EXPLAIN
 FROM (
   FROM src
   MAP src.key, src.key 
@@ -11,6 +15,20 @@
 REDUCE tmap.key, tmap.value
 USING '../data/scripts/input20_script'
 AS (key STRING, value STRING)
+PREHOOK: type: QUERY
+POSTHOOK: query: EXPLAIN
+FROM (
+  FROM src
+  MAP src.key, src.key 
+  USING 'cat'
+  DISTRIBUTE BY key
+  SORT BY key, value
+) tmap
+INSERT OVERWRITE TABLE dest1
+REDUCE tmap.key, tmap.value
+USING '../data/scripts/input20_script'
+AS (key STRING, value STRING)
+POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_TABREF src)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TRANSFORM (TOK_EXPLIST (. (TOK_TABLE_OR_COL src) key) (. (TOK_TABLE_OR_COL src) key)) TOK_SERDE TOK_RECORDWRITER 'cat' TOK_SERDE TOK_RECORDREADER))) (TOK_DISTRIBUTEBY (TOK_TABLE_OR_COL key)) (TOK_SORTBY (TOK_TABSORTCOLNAMEASC (TOK_TABLE_OR_COL key)) (TOK_TABSORTCOLNAMEASC (TOK_TABLE_OR_COL value))))) tmap)) (TOK_INSERT (TOK_DESTINATION (TOK_TAB dest1)) (TOK_SELECT (TOK_SELEXPR (TOK_TRANSFORM (TOK_EXPLIST (. (TOK_TABLE_OR_COL tmap) key) (. (TOK_TABLE_OR_COL tmap) value)) TOK_SERDE TOK_RECORDWRITER '../data/scripts/input20_script' TOK_SERDE TOK_RECORDREADER (TOK_TABCOLLIST (TOK_TABCOL key TOK_STRING) (TOK_TABCOL value TOK_STRING)))))))
 
@@ -94,7 +112,21 @@
               name: dest1
 
 
-query: FROM (
+PREHOOK: query: FROM (
+  FROM src
+  MAP src.key, src.key
+  USING 'cat' 
+  DISTRIBUTE BY key
+  SORT BY key, value
+) tmap
+INSERT OVERWRITE TABLE dest1
+REDUCE tmap.key, tmap.value
+USING '../data/scripts/input20_script'
+AS (key STRING, value STRING)
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1
+POSTHOOK: query: FROM (
   FROM src
   MAP src.key, src.key
   USING 'cat' 
@@ -105,11 +137,17 @@
 REDUCE tmap.key, tmap.value
 USING '../data/scripts/input20_script'
 AS (key STRING, value STRING)
-Input: default/src
-Output: default/dest1
-query: SELECT * FROM dest1 SORT BY key, value
-Input: default/dest1
-Output: file:/data/users/njain/hive3/hive3/build/ql/tmp/1803933232/10000
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@dest1
+PREHOOK: query: SELECT * FROM dest1 SORT BY key, value
+PREHOOK: type: QUERY
+PREHOOK: Input: default@dest1
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/2057999513/10000
+POSTHOOK: query: SELECT * FROM dest1 SORT BY key, value
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@dest1
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/2057999513/10000
 1	105_105
 1	10_10
 1	111_111

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/input34.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/input34.q.out?rev=819792&r1=819791&r2=819792&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/input34.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/input34.q.out Tue Sep 29 01:25:15 2009
@@ -1,5 +1,9 @@
-query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE
-query: EXPLAIN
+PREHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE
+PREHOOK: type: CREATETABLE
+POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: default@dest1
+PREHOOK: query: EXPLAIN
 FROM (
   FROM src
   SELECT TRANSFORM(src.key, src.value) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe'
@@ -7,6 +11,16 @@
   AS (tkey, tvalue) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe'
 ) tmap
 INSERT OVERWRITE TABLE dest1 SELECT tkey, tvalue
+PREHOOK: type: QUERY
+POSTHOOK: query: EXPLAIN
+FROM (
+  FROM src
+  SELECT TRANSFORM(src.key, src.value) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe'
+  USING '/bin/cat'
+  AS (tkey, tvalue) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe'
+) tmap
+INSERT OVERWRITE TABLE dest1 SELECT tkey, tvalue
+POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_TABREF src)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TRANSFORM (TOK_EXPLIST (. (TOK_TABLE_OR_COL src) key) (. (TOK_TABLE_OR_COL src) value)) (TOK_SERDE (TOK_SERDENAME 'org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe')) TOK_RECORDWRITER '/bin/cat' (TOK_SERDE (TOK_SERDENAME 'org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe')) TOK_RECORDREADER (TOK_ALIASLIST tkey tvalue)))))) tmap)) (TOK_INSERT (TOK_DESTINATION (TOK_TAB dest1)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL tkey)) (TOK_SELEXPR (TOK_TABLE_OR_COL tvalue)))))
 
@@ -63,10 +77,10 @@
           Move Operator
             files:
                 hdfs directory: true
-                destination: file:/data/users/njain/hive3/hive3/build/ql/tmp/1807729605/10000
+                destination: file:/data/users/njain/hive5/hive5/build/ql/tmp/1855291816/10000
           Map Reduce
             Alias -> Map Operator Tree:
-              file:/data/users/njain/hive3/hive3/build/ql/tmp/35008800/10002 
+              file:/data/users/njain/hive5/hive5/build/ql/tmp/555988603/10002 
                   Reduce Output Operator
                     sort order: 
                     Map-reduce partition columns:
@@ -100,18 +114,34 @@
               name: dest1
 
 
-query: FROM (
+PREHOOK: query: FROM (
+  FROM src
+  SELECT TRANSFORM(src.key, src.value) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe'
+  USING '/bin/cat'
+  AS (tkey, tvalue) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe'
+) tmap
+INSERT OVERWRITE TABLE dest1 SELECT tkey, tvalue
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1
+POSTHOOK: query: FROM (
   FROM src
   SELECT TRANSFORM(src.key, src.value) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe'
   USING '/bin/cat'
   AS (tkey, tvalue) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe'
 ) tmap
 INSERT OVERWRITE TABLE dest1 SELECT tkey, tvalue
-Input: default/src
-Output: default/dest1
-query: SELECT dest1.* FROM dest1
-Input: default/dest1
-Output: file:/data/users/njain/hive3/hive3/build/ql/tmp/1549034567/10000
+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/1579819069/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/1579819069/10000
 238	val_238
 86	val_86
 311	val_311

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/input35.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/input35.q.out?rev=819792&r1=819791&r2=819792&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/input35.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/input35.q.out Tue Sep 29 01:25:15 2009
@@ -1,5 +1,9 @@
-query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE
-query: EXPLAIN
+PREHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE
+PREHOOK: type: CREATETABLE
+POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: default@dest1
+PREHOOK: query: EXPLAIN
 FROM (
   FROM src
   SELECT TRANSFORM(src.key, src.value) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\002'
@@ -7,6 +11,16 @@
   AS (tkey, tvalue) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\002'
 ) tmap
 INSERT OVERWRITE TABLE dest1 SELECT tkey, tvalue
+PREHOOK: type: QUERY
+POSTHOOK: query: EXPLAIN
+FROM (
+  FROM src
+  SELECT TRANSFORM(src.key, src.value) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\002'
+  USING '/bin/cat'
+  AS (tkey, tvalue) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\002'
+) tmap
+INSERT OVERWRITE TABLE dest1 SELECT tkey, tvalue
+POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_TABREF src)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TRANSFORM (TOK_EXPLIST (. (TOK_TABLE_OR_COL src) key) (. (TOK_TABLE_OR_COL src) value)) (TOK_SERDE (TOK_SERDEPROPS (TOK_TABLEROWFORMATFIELD '\002'))) TOK_RECORDWRITER '/bin/cat' (TOK_SERDE (TOK_SERDEPROPS (TOK_TABLEROWFORMATFIELD '\002'))) TOK_RECORDREADER (TOK_ALIASLIST tkey tvalue)))))) tmap)) (TOK_INSERT (TOK_DESTINATION (TOK_TAB dest1)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL tkey)) (TOK_SELEXPR (TOK_TABLE_OR_COL tvalue)))))
 
@@ -63,10 +77,10 @@
           Move Operator
             files:
                 hdfs directory: true
-                destination: file:/data/users/njain/hive3/hive3/build/ql/tmp/64811552/10000
+                destination: file:/data/users/njain/hive5/hive5/build/ql/tmp/544202760/10000
           Map Reduce
             Alias -> Map Operator Tree:
-              file:/data/users/njain/hive3/hive3/build/ql/tmp/1494510808/10002 
+              file:/data/users/njain/hive5/hive5/build/ql/tmp/1946525886/10002 
                   Reduce Output Operator
                     sort order: 
                     Map-reduce partition columns:
@@ -100,18 +114,34 @@
               name: dest1
 
 
-query: FROM (
+PREHOOK: query: FROM (
+  FROM src
+  SELECT TRANSFORM(src.key, src.value) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\002'
+  USING '/bin/cat'
+  AS (tkey, tvalue) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\002'
+) tmap
+INSERT OVERWRITE TABLE dest1 SELECT tkey, tvalue
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1
+POSTHOOK: query: FROM (
   FROM src
   SELECT TRANSFORM(src.key, src.value) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\002'
   USING '/bin/cat'
   AS (tkey, tvalue) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\002'
 ) tmap
 INSERT OVERWRITE TABLE dest1 SELECT tkey, tvalue
-Input: default/src
-Output: default/dest1
-query: SELECT dest1.* FROM dest1
-Input: default/dest1
-Output: file:/data/users/njain/hive3/hive3/build/ql/tmp/560708701/10000
+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/1946173238/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/1946173238/10000
 238	val_238
 86	val_86
 311	val_311

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/input36.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/input36.q.out?rev=819792&r1=819791&r2=819792&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/input36.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/input36.q.out Tue Sep 29 01:25:15 2009
@@ -1,5 +1,9 @@
-query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE
-query: EXPLAIN
+PREHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE
+PREHOOK: type: CREATETABLE
+POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: default@dest1
+PREHOOK: query: EXPLAIN
 FROM (
   FROM src
   SELECT TRANSFORM(src.key, src.value) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\002'
@@ -7,6 +11,16 @@
   AS (tkey, tvalue) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\003'
 ) tmap
 INSERT OVERWRITE TABLE dest1 SELECT tkey, tvalue
+PREHOOK: type: QUERY
+POSTHOOK: query: EXPLAIN
+FROM (
+  FROM src
+  SELECT TRANSFORM(src.key, src.value) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\002'
+  USING '/bin/cat'
+  AS (tkey, tvalue) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\003'
+) tmap
+INSERT OVERWRITE TABLE dest1 SELECT tkey, tvalue
+POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_TABREF src)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TRANSFORM (TOK_EXPLIST (. (TOK_TABLE_OR_COL src) key) (. (TOK_TABLE_OR_COL src) value)) (TOK_SERDE (TOK_SERDEPROPS (TOK_TABLEROWFORMATFIELD '\002'))) TOK_RECORDWRITER '/bin/cat' (TOK_SERDE (TOK_SERDEPROPS (TOK_TABLEROWFORMATFIELD '\003'))) TOK_RECORDREADER (TOK_ALIASLIST tkey tvalue)))))) tmap)) (TOK_INSERT (TOK_DESTINATION (TOK_TAB dest1)) (TOK_SELECT (TOK_SELEXPR (TOK_TABLE_OR_COL tkey)) (TOK_SELEXPR (TOK_TABLE_OR_COL tvalue)))))
 
@@ -63,10 +77,10 @@
           Move Operator
             files:
                 hdfs directory: true
-                destination: file:/data/users/njain/hive3/hive3/build/ql/tmp/1973054300/10000
+                destination: file:/data/users/njain/hive5/hive5/build/ql/tmp/36900074/10000
           Map Reduce
             Alias -> Map Operator Tree:
-              file:/data/users/njain/hive3/hive3/build/ql/tmp/98959501/10002 
+              file:/data/users/njain/hive5/hive5/build/ql/tmp/1853787286/10002 
                   Reduce Output Operator
                     sort order: 
                     Map-reduce partition columns:
@@ -100,18 +114,34 @@
               name: dest1
 
 
-query: FROM (
+PREHOOK: query: FROM (
+  FROM src
+  SELECT TRANSFORM(src.key, src.value) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\002'
+  USING '/bin/cat'
+  AS (tkey, tvalue) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\003'
+) tmap
+INSERT OVERWRITE TABLE dest1 SELECT tkey, tvalue
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1
+POSTHOOK: query: FROM (
   FROM src
   SELECT TRANSFORM(src.key, src.value) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\002'
   USING '/bin/cat'
   AS (tkey, tvalue) ROW FORMAT DELIMITED FIELDS TERMINATED BY '\003'
 ) tmap
 INSERT OVERWRITE TABLE dest1 SELECT tkey, tvalue
-Input: default/src
-Output: default/dest1
-query: SELECT dest1.* FROM dest1
-Input: default/dest1
-Output: file:/data/users/njain/hive3/hive3/build/ql/tmp/42969627/10000
+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/1745072607/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/1745072607/10000
 NULL	NULL
 NULL	NULL
 NULL	NULL

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/input37.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/input37.q.out?rev=819792&r1=819791&r2=819792&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/input37.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/input37.q.out Tue Sep 29 01:25:15 2009
@@ -1,6 +1,14 @@
-query: create table documents(contents string) stored as textfile
-query: LOAD DATA LOCAL INPATH '../data/files/docurl.txt' INTO TABLE documents
-query: select url, count(1) 
+PREHOOK: query: create table documents(contents string) stored as textfile
+PREHOOK: type: CREATETABLE
+POSTHOOK: query: create table documents(contents string) stored as textfile
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: default@documents
+PREHOOK: query: LOAD DATA LOCAL INPATH '../data/files/docurl.txt' INTO TABLE documents
+PREHOOK: type: LOAD
+POSTHOOK: query: LOAD DATA LOCAL INPATH '../data/files/docurl.txt' INTO TABLE documents
+POSTHOOK: type: LOAD
+POSTHOOK: Output: default@documents
+PREHOOK: query: select url, count(1) 
 FROM
 (
   FROM documents
@@ -8,8 +16,24 @@
   USING 'java -cp ../build/ql/test/classes org.apache.hadoop.hive.scripts.extracturl' AS (url, count)
 ) subq
 group by url
-Input: default/documents
-Output: file:/data/users/njain/hive_commit2/hive_commit2/build/ql/tmp/781025216/10000
+PREHOOK: type: QUERY
+PREHOOK: Input: default@documents
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/282167247/10000
+POSTHOOK: query: select url, count(1) 
+FROM
+(
+  FROM documents
+  MAP documents.contents
+  USING 'java -cp ../build/ql/test/classes org.apache.hadoop.hive.scripts.extracturl' AS (url, count)
+) subq
+group by url
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@documents
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/282167247/10000
 1uauniajqtunlsvadmxhlxvngxpqjuzbpzvdiwmzphmbaicduzkgxgtdeiunduosu.html	4
 4uzsbtwvdypfitqfqdjosynqp.html	4
-query: DROP TABLE documents
+PREHOOK: query: DROP TABLE documents
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: DROP TABLE documents
+POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: default@documents

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/input38.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/input38.q.out?rev=819792&r1=819791&r2=819792&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/input38.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/input38.q.out Tue Sep 29 01:25:15 2009
@@ -1,12 +1,28 @@
-query: drop table dest1
-query: CREATE TABLE dest1(key STRING, value STRING) STORED AS TEXTFILE
-query: EXPLAIN
+PREHOOK: query: drop table dest1
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: drop table dest1
+POSTHOOK: type: DROPTABLE
+PREHOOK: query: CREATE TABLE dest1(key STRING, value STRING) STORED AS TEXTFILE
+PREHOOK: type: CREATETABLE
+POSTHOOK: query: CREATE TABLE dest1(key STRING, value STRING) STORED AS TEXTFILE
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: default@dest1
+PREHOOK: query: EXPLAIN
 FROM (
   FROM src
   SELECT TRANSFORM(src.key, src.value, 1+2, 3+4)
          USING '/bin/cat'
 ) tmap
 INSERT OVERWRITE TABLE dest1 SELECT tmap.key, tmap.value
+PREHOOK: type: QUERY
+POSTHOOK: query: EXPLAIN
+FROM (
+  FROM src
+  SELECT TRANSFORM(src.key, src.value, 1+2, 3+4)
+         USING '/bin/cat'
+) tmap
+INSERT OVERWRITE TABLE dest1 SELECT tmap.key, tmap.value
+POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_SUBQUERY (TOK_QUERY (TOK_FROM (TOK_TABREF src)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_TRANSFORM (TOK_EXPLIST (. (TOK_TABLE_OR_COL src) key) (. (TOK_TABLE_OR_COL src) value) (+ 1 2) (+ 3 4)) TOK_SERDE TOK_RECORDWRITER '/bin/cat' TOK_SERDE TOK_RECORDREADER))))) tmap)) (TOK_INSERT (TOK_DESTINATION (TOK_TAB dest1)) (TOK_SELECT (TOK_SELEXPR (. (TOK_TABLE_OR_COL tmap) key)) (TOK_SELEXPR (. (TOK_TABLE_OR_COL tmap) value)))))
 
@@ -60,10 +76,10 @@
           Move Operator
             files:
                 hdfs directory: true
-                destination: file:/data/users/njain/hive3/hive3/build/ql/tmp/1962987332/10000
+                destination: file:/data/users/njain/hive5/hive5/build/ql/tmp/209905315/10000
           Map Reduce
             Alias -> Map Operator Tree:
-              file:/data/users/njain/hive3/hive3/build/ql/tmp/1219497579/10002 
+              file:/data/users/njain/hive5/hive5/build/ql/tmp/2069167411/10002 
                   Reduce Output Operator
                     sort order: 
                     Map-reduce partition columns:
@@ -97,17 +113,32 @@
               name: dest1
 
 
-query: FROM (
+PREHOOK: query: FROM (
+  FROM src
+  SELECT TRANSFORM(src.key, src.value, 1+2, 3+4)
+         USING '/bin/cat'
+) tmap
+INSERT OVERWRITE TABLE dest1 SELECT tmap.key, tmap.value
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@dest1
+POSTHOOK: query: FROM (
   FROM src
   SELECT TRANSFORM(src.key, src.value, 1+2, 3+4)
          USING '/bin/cat'
 ) tmap
 INSERT OVERWRITE TABLE dest1 SELECT tmap.key, tmap.value
-Input: default/src
-Output: default/dest1
-query: SELECT dest1.* FROM dest1
-Input: default/dest1
-Output: file:/data/users/njain/hive3/hive3/build/ql/tmp/364487394/10000
+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/131517216/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/131517216/10000
 238	val_238	3	7
 86	val_86	3	7
 311	val_311	3	7
@@ -608,4 +639,8 @@
 400	val_400	3	7
 200	val_200	3	7
 97	val_97	3	7
-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/input39.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/input39.q.out?rev=819792&r1=819791&r2=819792&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/input39.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/input39.q.out Tue Sep 29 01:25:15 2009
@@ -1,21 +1,57 @@
-query: drop table t1
-query: drop table t2
-query: create table t1(key string, value string) partitioned by (ds string)
-query: create table t2(key string, value string) partitioned by (ds string)
-query: insert overwrite table t1 partition (ds='1')
-select key, value from src
-Input: default/src
-Output: default/t1/ds=1
-query: insert overwrite table t1 partition (ds='2')
-select key, value from src
-Input: default/src
-Output: default/t1/ds=2
-query: insert overwrite table t2 partition (ds='1')
-select key, value from src
-Input: default/src
-Output: default/t2/ds=1
-query: explain
+PREHOOK: query: drop table t1
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: drop table t1
+POSTHOOK: type: DROPTABLE
+PREHOOK: query: drop table t2
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: drop table t2
+POSTHOOK: type: DROPTABLE
+PREHOOK: query: create table t1(key string, value string) partitioned by (ds string)
+PREHOOK: type: CREATETABLE
+POSTHOOK: query: create table t1(key string, value string) partitioned by (ds string)
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: default@t1
+PREHOOK: query: create table t2(key string, value string) partitioned by (ds string)
+PREHOOK: type: CREATETABLE
+POSTHOOK: query: create table t2(key string, value string) partitioned by (ds string)
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: default@t2
+PREHOOK: query: insert overwrite table t1 partition (ds='1')
+select key, value from src
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@t1@ds=1
+POSTHOOK: query: insert overwrite table t1 partition (ds='1')
+select key, value from src
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@t1@ds=1
+PREHOOK: query: insert overwrite table t1 partition (ds='2')
+select key, value from src
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@t1@ds=2
+POSTHOOK: query: insert overwrite table t1 partition (ds='2')
+select key, value from src
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@t1@ds=2
+PREHOOK: query: insert overwrite table t2 partition (ds='1')
+select key, value from src
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@t2@ds=1
+POSTHOOK: query: insert overwrite table t2 partition (ds='1')
+select key, value from src
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@t2@ds=1
+PREHOOK: query: explain
+select count(1) from t1 join t2 on t1.key=t2.key where t1.ds='1' and t2.ds='1'
+PREHOOK: type: QUERY
+POSTHOOK: query: explain
 select count(1) from t1 join t2 on t1.key=t2.key where t1.ds='1' and t2.ds='1'
+POSTHOOK: type: QUERY
 ABSTRACT SYNTAX TREE:
   (TOK_QUERY (TOK_FROM (TOK_JOIN (TOK_TABREF t1) (TOK_TABREF t2) (= (. (TOK_TABLE_OR_COL t1) key) (. (TOK_TABLE_OR_COL t2) key)))) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_FUNCTION count 1))) (TOK_WHERE (and (= (. (TOK_TABLE_OR_COL t1) ds) '1') (= (. (TOK_TABLE_OR_COL t2) ds) '1')))))
 
@@ -102,7 +138,7 @@
   Stage: Stage-2
     Map Reduce
       Alias -> Map Operator Tree:
-        file:/data/users/njain/hive4/hive4/build/ql/tmp/159384890/10002 
+        file:/data/users/njain/hive5/hive5/build/ql/tmp/137089550/10002 
             Reduce Output Operator
               sort order: 
               tag: -1
@@ -132,10 +168,24 @@
       limit: -1
 
 
-query: select count(1) from t1 join t2 on t1.key=t2.key where t1.ds='1' and t2.ds='1'
-Input: default/t2/ds=1
-Input: default/t1/ds=1
-Output: file:/data/users/njain/hive4/hive4/build/ql/tmp/104820129/10000
+PREHOOK: query: select count(1) from t1 join t2 on t1.key=t2.key where t1.ds='1' and t2.ds='1'
+PREHOOK: type: QUERY
+PREHOOK: Input: default@t2@ds=1
+PREHOOK: Input: default@t1@ds=1
+PREHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/1835006892/10000
+POSTHOOK: query: select count(1) from t1 join t2 on t1.key=t2.key where t1.ds='1' and t2.ds='1'
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@t2@ds=1
+POSTHOOK: Input: default@t1@ds=1
+POSTHOOK: Output: file:/data/users/njain/hive5/hive5/build/ql/tmp/1835006892/10000
 18
-query: drop table t1
-query: drop table t2
+PREHOOK: query: drop table t1
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: drop table t1
+POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: default@t1
+PREHOOK: query: drop table t2
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: drop table t2
+POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: default@t2