You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by gu...@apache.org on 2014/08/22 23:37:21 UTC
svn commit: r1619936 [38/49] - in /hive/branches/cbo: ./ accumulo-handler/ ant/src/org/apache/hadoop/hive/ant/ bin/ common/src/java/org/apache/hadoop/hive/ant/ common/src/java/org/apache/hadoop/hive/common/type/ common/src/java/org/apache/hadoop/hive/c...

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/rcfile_union.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/rcfile_union.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/rcfile_union.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/rcfile_union.q.out Fri Aug 22 21:36:47 2014
@@ -4,6 +4,7 @@ ROW FORMAT SERDE
 STORED AS RCFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@rcfile_unionTable
 POSTHOOK: query: CREATE table rcfile_unionTable (b STRING, c STRING)
 ROW FORMAT SERDE
   'org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe'

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/recursive_dir.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/recursive_dir.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/recursive_dir.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/recursive_dir.q.out Fri Aug 22 21:36:47 2014
@@ -3,6 +3,7 @@ PREHOOK: query: -- INCLUDE_HADOOP_MAJOR_
 CREATE TABLE fact_daily(x int) PARTITIONED BY (ds STRING)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@fact_daily
 POSTHOOK: query: -- INCLUDE_HADOOP_MAJOR_VERSIONS(0.23)
 
 CREATE TABLE fact_daily(x int) PARTITIONED BY (ds STRING)
@@ -14,6 +15,7 @@ PREHOOK: query: CREATE TABLE fact_tz(x i
 PREHOOK: type: CREATETABLE
 #### A masked pattern was here ####
 PREHOOK: Output: database:default
+PREHOOK: Output: default@fact_tz
 POSTHOOK: query: CREATE TABLE fact_tz(x int) PARTITIONED BY (ds STRING, hr STRING)
 #### A masked pattern was here ####
 POSTHOOK: type: CREATETABLE

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/reduce_deduplicate.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/reduce_deduplicate.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
Files hive/branches/cbo/ql/src/test/results/clientpositive/reduce_deduplicate.q.out (original) and hive/branches/cbo/ql/src/test/results/clientpositive/reduce_deduplicate.q.out Fri Aug 22 21:36:47 2014 differ

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/reduce_deduplicate_exclude_gby.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/reduce_deduplicate_exclude_gby.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/reduce_deduplicate_exclude_gby.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/reduce_deduplicate_exclude_gby.q.out Fri Aug 22 21:36:47 2014
@@ -1,6 +1,7 @@
 PREHOOK: query: create table t1( key_int1 int, key_int2 int, key_string1 string, key_string2 string)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@t1
 POSTHOOK: query: create table t1( key_int1 int, key_int2 int, key_string1 string, key_string2 string)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/reducesink_dedup.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/reducesink_dedup.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/reducesink_dedup.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/reducesink_dedup.q.out Fri Aug 22 21:36:47 2014
@@ -16,6 +16,7 @@ CREATE TABLE part( 
 )
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@part
 POSTHOOK: query: -- data setup
 CREATE TABLE part( 
     p_partkey INT,

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/regex_col.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/regex_col.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/regex_col.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/regex_col.q.out Fri Aug 22 21:36:47 2014
@@ -138,10 +138,10 @@ STAGE PLANS:
           condition expressions:
             0 {VALUE._col0} {VALUE._col1}
             1 {VALUE._col0} {VALUE._col1}
-          outputColumnNames: _col2, _col3, _col8, _col9
+          outputColumnNames: _col2, _col3, _col9, _col10
           Statistics: Num rows: 31 Data size: 6393 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: _col2 (type: string), _col3 (type: string), _col8 (type: string), _col9 (type: string)
+            expressions: _col2 (type: string), _col3 (type: string), _col9 (type: string), _col10 (type: string)
             outputColumnNames: _col0, _col1, _col2, _col3
             Statistics: Num rows: 31 Data size: 6393 Basic stats: COMPLETE Column stats: NONE
             File Output Operator
@@ -206,10 +206,10 @@ STAGE PLANS:
           condition expressions:
             0 
             1 {KEY.reducesinkkey2} {KEY.reducesinkkey1}
-          outputColumnNames: _col8, _col9
+          outputColumnNames: _col9, _col10
           Statistics: Num rows: 2130 Data size: 6393 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: _col8 (type: string), _col9 (type: string)
+            expressions: _col9 (type: string), _col10 (type: string)
             outputColumnNames: _col0, _col1
             Statistics: Num rows: 2130 Data size: 6393 Basic stats: COMPLETE Column stats: NONE
             File Output Operator

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/remote_script.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/remote_script.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/remote_script.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/remote_script.q.out Fri Aug 22 21:36:47 2014
@@ -1,6 +1,7 @@
 PREHOOK: query: create table tmp_tmp(key string, value string) stored as rcfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@tmp_tmp
 POSTHOOK: query: create table tmp_tmp(key string, value string) stored as rcfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/rename_column.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/rename_column.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/rename_column.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/rename_column.q.out Fri Aug 22 21:36:47 2014
@@ -1,6 +1,7 @@
 PREHOOK: query: CREATE TABLE kv_rename_test(a int, b int, c int)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@kv_rename_test
 POSTHOOK: query: CREATE TABLE kv_rename_test(a int, b int, c int)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -157,16 +158,21 @@ srcpart
 PREHOOK: query: -- Using non-default Database
 CREATE DATABASE kv_rename_test_db
 PREHOOK: type: CREATEDATABASE
+PREHOOK: Output: database:kv_rename_test_db
 POSTHOOK: query: -- Using non-default Database
 CREATE DATABASE kv_rename_test_db
 POSTHOOK: type: CREATEDATABASE
+POSTHOOK: Output: database:kv_rename_test_db
 PREHOOK: query: USE kv_rename_test_db
 PREHOOK: type: SWITCHDATABASE
+PREHOOK: Input: database:kv_rename_test_db
 POSTHOOK: query: USE kv_rename_test_db
 POSTHOOK: type: SWITCHDATABASE
+POSTHOOK: Input: database:kv_rename_test_db
 PREHOOK: query: CREATE TABLE kv_rename_test(a int, b int, c int)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:kv_rename_test_db
+PREHOOK: Output: kv_rename_test_db@kv_rename_test
 POSTHOOK: query: CREATE TABLE kv_rename_test(a int, b int, c int)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:kv_rename_test_db

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/rename_external_partition_location.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/rename_external_partition_location.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/rename_external_partition_location.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/rename_external_partition_location.q.out Fri Aug 22 21:36:47 2014
@@ -5,6 +5,7 @@ PREHOOK: query: CREATE EXTERNAL TABLE ex
 PREHOOK: type: CREATETABLE
 #### A masked pattern was here ####
 PREHOOK: Output: database:default
+PREHOOK: Output: default@ex_table
 POSTHOOK: query: CREATE EXTERNAL TABLE ex_table ( key INT, value STRING)
     PARTITIONED BY (part STRING)
     STORED AS textfile

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/rename_partition_location.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/rename_partition_location.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/rename_partition_location.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/rename_partition_location.q.out Fri Aug 22 21:36:47 2014
@@ -7,6 +7,7 @@ STORED AS RCFILE
 PREHOOK: type: CREATETABLE
 #### A masked pattern was here ####
 PREHOOK: Output: database:default
+PREHOOK: Output: default@rename_partition_table
 POSTHOOK: query: -- This test verifies that if the tables location changes, renaming a partition will not change
 -- the partition location accordingly
 

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/rename_table_location.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/rename_table_location.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/rename_table_location.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/rename_table_location.q.out Fri Aug 22 21:36:47 2014
@@ -7,6 +7,7 @@ STORED AS RCFILE
 PREHOOK: type: CREATETABLE
 #### A masked pattern was here ####
 PREHOOK: Output: database:default
+PREHOOK: Output: default@rename_partition_table
 POSTHOOK: query: -- This test verifies that if the tables location changes, renaming a table will not change
 -- the table location scheme
 

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/repair.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/repair.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/repair.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/repair.q.out Fri Aug 22 21:36:47 2014
@@ -5,6 +5,7 @@ POSTHOOK: type: DROPTABLE
 PREHOOK: query: CREATE TABLE repairtable(col STRING) PARTITIONED BY (p1 STRING, p2 STRING)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@repairtable
 POSTHOOK: query: CREATE TABLE repairtable(col STRING) PARTITIONED BY (p1 STRING, p2 STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -13,27 +14,27 @@ PREHOOK: query: MSCK TABLE repairtable
 PREHOOK: type: MSCK
 POSTHOOK: query: MSCK TABLE repairtable
 POSTHOOK: type: MSCK
-PREHOOK: query: MSCK TABLE repairtable
+PREHOOK: query: MSCK TABLE default.repairtable
 PREHOOK: type: MSCK
-POSTHOOK: query: MSCK TABLE repairtable
+POSTHOOK: query: MSCK TABLE default.repairtable
 POSTHOOK: type: MSCK
 Partitions not in metastore:	repairtable:p1=a/p2=a	repairtable:p1=b/p2=a
-PREHOOK: query: MSCK REPAIR TABLE repairtable
+PREHOOK: query: MSCK REPAIR TABLE default.repairtable
 PREHOOK: type: MSCK
-POSTHOOK: query: MSCK REPAIR TABLE repairtable
+POSTHOOK: query: MSCK REPAIR TABLE default.repairtable
 POSTHOOK: type: MSCK
 Partitions not in metastore:	repairtable:p1=a/p2=a	repairtable:p1=b/p2=a
-Repair: Added partition to metastore repairtable:p1=a/p2=a
-Repair: Added partition to metastore repairtable:p1=b/p2=a
+Repair: Added partition to metastore default.repairtable:p1=a/p2=a
+Repair: Added partition to metastore default.repairtable:p1=b/p2=a
 PREHOOK: query: MSCK TABLE repairtable
 PREHOOK: type: MSCK
 POSTHOOK: query: MSCK TABLE repairtable
 POSTHOOK: type: MSCK
-PREHOOK: query: DROP TABLE repairtable
+PREHOOK: query: DROP TABLE default.repairtable
 PREHOOK: type: DROPTABLE
 PREHOOK: Input: default@repairtable
 PREHOOK: Output: default@repairtable
-POSTHOOK: query: DROP TABLE repairtable
+POSTHOOK: query: DROP TABLE default.repairtable
 POSTHOOK: type: DROPTABLE
 POSTHOOK: Input: default@repairtable
 POSTHOOK: Output: default@repairtable

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/root_dir_external_table.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/root_dir_external_table.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/root_dir_external_table.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/root_dir_external_table.q.out Fri Aug 22 21:36:47 2014
@@ -8,6 +8,7 @@ POSTHOOK: Input: default@src
 PREHOOK: type: CREATETABLE
 #### A masked pattern was here ####
 PREHOOK: Output: database:default
+PREHOOK: Output: default@roottable
 #### A masked pattern was here ####
 POSTHOOK: type: CREATETABLE
 #### A masked pattern was here ####

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/router_join_ppr.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/router_join_ppr.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
Files hive/branches/cbo/ql/src/test/results/clientpositive/router_join_ppr.q.out (original) and hive/branches/cbo/ql/src/test/results/clientpositive/router_join_ppr.q.out Fri Aug 22 21:36:47 2014 differ

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/sample1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/sample1.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
Files hive/branches/cbo/ql/src/test/results/clientpositive/sample1.q.out (original) and hive/branches/cbo/ql/src/test/results/clientpositive/sample1.q.out Fri Aug 22 21:36:47 2014 differ

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/sample10.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/sample10.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
Files hive/branches/cbo/ql/src/test/results/clientpositive/sample10.q.out (original) and hive/branches/cbo/ql/src/test/results/clientpositive/sample10.q.out Fri Aug 22 21:36:47 2014 differ

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/sample2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/sample2.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
Files hive/branches/cbo/ql/src/test/results/clientpositive/sample2.q.out (original) and hive/branches/cbo/ql/src/test/results/clientpositive/sample2.q.out Fri Aug 22 21:36:47 2014 differ

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/sample4.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/sample4.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
Files hive/branches/cbo/ql/src/test/results/clientpositive/sample4.q.out (original) and hive/branches/cbo/ql/src/test/results/clientpositive/sample4.q.out Fri Aug 22 21:36:47 2014 differ

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/sample5.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/sample5.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
Files hive/branches/cbo/ql/src/test/results/clientpositive/sample5.q.out (original) and hive/branches/cbo/ql/src/test/results/clientpositive/sample5.q.out Fri Aug 22 21:36:47 2014 differ

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/sample6.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/sample6.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
Files hive/branches/cbo/ql/src/test/results/clientpositive/sample6.q.out (original) and hive/branches/cbo/ql/src/test/results/clientpositive/sample6.q.out Fri Aug 22 21:36:47 2014 differ

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/sample7.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/sample7.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
Files hive/branches/cbo/ql/src/test/results/clientpositive/sample7.q.out (original) and hive/branches/cbo/ql/src/test/results/clientpositive/sample7.q.out Fri Aug 22 21:36:47 2014 differ

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/sample8.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/sample8.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
Files hive/branches/cbo/ql/src/test/results/clientpositive/sample8.q.out (original) and hive/branches/cbo/ql/src/test/results/clientpositive/sample8.q.out Fri Aug 22 21:36:47 2014 differ

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/sample_islocalmode_hook.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/sample_islocalmode_hook.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/sample_islocalmode_hook.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/sample_islocalmode_hook.q.out Fri Aug 22 21:36:47 2014
@@ -4,6 +4,7 @@ PREHOOK: query: -- EXCLUDE_HADOOP_MAJOR_
 create table sih_i_part (key int, value string) partitioned by (p string)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@sih_i_part
 POSTHOOK: query: -- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 0.20S)
 
 -- create file inputs

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/schemeAuthority.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/schemeAuthority.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/schemeAuthority.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/schemeAuthority.q.out Fri Aug 22 21:36:47 2014
@@ -1,6 +1,7 @@
 PREHOOK: query: create external table dynPart (key string) partitioned by (value string) row format delimited fields terminated by '\\t' stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@dynPart
 POSTHOOK: query: create external table dynPart (key string) partitioned by (value string) row format delimited fields terminated by '\\t' stored as textfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/schemeAuthority2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/schemeAuthority2.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/schemeAuthority2.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/schemeAuthority2.q.out Fri Aug 22 21:36:47 2014
@@ -1,6 +1,7 @@
 PREHOOK: query: create external table dynPart (key string) partitioned by (value string, value2 string) row format delimited fields terminated by '\\t' stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@dynPart
 POSTHOOK: query: create external table dynPart (key string) partitioned by (value string, value2 string) row format delimited fields terminated by '\\t' stored as textfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/scriptfile1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/scriptfile1.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/scriptfile1.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/scriptfile1.q.out Fri Aug 22 21:36:47 2014
@@ -2,6 +2,7 @@ PREHOOK: query: -- EXCLUDE_OS_WINDOWS
 CREATE TABLE dest1(key INT, value STRING)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@dest1
 POSTHOOK: query: -- EXCLUDE_OS_WINDOWS
 CREATE TABLE dest1(key INT, value STRING)
 POSTHOOK: type: CREATETABLE

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/select_unquote_and.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/select_unquote_and.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/select_unquote_and.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/select_unquote_and.q.out Fri Aug 22 21:36:47 2014
@@ -1,6 +1,7 @@
 PREHOOK: query: CREATE TABLE npe_test (key STRING, value STRING) PARTITIONED BY (ds STRING)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@npe_test
 POSTHOOK: query: CREATE TABLE npe_test (key STRING, value STRING) PARTITIONED BY (ds STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/select_unquote_not.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/select_unquote_not.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/select_unquote_not.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/select_unquote_not.q.out Fri Aug 22 21:36:47 2014
@@ -1,6 +1,7 @@
 PREHOOK: query: CREATE TABLE npe_test (key STRING, value STRING) PARTITIONED BY (ds STRING)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@npe_test
 POSTHOOK: query: CREATE TABLE npe_test (key STRING, value STRING) PARTITIONED BY (ds STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/select_unquote_or.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/select_unquote_or.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/select_unquote_or.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/select_unquote_or.q.out Fri Aug 22 21:36:47 2014
@@ -1,6 +1,7 @@
 PREHOOK: query: CREATE TABLE npe_test (key STRING, value STRING) PARTITIONED BY (ds STRING)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@npe_test
 POSTHOOK: query: CREATE TABLE npe_test (key STRING, value STRING) PARTITIONED BY (ds STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/semijoin.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/semijoin.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/semijoin.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/semijoin.q.out Fri Aug 22 21:36:47 2014
@@ -92,6 +92,7 @@ POSTHOOK: Input: default@t3
 PREHOOK: query: create table t4 (key int, value string)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@t4
 POSTHOOK: query: create table t4 (key int, value string)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -1247,10 +1248,10 @@ STAGE PLANS:
             0 {KEY.reducesinkkey0} {VALUE._col0}
             1 {KEY.reducesinkkey0} {VALUE._col0}
             2 
-          outputColumnNames: _col0, _col1, _col4, _col5
+          outputColumnNames: _col0, _col1, _col5, _col6
           Statistics: Num rows: 24 Data size: 178 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: _col0 (type: int), _col1 (type: string), _col4 (type: int), _col5 (type: string)
+            expressions: _col0 (type: int), _col1 (type: string), _col5 (type: int), _col6 (type: string)
             outputColumnNames: _col0, _col1, _col2, _col3
             Statistics: Num rows: 24 Data size: 178 Basic stats: COMPLETE Column stats: NONE
             File Output Operator

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/serde_regex.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/serde_regex.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/serde_regex.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/serde_regex.q.out Fri Aug 22 21:36:47 2014
@@ -64,6 +64,7 @@ WITH SERDEPROPERTIES (
 STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@serde_regex
 POSTHOOK: query: CREATE TABLE serde_regex(
   host STRING,
   identity STRING,
@@ -171,6 +172,7 @@ WITH SERDEPROPERTIES (
 STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@serde_regex1
 POSTHOOK: query: CREATE TABLE serde_regex1(
   key decimal(38,18),
   value int)
@@ -199,7 +201,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@serde_regex1
 #### A masked pattern was here ####
 NULL	0
--1234567890.123456789	-1234567890
+-1234567890.1234567890	-1234567890
 -4400	4400
 -1255.49	-1255
 -1.122	-11
@@ -208,7 +210,7 @@ NULL	0
 -0.333	0
 -0.33	0
 -0.3	0
-0	0
+0.000000000000000000	0
 0	0
 0	0
 0.01	0
@@ -219,8 +221,8 @@ NULL	0
 0.33	0
 0.333	0
 1	1
-1	1
-1	1
+1.0	1
+1.000000000000000000	1
 1.12	1
 1.122	1
 2	2
@@ -228,14 +230,14 @@ NULL	0
 3.14	3
 3.14	3
 3.14	3
-3.14	4
+3.140	4
 10	10
 20	20
 100	100
-124	124
+124.00	124
 125.2	125
 200	200
-1234567890.12345678	1234567890
+1234567890.1234567800	1234567890
 PREHOOK: query: DROP TABLE serde_regex1
 PREHOOK: type: DROPTABLE
 PREHOOK: Input: default@serde_regex1

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/serde_reported_schema.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/serde_reported_schema.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/serde_reported_schema.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/serde_reported_schema.q.out Fri Aug 22 21:36:47 2014
@@ -6,6 +6,7 @@ PREHOOK: query: create table int_string
       "serialization.format"="org.apache.thrift.protocol.TBinaryProtocol")
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@int_string
 POSTHOOK: query: create table int_string
   partitioned by (b string)
   row format serde "org.apache.hadoop.hive.serde2.thrift.ThriftDeserializer"

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/show_columns.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/show_columns.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/show_columns.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/show_columns.q.out Fri Aug 22 21:36:47 2014
@@ -1,6 +1,7 @@
 PREHOOK: query: CREATE TABLE shcol_test(KEY STRING, VALUE STRING) PARTITIONED BY(ds STRING) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@shcol_test
 POSTHOOK: query: CREATE TABLE shcol_test(KEY STRING, VALUE STRING) PARTITIONED BY(ds STRING) STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -38,16 +39,21 @@ ds                  
 PREHOOK: query: -- SHOW COLUMNS
 CREATE DATABASE test_db
 PREHOOK: type: CREATEDATABASE
+PREHOOK: Output: database:test_db
 POSTHOOK: query: -- SHOW COLUMNS
 CREATE DATABASE test_db
 POSTHOOK: type: CREATEDATABASE
+POSTHOOK: Output: database:test_db
 PREHOOK: query: USE test_db
 PREHOOK: type: SWITCHDATABASE
+PREHOOK: Input: database:test_db
 POSTHOOK: query: USE test_db
 POSTHOOK: type: SWITCHDATABASE
+POSTHOOK: Input: database:test_db
 PREHOOK: query: CREATE TABLE foo(a INT)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:test_db
+PREHOOK: Output: test_db@foo
 POSTHOOK: query: CREATE TABLE foo(a INT)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:test_db
@@ -55,9 +61,11 @@ POSTHOOK: Output: test_db@foo
 PREHOOK: query: -- SHOW COLUMNS basic syntax tests
 USE test_db
 PREHOOK: type: SWITCHDATABASE
+PREHOOK: Input: database:test_db
 POSTHOOK: query: -- SHOW COLUMNS basic syntax tests
 USE test_db
 POSTHOOK: type: SWITCHDATABASE
+POSTHOOK: Input: database:test_db
 PREHOOK: query: SHOW COLUMNS from foo
 PREHOOK: type: SHOWCOLUMNS
 PREHOOK: Input: test_db@foo
@@ -75,16 +83,21 @@ a                   
 PREHOOK: query: -- SHOW COLUMNS from a database with a name that requires escaping
 CREATE DATABASE `database`
 PREHOOK: type: CREATEDATABASE
+PREHOOK: Output: database:database
 POSTHOOK: query: -- SHOW COLUMNS from a database with a name that requires escaping
 CREATE DATABASE `database`
 POSTHOOK: type: CREATEDATABASE
+POSTHOOK: Output: database:database
 PREHOOK: query: USE `database`
 PREHOOK: type: SWITCHDATABASE
+PREHOOK: Input: database:database
 POSTHOOK: query: USE `database`
 POSTHOOK: type: SWITCHDATABASE
+POSTHOOK: Input: database:database
 PREHOOK: query: CREATE TABLE foo(a INT)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:database
+PREHOOK: Output: database@foo
 POSTHOOK: query: CREATE TABLE foo(a INT)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:database
@@ -98,8 +111,10 @@ POSTHOOK: Input: database@foo
 a                   
 PREHOOK: query: use default
 PREHOOK: type: SWITCHDATABASE
+PREHOOK: Input: database:default
 POSTHOOK: query: use default
 POSTHOOK: type: SWITCHDATABASE
+POSTHOOK: Input: database:default
 PREHOOK: query: SHOW COLUMNS from test_db.foo
 PREHOOK: type: SHOWCOLUMNS
 PREHOOK: Input: test_db@foo

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/show_create_table_alter.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/show_create_table_alter.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/show_create_table_alter.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/show_create_table_alter.q.out Fri Aug 22 21:36:47 2014
@@ -4,6 +4,7 @@ CREATE EXTERNAL TABLE tmp_showcrt1 (key 
 CLUSTERED BY (key) SORTED BY (value DESC) INTO 5 BUCKETS
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@tmp_showcrt1
 POSTHOOK: query: -- Test SHOW CREATE TABLE on an external, clustered and sorted table. Then test the query again after ALTERs.
 
 CREATE EXTERNAL TABLE tmp_showcrt1 (key smallint, value float)

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/show_create_table_db_table.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/show_create_table_db_table.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/show_create_table_db_table.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/show_create_table_db_table.q.out Fri Aug 22 21:36:47 2014
@@ -2,10 +2,12 @@ PREHOOK: query: -- Test SHOW CREATE TABL
 
 CREATE DATABASE tmp_feng comment 'for show create table test'
 PREHOOK: type: CREATEDATABASE
+PREHOOK: Output: database:tmp_feng
 POSTHOOK: query: -- Test SHOW CREATE TABLE on a table name of format "db.table".
 
 CREATE DATABASE tmp_feng comment 'for show create table test'
 POSTHOOK: type: CREATEDATABASE
+POSTHOOK: Output: database:tmp_feng
 PREHOOK: query: SHOW DATABASES
 PREHOOK: type: SHOWDATABASES
 POSTHOOK: query: SHOW DATABASES
@@ -15,14 +17,18 @@ tmp_feng
 PREHOOK: query: CREATE TABLE tmp_feng.tmp_showcrt (key string, value int)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:tmp_feng
+PREHOOK: Output: tmp_feng@tmp_feng.tmp_showcrt
 POSTHOOK: query: CREATE TABLE tmp_feng.tmp_showcrt (key string, value int)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:tmp_feng
+POSTHOOK: Output: tmp_feng@tmp_feng.tmp_showcrt
 POSTHOOK: Output: tmp_feng@tmp_showcrt
 PREHOOK: query: USE default
 PREHOOK: type: SWITCHDATABASE
+PREHOOK: Input: database:default
 POSTHOOK: query: USE default
 POSTHOOK: type: SWITCHDATABASE
+POSTHOOK: Input: database:default
 PREHOOK: query: SHOW CREATE TABLE tmp_feng.tmp_showcrt
 PREHOOK: type: SHOW_CREATETABLE
 PREHOOK: Input: tmp_feng@tmp_showcrt

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/show_create_table_delimited.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/show_create_table_delimited.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/show_create_table_delimited.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/show_create_table_delimited.q.out Fri Aug 22 21:36:47 2014
@@ -7,6 +7,7 @@ STORED AS textfile
 PREHOOK: type: CREATETABLE
 #### A masked pattern was here ####
 PREHOOK: Output: database:default
+PREHOOK: Output: default@tmp_showcrt1
 POSTHOOK: query: -- Test SHOW CREATE TABLE on a table with delimiters, stored format, and location.
 
 CREATE TABLE tmp_showcrt1 (key int, value string, newvalue bigint)

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/show_create_table_partitioned.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/show_create_table_partitioned.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/show_create_table_partitioned.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/show_create_table_partitioned.q.out Fri Aug 22 21:36:47 2014
@@ -5,6 +5,7 @@ COMMENT 'temporary table'
 PARTITIONED BY (value bigint COMMENT 'some value')
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@tmp_showcrt1
 POSTHOOK: query: -- Test SHOW CREATE TABLE on a table with partitions and column comments.
 
 CREATE EXTERNAL TABLE tmp_showcrt1 (key string, newvalue boolean COMMENT 'a new value')

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/show_create_table_serde.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/show_create_table_serde.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/show_create_table_serde.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/show_create_table_serde.q.out Fri Aug 22 21:36:47 2014
@@ -8,6 +8,7 @@ STORED AS INPUTFORMAT 'org.apache.hadoop
 OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.RCFileOutputFormat'
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@tmp_showcrt1
 POSTHOOK: query: -- Test SHOW CREATE TABLE on a table with serde.
 
 -- without a storage handler
@@ -55,6 +56,7 @@ STORED BY 'org.apache.hadoop.hive.ql.met
 WITH SERDEPROPERTIES ('field.delim'=',', 'serialization.format'='$')
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@tmp_showcrt1
 POSTHOOK: query: -- with a storage handler and serde properties
 CREATE EXTERNAL TABLE tmp_showcrt1 (key string, value boolean)
 ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe'

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/show_create_table_temp_table.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/show_create_table_temp_table.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/show_create_table_temp_table.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/show_create_table_temp_table.q.out Fri Aug 22 21:36:47 2014
@@ -1,14 +1,18 @@
 PREHOOK: query: create database tmpdb
 PREHOOK: type: CREATEDATABASE
+PREHOOK: Output: database:tmpdb
 POSTHOOK: query: create database tmpdb
 POSTHOOK: type: CREATEDATABASE
+POSTHOOK: Output: database:tmpdb
 PREHOOK: query: create temporary table tmpdb.tmp1 (c1 string, c2 string)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:tmpdb
+PREHOOK: Output: tmpdb@tmpdb.tmp1
 POSTHOOK: query: create temporary table tmpdb.tmp1 (c1 string, c2 string)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:tmpdb
 POSTHOOK: Output: tmpdb@tmp1
+POSTHOOK: Output: tmpdb@tmpdb.tmp1
 PREHOOK: query: show create table tmpdb.tmp1
 PREHOOK: type: SHOW_CREATETABLE
 PREHOOK: Input: tmpdb@tmp1

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/show_indexes_edge_cases.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/show_indexes_edge_cases.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/show_indexes_edge_cases.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/show_indexes_edge_cases.q.out Fri Aug 22 21:36:47 2014
@@ -9,6 +9,7 @@ POSTHOOK: type: DROPTABLE
 PREHOOK: query: CREATE TABLE show_idx_empty(KEY STRING, VALUE STRING)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@show_idx_empty
 POSTHOOK: query: CREATE TABLE show_idx_empty(KEY STRING, VALUE STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -16,29 +17,38 @@ POSTHOOK: Output: default@show_idx_empty
 PREHOOK: query: CREATE TABLE show_idx_full(KEY STRING, VALUE1 STRING, VALUE2 STRING)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@show_idx_full
 POSTHOOK: query: CREATE TABLE show_idx_full(KEY STRING, VALUE1 STRING, VALUE2 STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@show_idx_full
 PREHOOK: query: CREATE INDEX idx_1 ON TABLE show_idx_full(KEY) AS "COMPACT" WITH DEFERRED REBUILD
 PREHOOK: type: CREATEINDEX
+PREHOOK: Input: default@show_idx_full
 POSTHOOK: query: CREATE INDEX idx_1 ON TABLE show_idx_full(KEY) AS "COMPACT" WITH DEFERRED REBUILD
 POSTHOOK: type: CREATEINDEX
+POSTHOOK: Input: default@show_idx_full
 POSTHOOK: Output: default@default__show_idx_full_idx_1__
 PREHOOK: query: CREATE INDEX idx_2 ON TABLE show_idx_full(VALUE1) AS "COMPACT" WITH DEFERRED REBUILD
 PREHOOK: type: CREATEINDEX
+PREHOOK: Input: default@show_idx_full
 POSTHOOK: query: CREATE INDEX idx_2 ON TABLE show_idx_full(VALUE1) AS "COMPACT" WITH DEFERRED REBUILD
 POSTHOOK: type: CREATEINDEX
+POSTHOOK: Input: default@show_idx_full
 POSTHOOK: Output: default@default__show_idx_full_idx_2__
 PREHOOK: query: CREATE INDEX idx_comment ON TABLE show_idx_full(VALUE2) AS "COMPACT" WITH DEFERRED REBUILD COMMENT "index comment"
 PREHOOK: type: CREATEINDEX
+PREHOOK: Input: default@show_idx_full
 POSTHOOK: query: CREATE INDEX idx_comment ON TABLE show_idx_full(VALUE2) AS "COMPACT" WITH DEFERRED REBUILD COMMENT "index comment"
 POSTHOOK: type: CREATEINDEX
+POSTHOOK: Input: default@show_idx_full
 POSTHOOK: Output: default@default__show_idx_full_idx_comment__
 PREHOOK: query: CREATE INDEX idx_compound ON TABLE show_idx_full(KEY, VALUE1) AS "COMPACT" WITH DEFERRED REBUILD
 PREHOOK: type: CREATEINDEX
+PREHOOK: Input: default@show_idx_full
 POSTHOOK: query: CREATE INDEX idx_compound ON TABLE show_idx_full(KEY, VALUE1) AS "COMPACT" WITH DEFERRED REBUILD
 POSTHOOK: type: CREATEINDEX
+POSTHOOK: Input: default@show_idx_full
 POSTHOOK: Output: default@default__show_idx_full_idx_compound__
 PREHOOK: query: ALTER INDEX idx_1 ON show_idx_full REBUILD
 PREHOOK: type: ALTERINDEX_REBUILD
@@ -137,12 +147,16 @@ POSTHOOK: query: SHOW INDEXES ON show_id
 POSTHOOK: type: SHOWINDEXES
 PREHOOK: query: DROP INDEX idx_1 on show_idx_full
 PREHOOK: type: DROPINDEX
+PREHOOK: Input: default@show_idx_full
 POSTHOOK: query: DROP INDEX idx_1 on show_idx_full
 POSTHOOK: type: DROPINDEX
+POSTHOOK: Input: default@show_idx_full
 PREHOOK: query: DROP INDEX idx_2 on show_idx_full
 PREHOOK: type: DROPINDEX
+PREHOOK: Input: default@show_idx_full
 POSTHOOK: query: DROP INDEX idx_2 on show_idx_full
 POSTHOOK: type: DROPINDEX
+POSTHOOK: Input: default@show_idx_full
 PREHOOK: query: DROP TABLE show_idx_empty
 PREHOOK: type: DROPTABLE
 PREHOOK: Input: default@show_idx_empty

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/show_indexes_syntax.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/show_indexes_syntax.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/show_indexes_syntax.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/show_indexes_syntax.q.out Fri Aug 22 21:36:47 2014
@@ -5,14 +5,17 @@ POSTHOOK: type: DROPTABLE
 PREHOOK: query: CREATE TABLE show_idx_t1(KEY STRING, VALUE STRING)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@show_idx_t1
 POSTHOOK: query: CREATE TABLE show_idx_t1(KEY STRING, VALUE STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@show_idx_t1
 PREHOOK: query: CREATE INDEX idx_t1 ON TABLE show_idx_t1(KEY) AS "COMPACT" WITH DEFERRED REBUILD
 PREHOOK: type: CREATEINDEX
+PREHOOK: Input: default@show_idx_t1
 POSTHOOK: query: CREATE INDEX idx_t1 ON TABLE show_idx_t1(KEY) AS "COMPACT" WITH DEFERRED REBUILD
 POSTHOOK: type: CREATEINDEX
+POSTHOOK: Input: default@show_idx_t1
 POSTHOOK: Output: default@default__show_idx_t1_idx_t1__
 PREHOOK: query: ALTER INDEX idx_t1 ON show_idx_t1 REBUILD
 PREHOOK: type: ALTERINDEX_REBUILD

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/show_partitions.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/show_partitions.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/show_partitions.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/show_partitions.q.out Fri Aug 22 21:36:47 2014
@@ -41,3 +41,134 @@ POSTHOOK: query: SHOW PARTITIONS srcpart
 POSTHOOK: type: SHOWPARTITIONS
 POSTHOOK: Input: default@srcpart
 ds=2008-04-08/hr=12
+PREHOOK: query: SHOW PARTITIONS default.srcpart
+PREHOOK: type: SHOWPARTITIONS
+PREHOOK: Input: default@srcpart
+POSTHOOK: query: SHOW PARTITIONS default.srcpart
+POSTHOOK: type: SHOWPARTITIONS
+POSTHOOK: Input: default@srcpart
+ds=2008-04-08/hr=11
+ds=2008-04-08/hr=12
+ds=2008-04-09/hr=11
+ds=2008-04-09/hr=12
+PREHOOK: query: SHOW PARTITIONS default.srcpart PARTITION(hr='11')
+PREHOOK: type: SHOWPARTITIONS
+PREHOOK: Input: default@srcpart
+POSTHOOK: query: SHOW PARTITIONS default.srcpart PARTITION(hr='11')
+POSTHOOK: type: SHOWPARTITIONS
+POSTHOOK: Input: default@srcpart
+ds=2008-04-08/hr=11
+ds=2008-04-09/hr=11
+PREHOOK: query: SHOW PARTITIONS default.srcpart PARTITION(ds='2008-04-08')
+PREHOOK: type: SHOWPARTITIONS
+PREHOOK: Input: default@srcpart
+POSTHOOK: query: SHOW PARTITIONS default.srcpart PARTITION(ds='2008-04-08')
+POSTHOOK: type: SHOWPARTITIONS
+POSTHOOK: Input: default@srcpart
+ds=2008-04-08/hr=11
+ds=2008-04-08/hr=12
+PREHOOK: query: SHOW PARTITIONS default.srcpart PARTITION(ds='2008-04-08', hr='12')
+PREHOOK: type: SHOWPARTITIONS
+PREHOOK: Input: default@srcpart
+POSTHOOK: query: SHOW PARTITIONS default.srcpart PARTITION(ds='2008-04-08', hr='12')
+POSTHOOK: type: SHOWPARTITIONS
+POSTHOOK: Input: default@srcpart
+ds=2008-04-08/hr=12
+PREHOOK: query: CREATE DATABASE db1
+PREHOOK: type: CREATEDATABASE
+PREHOOK: Output: database:db1
+POSTHOOK: query: CREATE DATABASE db1
+POSTHOOK: type: CREATEDATABASE
+POSTHOOK: Output: database:db1
+PREHOOK: query: USE db1
+PREHOOK: type: SWITCHDATABASE
+PREHOOK: Input: database:db1
+POSTHOOK: query: USE db1
+POSTHOOK: type: SWITCHDATABASE
+POSTHOOK: Input: database:db1
+PREHOOK: query: CREATE TABLE srcpart (key1 INT, value1 STRING) PARTITIONED BY (ds STRING, hr STRING)
+PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:db1
+PREHOOK: Output: db1@srcpart
+POSTHOOK: query: CREATE TABLE srcpart (key1 INT, value1 STRING) PARTITIONED BY (ds STRING, hr STRING)
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:db1
+POSTHOOK: Output: db1@srcpart
+PREHOOK: query: ALTER TABLE srcpart ADD PARTITION (ds='3', hr='3')
+PREHOOK: type: ALTERTABLE_ADDPARTS
+PREHOOK: Output: db1@srcpart
+POSTHOOK: query: ALTER TABLE srcpart ADD PARTITION (ds='3', hr='3')
+POSTHOOK: type: ALTERTABLE_ADDPARTS
+POSTHOOK: Output: db1@srcpart
+POSTHOOK: Output: db1@srcpart@ds=3/hr=3
+PREHOOK: query: ALTER TABLE srcpart ADD PARTITION (ds='4', hr='4')
+PREHOOK: type: ALTERTABLE_ADDPARTS
+PREHOOK: Output: db1@srcpart
+POSTHOOK: query: ALTER TABLE srcpart ADD PARTITION (ds='4', hr='4')
+POSTHOOK: type: ALTERTABLE_ADDPARTS
+POSTHOOK: Output: db1@srcpart
+POSTHOOK: Output: db1@srcpart@ds=4/hr=4
+PREHOOK: query: ALTER TABLE srcpart ADD PARTITION (ds='4', hr='5')
+PREHOOK: type: ALTERTABLE_ADDPARTS
+PREHOOK: Output: db1@srcpart
+POSTHOOK: query: ALTER TABLE srcpart ADD PARTITION (ds='4', hr='5')
+POSTHOOK: type: ALTERTABLE_ADDPARTS
+POSTHOOK: Output: db1@srcpart
+POSTHOOK: Output: db1@srcpart@ds=4/hr=5
+PREHOOK: query: -- from db1 to default db
+SHOW PARTITIONS default.srcpart PARTITION(hr='11')
+PREHOOK: type: SHOWPARTITIONS
+PREHOOK: Input: default@srcpart
+POSTHOOK: query: -- from db1 to default db
+SHOW PARTITIONS default.srcpart PARTITION(hr='11')
+POSTHOOK: type: SHOWPARTITIONS
+POSTHOOK: Input: default@srcpart
+ds=2008-04-08/hr=11
+ds=2008-04-09/hr=11
+PREHOOK: query: SHOW PARTITIONS default.srcpart PARTITION(ds='2008-04-08', hr='12')
+PREHOOK: type: SHOWPARTITIONS
+PREHOOK: Input: default@srcpart
+POSTHOOK: query: SHOW PARTITIONS default.srcpart PARTITION(ds='2008-04-08', hr='12')
+POSTHOOK: type: SHOWPARTITIONS
+POSTHOOK: Input: default@srcpart
+ds=2008-04-08/hr=12
+PREHOOK: query: -- from db1 to db1
+SHOW PARTITIONS srcpart PARTITION(ds='4')
+PREHOOK: type: SHOWPARTITIONS
+PREHOOK: Input: db1@srcpart
+POSTHOOK: query: -- from db1 to db1
+SHOW PARTITIONS srcpart PARTITION(ds='4')
+POSTHOOK: type: SHOWPARTITIONS
+POSTHOOK: Input: db1@srcpart
+ds=4/hr=4
+ds=4/hr=5
+PREHOOK: query: SHOW PARTITIONS srcpart PARTITION(ds='3', hr='3')
+PREHOOK: type: SHOWPARTITIONS
+PREHOOK: Input: db1@srcpart
+POSTHOOK: query: SHOW PARTITIONS srcpart PARTITION(ds='3', hr='3')
+POSTHOOK: type: SHOWPARTITIONS
+POSTHOOK: Input: db1@srcpart
+ds=3/hr=3
+PREHOOK: query: use default
+PREHOOK: type: SWITCHDATABASE
+PREHOOK: Input: database:default
+POSTHOOK: query: use default
+POSTHOOK: type: SWITCHDATABASE
+POSTHOOK: Input: database:default
+PREHOOK: query: -- from default to db1
+SHOW PARTITIONS db1.srcpart PARTITION(ds='4')
+PREHOOK: type: SHOWPARTITIONS
+PREHOOK: Input: db1@srcpart
+POSTHOOK: query: -- from default to db1
+SHOW PARTITIONS db1.srcpart PARTITION(ds='4')
+POSTHOOK: type: SHOWPARTITIONS
+POSTHOOK: Input: db1@srcpart
+ds=4/hr=4
+ds=4/hr=5
+PREHOOK: query: SHOW PARTITIONS db1.srcpart PARTITION(ds='3', hr='3')
+PREHOOK: type: SHOWPARTITIONS
+PREHOOK: Input: db1@srcpart
+POSTHOOK: query: SHOW PARTITIONS db1.srcpart PARTITION(ds='3', hr='3')
+POSTHOOK: type: SHOWPARTITIONS
+POSTHOOK: Input: db1@srcpart
+ds=3/hr=3

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/show_tables.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/show_tables.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/show_tables.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/show_tables.q.out Fri Aug 22 21:36:47 2014
@@ -1,6 +1,7 @@
 PREHOOK: query: CREATE TABLE shtb_test1(KEY STRING, VALUE STRING) PARTITIONED BY(ds STRING) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@shtb_test1
 POSTHOOK: query: CREATE TABLE shtb_test1(KEY STRING, VALUE STRING) PARTITIONED BY(ds STRING) STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -8,6 +9,7 @@ POSTHOOK: Output: default@shtb_test1
 PREHOOK: query: CREATE TABLE shtb_test2(KEY STRING, VALUE STRING) PARTITIONED BY(ds STRING) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@shtb_test2
 POSTHOOK: query: CREATE TABLE shtb_test2(KEY STRING, VALUE STRING) PARTITIONED BY(ds STRING) STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -73,16 +75,21 @@ shtb_test2
 PREHOOK: query: -- SHOW TABLES FROM/IN database
 CREATE DATABASE test_db
 PREHOOK: type: CREATEDATABASE
+PREHOOK: Output: database:test_db
 POSTHOOK: query: -- SHOW TABLES FROM/IN database
 CREATE DATABASE test_db
 POSTHOOK: type: CREATEDATABASE
+POSTHOOK: Output: database:test_db
 PREHOOK: query: USE test_db
 PREHOOK: type: SWITCHDATABASE
+PREHOOK: Input: database:test_db
 POSTHOOK: query: USE test_db
 POSTHOOK: type: SWITCHDATABASE
+POSTHOOK: Input: database:test_db
 PREHOOK: query: CREATE TABLE foo(a INT)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:test_db
+PREHOOK: Output: test_db@foo
 POSTHOOK: query: CREATE TABLE foo(a INT)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:test_db
@@ -90,6 +97,7 @@ POSTHOOK: Output: test_db@foo
 PREHOOK: query: CREATE TABLE bar(a INT)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:test_db
+PREHOOK: Output: test_db@bar
 POSTHOOK: query: CREATE TABLE bar(a INT)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:test_db
@@ -97,6 +105,7 @@ POSTHOOK: Output: test_db@bar
 PREHOOK: query: CREATE TABLE baz(a INT)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:test_db
+PREHOOK: Output: test_db@baz
 POSTHOOK: query: CREATE TABLE baz(a INT)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:test_db
@@ -104,9 +113,11 @@ POSTHOOK: Output: test_db@baz
 PREHOOK: query: -- SHOW TABLES basic syntax tests
 USE default
 PREHOOK: type: SWITCHDATABASE
+PREHOOK: Input: database:default
 POSTHOOK: query: -- SHOW TABLES basic syntax tests
 USE default
 POSTHOOK: type: SWITCHDATABASE
+POSTHOOK: Input: database:default
 PREHOOK: query: SHOW TABLES FROM test_db
 PREHOOK: type: SHOWTABLES
 POSTHOOK: query: SHOW TABLES FROM test_db
@@ -162,24 +173,31 @@ POSTHOOK: type: SHOWTABLES
 PREHOOK: query: -- SHOW TABLES from a database with a name that requires escaping
 CREATE DATABASE `database`
 PREHOOK: type: CREATEDATABASE
+PREHOOK: Output: database:database
 POSTHOOK: query: -- SHOW TABLES from a database with a name that requires escaping
 CREATE DATABASE `database`
 POSTHOOK: type: CREATEDATABASE
+POSTHOOK: Output: database:database
 PREHOOK: query: USE `database`
 PREHOOK: type: SWITCHDATABASE
+PREHOOK: Input: database:database
 POSTHOOK: query: USE `database`
 POSTHOOK: type: SWITCHDATABASE
+POSTHOOK: Input: database:database
 PREHOOK: query: CREATE TABLE foo(a INT)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:database
+PREHOOK: Output: database@foo
 POSTHOOK: query: CREATE TABLE foo(a INT)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:database
 POSTHOOK: Output: database@foo
 PREHOOK: query: USE default
 PREHOOK: type: SWITCHDATABASE
+PREHOOK: Input: database:default
 POSTHOOK: query: USE default
 POSTHOOK: type: SWITCHDATABASE
+POSTHOOK: Input: database:default
 PREHOOK: query: SHOW TABLES FROM `database` LIKE "foo"
 PREHOOK: type: SHOWTABLES
 POSTHOOK: query: SHOW TABLES FROM `database` LIKE "foo"

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/show_tblproperties.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/show_tblproperties.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/show_tblproperties.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/show_tblproperties.q.out Fri Aug 22 21:36:47 2014
@@ -1,6 +1,7 @@
 PREHOOK: query: create table tmpfoo (a String)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@tmpfoo
 POSTHOOK: query: create table tmpfoo (a String)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -10,6 +11,11 @@ PREHOOK: type: SHOW_TBLPROPERTIES
 POSTHOOK: query: show tblproperties tmpfoo("bar")
 POSTHOOK: type: SHOW_TBLPROPERTIES
 Table default.tmpfoo does not have property: bar	 
+PREHOOK: query: show tblproperties default.tmpfoo("bar")
+PREHOOK: type: SHOW_TBLPROPERTIES
+POSTHOOK: query: show tblproperties default.tmpfoo("bar")
+POSTHOOK: type: SHOW_TBLPROPERTIES
+Table default.tmpfoo does not have property: bar	 
 PREHOOK: query: alter table tmpfoo set tblproperties ("bar" = "bar value")
 PREHOOK: type: ALTERTABLE_PROPERTIES
 PREHOOK: Input: default@tmpfoo
@@ -44,11 +50,123 @@ PREHOOK: type: SHOW_TBLPROPERTIES
 POSTHOOK: query: show tblproperties tmpfoo("bar")
 POSTHOOK: type: SHOW_TBLPROPERTIES
 bar value	 
-PREHOOK: query: drop table tmpfoo
-PREHOOK: type: DROPTABLE
-PREHOOK: Input: default@tmpfoo
-PREHOOK: Output: default@tmpfoo
-POSTHOOK: query: drop table tmpfoo
-POSTHOOK: type: DROPTABLE
-POSTHOOK: Input: default@tmpfoo
-POSTHOOK: Output: default@tmpfoo
+PREHOOK: query: show tblproperties default.tmpfoo
+PREHOOK: type: SHOW_TBLPROPERTIES
+POSTHOOK: query: show tblproperties default.tmpfoo
+POSTHOOK: type: SHOW_TBLPROPERTIES
+COLUMN_STATS_ACCURATE	false
+bar	bar value
+#### A masked pattern was here ####
+numFiles	0
+numRows	-1
+rawDataSize	-1
+tmp	true
+totalSize	0
+#### A masked pattern was here ####
+PREHOOK: query: show tblproperties default.tmpfoo("bar")
+PREHOOK: type: SHOW_TBLPROPERTIES
+POSTHOOK: query: show tblproperties default.tmpfoo("bar")
+POSTHOOK: type: SHOW_TBLPROPERTIES
+bar value	 
+PREHOOK: query: CREATE DATABASE db1
+PREHOOK: type: CREATEDATABASE
+PREHOOK: Output: database:db1
+POSTHOOK: query: CREATE DATABASE db1
+POSTHOOK: type: CREATEDATABASE
+POSTHOOK: Output: database:db1
+PREHOOK: query: USE db1
+PREHOOK: type: SWITCHDATABASE
+PREHOOK: Input: database:db1
+POSTHOOK: query: USE db1
+POSTHOOK: type: SWITCHDATABASE
+POSTHOOK: Input: database:db1
+PREHOOK: query: CREATE TABLE tmpfoo (b STRING)
+PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:db1
+PREHOOK: Output: db1@tmpfoo
+POSTHOOK: query: CREATE TABLE tmpfoo (b STRING)
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:db1
+POSTHOOK: Output: db1@tmpfoo
+PREHOOK: query: alter table tmpfoo set tblproperties ("bar" = "bar value1")
+PREHOOK: type: ALTERTABLE_PROPERTIES
+PREHOOK: Input: db1@tmpfoo
+PREHOOK: Output: db1@tmpfoo
+POSTHOOK: query: alter table tmpfoo set tblproperties ("bar" = "bar value1")
+POSTHOOK: type: ALTERTABLE_PROPERTIES
+POSTHOOK: Input: db1@tmpfoo
+POSTHOOK: Output: db1@tmpfoo
+PREHOOK: query: alter table tmpfoo set tblproperties ("tmp" = "true1")
+PREHOOK: type: ALTERTABLE_PROPERTIES
+PREHOOK: Input: db1@tmpfoo
+PREHOOK: Output: db1@tmpfoo
+POSTHOOK: query: alter table tmpfoo set tblproperties ("tmp" = "true1")
+POSTHOOK: type: ALTERTABLE_PROPERTIES
+POSTHOOK: Input: db1@tmpfoo
+POSTHOOK: Output: db1@tmpfoo
+PREHOOK: query: -- from db1 to default db
+show tblproperties default.tmpfoo
+PREHOOK: type: SHOW_TBLPROPERTIES
+POSTHOOK: query: -- from db1 to default db
+show tblproperties default.tmpfoo
+POSTHOOK: type: SHOW_TBLPROPERTIES
+COLUMN_STATS_ACCURATE	false
+bar	bar value
+#### A masked pattern was here ####
+numFiles	0
+numRows	-1
+rawDataSize	-1
+tmp	true
+totalSize	0
+#### A masked pattern was here ####
+PREHOOK: query: show tblproperties default.tmpfoo("bar")
+PREHOOK: type: SHOW_TBLPROPERTIES
+POSTHOOK: query: show tblproperties default.tmpfoo("bar")
+POSTHOOK: type: SHOW_TBLPROPERTIES
+bar value	 
+PREHOOK: query: -- from db1 to db1
+show tblproperties tmpfoo
+PREHOOK: type: SHOW_TBLPROPERTIES
+POSTHOOK: query: -- from db1 to db1
+show tblproperties tmpfoo
+POSTHOOK: type: SHOW_TBLPROPERTIES
+COLUMN_STATS_ACCURATE	false
+bar	bar value1
+#### A masked pattern was here ####
+numFiles	0
+numRows	-1
+rawDataSize	-1
+tmp	true1
+totalSize	0
+#### A masked pattern was here ####
+PREHOOK: query: show tblproperties tmpfoo("bar")
+PREHOOK: type: SHOW_TBLPROPERTIES
+POSTHOOK: query: show tblproperties tmpfoo("bar")
+POSTHOOK: type: SHOW_TBLPROPERTIES
+bar value1	 
+PREHOOK: query: use default
+PREHOOK: type: SWITCHDATABASE
+PREHOOK: Input: database:default
+POSTHOOK: query: use default
+POSTHOOK: type: SWITCHDATABASE
+POSTHOOK: Input: database:default
+PREHOOK: query: -- from default to db1
+show tblproperties db1.tmpfoo
+PREHOOK: type: SHOW_TBLPROPERTIES
+POSTHOOK: query: -- from default to db1
+show tblproperties db1.tmpfoo
+POSTHOOK: type: SHOW_TBLPROPERTIES
+COLUMN_STATS_ACCURATE	false
+bar	bar value1
+#### A masked pattern was here ####
+numFiles	0
+numRows	-1
+rawDataSize	-1
+tmp	true1
+totalSize	0
+#### A masked pattern was here ####
+PREHOOK: query: show tblproperties db1.tmpfoo("bar")
+PREHOOK: type: SHOW_TBLPROPERTIES
+POSTHOOK: query: show tblproperties db1.tmpfoo("bar")
+POSTHOOK: type: SHOW_TBLPROPERTIES
+bar value1	 

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/skewjoin.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/skewjoin.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/skewjoin.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/skewjoin.q.out Fri Aug 22 21:36:47 2014
@@ -1,6 +1,7 @@
 PREHOOK: query: CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@T1
 POSTHOOK: query: CREATE TABLE T1(key STRING, val STRING) STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -8,6 +9,7 @@ POSTHOOK: Output: default@T1
 PREHOOK: query: CREATE TABLE T2(key STRING, val STRING) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@T2
 POSTHOOK: query: CREATE TABLE T2(key STRING, val STRING) STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -15,6 +17,7 @@ POSTHOOK: Output: default@T2
 PREHOOK: query: CREATE TABLE T3(key STRING, val STRING) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@T3
 POSTHOOK: query: CREATE TABLE T3(key STRING, val STRING) STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -22,6 +25,7 @@ POSTHOOK: Output: default@T3
 PREHOOK: query: CREATE TABLE T4(key STRING, val STRING) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@T4
 POSTHOOK: query: CREATE TABLE T4(key STRING, val STRING) STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -29,6 +33,7 @@ POSTHOOK: Output: default@T4
 PREHOOK: query: CREATE TABLE dest_j1(key INT, value STRING) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@dest_j1
 POSTHOOK: query: CREATE TABLE dest_j1(key INT, value STRING) STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -116,10 +121,10 @@ STAGE PLANS:
             0 {KEY.reducesinkkey0}
             1 {VALUE._col0}
           handleSkewJoin: true
-          outputColumnNames: _col0, _col5
+          outputColumnNames: _col0, _col6
           Statistics: Num rows: 31 Data size: 3196 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: UDFToInteger(_col0) (type: int), _col5 (type: string)
+            expressions: UDFToInteger(_col0) (type: int), _col6 (type: string)
             outputColumnNames: _col0, _col1
             Statistics: Num rows: 31 Data size: 3196 Basic stats: COMPLETE Column stats: NONE
             File Output Operator
@@ -164,9 +169,9 @@ STAGE PLANS:
               keys:
                 0 reducesinkkey0 (type: string)
                 1 reducesinkkey0 (type: string)
-              outputColumnNames: _col0, _col5
+              outputColumnNames: _col0, _col6
               Select Operator
-                expressions: UDFToInteger(_col0) (type: int), _col5 (type: string)
+                expressions: UDFToInteger(_col0) (type: int), _col6 (type: string)
                 outputColumnNames: _col0, _col1
                 File Output Operator
                   compressed: false
@@ -291,10 +296,10 @@ STAGE PLANS:
             1 {KEY.reducesinkkey0} {VALUE._col0}
             2 {KEY.reducesinkkey0} {VALUE._col0}
             3 {KEY.reducesinkkey0} {VALUE._col0}
-          outputColumnNames: _col0, _col1, _col4, _col5, _col8, _col9, _col12, _col13
+          outputColumnNames: _col0, _col1, _col5, _col6, _col10, _col11, _col15, _col16
           Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
           Select Operator
-            expressions: _col0 (type: string), _col1 (type: string), _col4 (type: string), _col5 (type: string), _col8 (type: string), _col9 (type: string), _col12 (type: string), _col13 (type: string)
+            expressions: _col0 (type: string), _col1 (type: string), _col5 (type: string), _col6 (type: string), _col10 (type: string), _col11 (type: string), _col15 (type: string), _col16 (type: string)
             outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7
             Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
             File Output Operator
@@ -411,10 +416,10 @@ STAGE PLANS:
             1 {KEY.reducesinkkey0} {VALUE._col0}
             2 {KEY.reducesinkkey0} {VALUE._col0}
             3 {KEY.reducesinkkey0} {VALUE._col0}
-          outputColumnNames: _col0, _col1, _col4, _col5, _col8, _col9, _col12, _col13
+          outputColumnNames: _col0, _col1, _col5, _col6, _col10, _col11, _col15, _col16
           Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
           Select Operator
-            expressions: _col0 (type: string), _col1 (type: string), _col4 (type: string), _col5 (type: string), _col8 (type: string), _col9 (type: string), _col12 (type: string), _col13 (type: string)
+            expressions: _col0 (type: string), _col1 (type: string), _col5 (type: string), _col6 (type: string), _col10 (type: string), _col11 (type: string), _col15 (type: string), _col16 (type: string)
             outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7
             Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
             File Output Operator
@@ -496,14 +501,14 @@ STAGE PLANS:
           condition expressions:
             0 {VALUE._col0} {VALUE._col1}
             1 {VALUE._col0}
-          outputColumnNames: _col0, _col1, _col4
+          outputColumnNames: _col0, _col1, _col5
           Statistics: Num rows: 31 Data size: 3196 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: _col0 (type: string), _col1 (type: string), _col4 (type: string)
-            outputColumnNames: _col0, _col1, _col4
+            expressions: _col0 (type: string), _col1 (type: string), _col5 (type: string)
+            outputColumnNames: _col0, _col1, _col5
             Statistics: Num rows: 31 Data size: 3196 Basic stats: COMPLETE Column stats: NONE
             Group By Operator
-              aggregations: sum(hash(_col0)), sum(hash(_col1)), sum(hash(_col4))
+              aggregations: sum(hash(_col0)), sum(hash(_col1)), sum(hash(_col5))
               mode: hash
               outputColumnNames: _col0, _col1, _col2
               Statistics: Num rows: 1 Data size: 24 Basic stats: COMPLETE Column stats: NONE
@@ -1273,14 +1278,14 @@ STAGE PLANS:
               keys:
                 0 (key + 1) (type: double)
                 1 UDFToDouble(key) (type: double)
-              outputColumnNames: _col0, _col5
+              outputColumnNames: _col0, _col6
               Statistics: Num rows: 0 Data size: 33 Basic stats: PARTIAL Column stats: NONE
               Select Operator
-                expressions: _col0 (type: string), _col5 (type: string)
-                outputColumnNames: _col0, _col5
+                expressions: _col0 (type: string), _col6 (type: string)
+                outputColumnNames: _col0, _col6
                 Statistics: Num rows: 0 Data size: 33 Basic stats: PARTIAL Column stats: NONE
                 Group By Operator
-                  aggregations: sum(hash(_col0)), sum(hash(_col5))
+                  aggregations: sum(hash(_col0)), sum(hash(_col6))
                   mode: hash
                   outputColumnNames: _col0, _col1
                   Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE Column stats: NONE

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/skewjoin_union_remove_1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/skewjoin_union_remove_1.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/skewjoin_union_remove_1.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/skewjoin_union_remove_1.q.out Fri Aug 22 21:36:47 2014
@@ -10,6 +10,7 @@ CREATE TABLE T1(key STRING, val STRING)
 SKEWED BY (key) ON ((2)) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@T1
 POSTHOOK: query: -- This is to test the union->selectstar->filesink and skewjoin optimization
 -- Union of 2 map-reduce subqueries is performed for the skew join
 -- There is no need to write the temporary results of the sub-queries, and then read them 
@@ -35,6 +36,7 @@ PREHOOK: query: CREATE TABLE T2(key STRI
 SKEWED BY (key) ON ((3)) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@T2
 POSTHOOK: query: CREATE TABLE T2(key STRING, val STRING)
 SKEWED BY (key) ON ((3)) STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
@@ -98,10 +100,10 @@ STAGE PLANS:
           condition expressions:
             0 {KEY.reducesinkkey0} {VALUE._col0}
             1 {KEY.reducesinkkey0} {VALUE._col0}
-          outputColumnNames: _col0, _col1, _col4, _col5
+          outputColumnNames: _col0, _col1, _col5, _col6
           Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
           Select Operator
-            expressions: _col0 (type: string), _col1 (type: string), _col4 (type: string), _col5 (type: string)
+            expressions: _col0 (type: string), _col1 (type: string), _col5 (type: string), _col6 (type: string)
             outputColumnNames: _col0, _col1, _col2, _col3
             Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
             File Output Operator
@@ -146,10 +148,10 @@ STAGE PLANS:
           condition expressions:
             0 {KEY.reducesinkkey0} {VALUE._col0}
             1 {KEY.reducesinkkey0} {VALUE._col0}
-          outputColumnNames: _col0, _col1, _col4, _col5
+          outputColumnNames: _col0, _col1, _col5, _col6
           Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
           Select Operator
-            expressions: _col0 (type: string), _col1 (type: string), _col4 (type: string), _col5 (type: string)
+            expressions: _col0 (type: string), _col1 (type: string), _col5 (type: string), _col6 (type: string)
             outputColumnNames: _col0, _col1, _col2, _col3
             Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
             File Output Operator
@@ -234,10 +236,10 @@ STAGE PLANS:
           condition expressions:
             0 {KEY.reducesinkkey0} {VALUE._col0}
             1 {KEY.reducesinkkey0} {VALUE._col0}
-          outputColumnNames: _col0, _col1, _col4, _col5
+          outputColumnNames: _col0, _col1, _col5, _col6
           Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
           Select Operator
-            expressions: _col0 (type: string), _col1 (type: string), _col4 (type: string), _col5 (type: string)
+            expressions: _col0 (type: string), _col1 (type: string), _col5 (type: string), _col6 (type: string)
             outputColumnNames: _col0, _col1, _col2, _col3
             Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
             File Output Operator
@@ -282,10 +284,10 @@ STAGE PLANS:
           condition expressions:
             0 {KEY.reducesinkkey0} {VALUE._col0}
             1 {KEY.reducesinkkey0} {VALUE._col0}
-          outputColumnNames: _col0, _col1, _col4, _col5
+          outputColumnNames: _col0, _col1, _col5, _col6
           Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
           Select Operator
-            expressions: _col0 (type: string), _col1 (type: string), _col4 (type: string), _col5 (type: string)
+            expressions: _col0 (type: string), _col1 (type: string), _col5 (type: string), _col6 (type: string)
             outputColumnNames: _col0, _col1, _col2, _col3
             Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
             File Output Operator
@@ -325,6 +327,7 @@ NULL	NULL	5	15
 PREHOOK: query: create table DEST1(key1 STRING, val1 STRING, key2 STRING, val2 STRING)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@DEST1
 POSTHOOK: query: create table DEST1(key1 STRING, val1 STRING, key2 STRING, val2 STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -377,10 +380,10 @@ STAGE PLANS:
           condition expressions:
             0 {KEY.reducesinkkey0} {VALUE._col0}
             1 {KEY.reducesinkkey0} {VALUE._col0}
-          outputColumnNames: _col0, _col1, _col4, _col5
+          outputColumnNames: _col0, _col1, _col5, _col6
           Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
           Select Operator
-            expressions: _col0 (type: string), _col1 (type: string), _col4 (type: string), _col5 (type: string)
+            expressions: _col0 (type: string), _col1 (type: string), _col5 (type: string), _col6 (type: string)
             outputColumnNames: _col0, _col1, _col2, _col3
             Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
             File Output Operator
@@ -436,10 +439,10 @@ STAGE PLANS:
           condition expressions:
             0 {KEY.reducesinkkey0} {VALUE._col0}
             1 {KEY.reducesinkkey0} {VALUE._col0}
-          outputColumnNames: _col0, _col1, _col4, _col5
+          outputColumnNames: _col0, _col1, _col5, _col6
           Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
           Select Operator
-            expressions: _col0 (type: string), _col1 (type: string), _col4 (type: string), _col5 (type: string)
+            expressions: _col0 (type: string), _col1 (type: string), _col5 (type: string), _col6 (type: string)
             outputColumnNames: _col0, _col1, _col2, _col3
             Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
             File Output Operator
@@ -531,10 +534,10 @@ STAGE PLANS:
           condition expressions:
             0 {KEY.reducesinkkey0} {VALUE._col0}
             1 {KEY.reducesinkkey0} {VALUE._col0}
-          outputColumnNames: _col0, _col1, _col4, _col5
+          outputColumnNames: _col0, _col1, _col5, _col6
           Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
           Select Operator
-            expressions: _col0 (type: string), _col1 (type: string), _col4 (type: string), _col5 (type: string)
+            expressions: _col0 (type: string), _col1 (type: string), _col5 (type: string), _col6 (type: string)
             outputColumnNames: _col0, _col1, _col2, _col3
             Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
             File Output Operator
@@ -590,10 +593,10 @@ STAGE PLANS:
           condition expressions:
             0 {KEY.reducesinkkey0} {VALUE._col0}
             1 {KEY.reducesinkkey0} {VALUE._col0}
-          outputColumnNames: _col0, _col1, _col4, _col5
+          outputColumnNames: _col0, _col1, _col5, _col6
           Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
           Select Operator
-            expressions: _col0 (type: string), _col1 (type: string), _col4 (type: string), _col5 (type: string)
+            expressions: _col0 (type: string), _col1 (type: string), _col5 (type: string), _col6 (type: string)
             outputColumnNames: _col0, _col1, _col2, _col3
             Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
             File Output Operator

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/skewjoin_union_remove_2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/skewjoin_union_remove_2.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/skewjoin_union_remove_2.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/skewjoin_union_remove_2.q.out Fri Aug 22 21:36:47 2014
@@ -2,6 +2,7 @@ PREHOOK: query: CREATE TABLE T1(key STRI
 SKEWED BY (key) ON ((2), (8)) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@T1
 POSTHOOK: query: CREATE TABLE T1(key STRING, val STRING)
 SKEWED BY (key) ON ((2), (8)) STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
@@ -19,6 +20,7 @@ PREHOOK: query: CREATE TABLE T2(key STRI
 SKEWED BY (key) ON ((3), (8)) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@T2
 POSTHOOK: query: CREATE TABLE T2(key STRING, val STRING)
 SKEWED BY (key) ON ((3), (8)) STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
@@ -35,6 +37,7 @@ POSTHOOK: Output: default@t2
 PREHOOK: query: CREATE TABLE T3(key STRING, val STRING) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@T3
 POSTHOOK: query: CREATE TABLE T3(key STRING, val STRING) STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -123,10 +126,10 @@ STAGE PLANS:
             0 {KEY.reducesinkkey0} {VALUE._col0}
             1 {KEY.reducesinkkey0} {VALUE._col0}
             2 {KEY.reducesinkkey0} {VALUE._col0}
-          outputColumnNames: _col0, _col1, _col4, _col5, _col8, _col9
+          outputColumnNames: _col0, _col1, _col5, _col6, _col10, _col11
           Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
           Select Operator
-            expressions: _col0 (type: string), _col1 (type: string), _col4 (type: string), _col5 (type: string), _col8 (type: string), _col9 (type: string)
+            expressions: _col0 (type: string), _col1 (type: string), _col5 (type: string), _col6 (type: string), _col10 (type: string), _col11 (type: string)
             outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
             Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
             File Output Operator
@@ -185,10 +188,10 @@ STAGE PLANS:
             0 {KEY.reducesinkkey0} {VALUE._col0}
             1 {KEY.reducesinkkey0} {VALUE._col0}
             2 {KEY.reducesinkkey0} {VALUE._col0}
-          outputColumnNames: _col0, _col1, _col4, _col5, _col8, _col9
+          outputColumnNames: _col0, _col1, _col5, _col6, _col10, _col11
           Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
           Select Operator
-            expressions: _col0 (type: string), _col1 (type: string), _col4 (type: string), _col5 (type: string), _col8 (type: string), _col9 (type: string)
+            expressions: _col0 (type: string), _col1 (type: string), _col5 (type: string), _col6 (type: string), _col10 (type: string), _col11 (type: string)
             outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
             Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
             File Output Operator

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/skewjoinopt1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/skewjoinopt1.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/skewjoinopt1.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/skewjoinopt1.q.out Fri Aug 22 21:36:47 2014
@@ -2,6 +2,7 @@ PREHOOK: query: CREATE TABLE T1(key STRI
 SKEWED BY (key) ON ((2)) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@T1
 POSTHOOK: query: CREATE TABLE T1(key STRING, val STRING)
 SKEWED BY (key) ON ((2)) STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
@@ -19,6 +20,7 @@ PREHOOK: query: CREATE TABLE T2(key STRI
 SKEWED BY (key) ON ((3)) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@T2
 POSTHOOK: query: CREATE TABLE T2(key STRING, val STRING)
 SKEWED BY (key) ON ((3)) STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
@@ -85,10 +87,10 @@ STAGE PLANS:
           condition expressions:
             0 {KEY.reducesinkkey0} {VALUE._col0}
             1 {KEY.reducesinkkey0} {VALUE._col0}
-          outputColumnNames: _col0, _col1, _col4, _col5
+          outputColumnNames: _col0, _col1, _col5, _col6
           Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
           Select Operator
-            expressions: _col0 (type: string), _col1 (type: string), _col4 (type: string), _col5 (type: string)
+            expressions: _col0 (type: string), _col1 (type: string), _col5 (type: string), _col6 (type: string)
             outputColumnNames: _col0, _col1, _col2, _col3
             Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
             File Output Operator
@@ -162,10 +164,10 @@ STAGE PLANS:
           condition expressions:
             0 {KEY.reducesinkkey0} {VALUE._col0}
             1 {KEY.reducesinkkey0} {VALUE._col0}
-          outputColumnNames: _col0, _col1, _col4, _col5
+          outputColumnNames: _col0, _col1, _col5, _col6
           Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
           Select Operator
-            expressions: _col0 (type: string), _col1 (type: string), _col4 (type: string), _col5 (type: string)
+            expressions: _col0 (type: string), _col1 (type: string), _col5 (type: string), _col6 (type: string)
             outputColumnNames: _col0, _col1, _col2, _col3
             Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
             File Output Operator
@@ -250,10 +252,10 @@ STAGE PLANS:
           condition expressions:
             0 {KEY.reducesinkkey0} {VALUE._col0}
             1 {KEY.reducesinkkey0} {VALUE._col0}
-          outputColumnNames: _col0, _col1, _col4, _col5
+          outputColumnNames: _col0, _col1, _col5, _col6
           Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
           Select Operator
-            expressions: _col0 (type: string), _col1 (type: string), _col4 (type: string), _col5 (type: string)
+            expressions: _col0 (type: string), _col1 (type: string), _col5 (type: string), _col6 (type: string)
             outputColumnNames: _col0, _col1, _col2, _col3
             Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
             File Output Operator
@@ -327,10 +329,10 @@ STAGE PLANS:
           condition expressions:
             0 {KEY.reducesinkkey0} {VALUE._col0}
             1 {KEY.reducesinkkey0} {VALUE._col0}
-          outputColumnNames: _col0, _col1, _col4, _col5
+          outputColumnNames: _col0, _col1, _col5, _col6
           Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
           Select Operator
-            expressions: _col0 (type: string), _col1 (type: string), _col4 (type: string), _col5 (type: string)
+            expressions: _col0 (type: string), _col1 (type: string), _col5 (type: string), _col6 (type: string)
             outputColumnNames: _col0, _col1, _col2, _col3
             Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
             File Output Operator

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/skewjoinopt10.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/skewjoinopt10.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/skewjoinopt10.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/skewjoinopt10.q.out Fri Aug 22 21:36:47 2014
@@ -1,6 +1,7 @@
 PREHOOK: query: CREATE TABLE T1(key STRING, value STRING) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@T1
 POSTHOOK: query: CREATE TABLE T1(key STRING, value STRING) STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -20,6 +21,7 @@ POSTHOOK: type: DROPTABLE
 PREHOOK: query: create table array_valued_T1 (key string, value array<string>) SKEWED BY (key) ON ((8))
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@array_valued_T1
 POSTHOOK: query: create table array_valued_T1 (key string, value array<string>) SKEWED BY (key) ON ((8))
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -86,10 +88,10 @@ STAGE PLANS:
           condition expressions:
             0 {KEY.reducesinkkey0}
             1 {VALUE._col0}
-          outputColumnNames: _col0, _col5
+          outputColumnNames: _col0, _col6
           Statistics: Num rows: 2 Data size: 8 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: _col0 (type: string), _col5 (type: array<string>)
+            expressions: _col0 (type: string), _col6 (type: array<string>)
             outputColumnNames: _col0, _col1
             Statistics: Num rows: 2 Data size: 8 Basic stats: COMPLETE Column stats: NONE
             File Output Operator
@@ -228,10 +230,10 @@ STAGE PLANS:
           condition expressions:
             0 {KEY.reducesinkkey0}
             1 {VALUE._col0}
-          outputColumnNames: _col0, _col5
+          outputColumnNames: _col0, _col6
           Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: _col0 (type: string), _col5 (type: array<string>)
+            expressions: _col0 (type: string), _col6 (type: array<string>)
             outputColumnNames: _col0, _col1
             Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE Column stats: NONE
             File Output Operator