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

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

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

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

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/alter_merge_stats_orc.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/alter_merge_stats_orc.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- 
hive/branches/cbo/ql/src/test/results/clientpositive/alter_merge_stats_orc.q.out
 (original)
+++ 
hive/branches/cbo/ql/src/test/results/clientpositive/alter_merge_stats_orc.q.out
 Fri Aug 22 21:36:47 2014
@@ -1,6 +1,7 @@
 PREHOOK: query: create table src_orc_merge_test_stat(key int, value string) 
stored as orc
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@src_orc_merge_test_stat
 POSTHOOK: query: create table src_orc_merge_test_stat(key int, value string) 
stored as orc
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -157,6 +158,7 @@ Storage Desc Params:                 
 PREHOOK: query: create table src_orc_merge_test_part_stat(key int, value 
string) partitioned by (ds string) stored as orc
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@src_orc_merge_test_part_stat
 POSTHOOK: query: create table src_orc_merge_test_part_stat(key int, value 
string) partitioned by (ds string) stored as orc
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/alter_numbuckets_partitioned_table2_h23.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/alter_numbuckets_partitioned_table2_h23.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- 
hive/branches/cbo/ql/src/test/results/clientpositive/alter_numbuckets_partitioned_table2_h23.q.out
 (original)
+++ 
hive/branches/cbo/ql/src/test/results/clientpositive/alter_numbuckets_partitioned_table2_h23.q.out
 Fri Aug 22 21:36:47 2014
@@ -5,6 +5,7 @@ PREHOOK: query: -- EXCLUDE_HADOOP_MAJOR_
 CREATE TABLE tst1(key STRING, value STRING) PARTITIONED BY (ds STRING)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@tst1
 POSTHOOK: query: -- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.20,0.20S)
 -- Tests that when overwriting a partition in a table after altering the 
bucketing/sorting metadata
 -- the partition metadata is updated as well.

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

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/alter_partition_clusterby_sortby.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/alter_partition_clusterby_sortby.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- 
hive/branches/cbo/ql/src/test/results/clientpositive/alter_partition_clusterby_sortby.q.out
 (original)
+++ 
hive/branches/cbo/ql/src/test/results/clientpositive/alter_partition_clusterby_sortby.q.out
 Fri Aug 22 21:36:47 2014
@@ -1,6 +1,7 @@
 PREHOOK: query: create table alter_table_partition_clusterby_sortby (a int, b 
int) partitioned by (c string) clustered by (a, b) sorted by (a desc, b asc) 
into 4 buckets
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@alter_table_partition_clusterby_sortby
 POSTHOOK: query: create table alter_table_partition_clusterby_sortby (a int, b 
int) partitioned by (c string) clustered by (a, b) sorted by (a desc, b asc) 
into 4 buckets
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

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

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

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/alter_partition_protect_mode.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/alter_partition_protect_mode.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- 
hive/branches/cbo/ql/src/test/results/clientpositive/alter_partition_protect_mode.q.out
 (original)
+++ 
hive/branches/cbo/ql/src/test/results/clientpositive/alter_partition_protect_mode.q.out
 Fri Aug 22 21:36:47 2014
@@ -2,6 +2,7 @@ PREHOOK: query: -- Create table
 create table if not exists alter_part_protect_mode(key string, value string ) 
partitioned by (year string, month string) stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@alter_part_protect_mode
 POSTHOOK: query: -- Create table
 create table if not exists alter_part_protect_mode(key string, value string ) 
partitioned by (year string, month string) stored as textfile
 POSTHOOK: type: CREATETABLE

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

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/alter_rename_partition.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/alter_rename_partition.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- 
hive/branches/cbo/ql/src/test/results/clientpositive/alter_rename_partition.q.out
 (original)
+++ 
hive/branches/cbo/ql/src/test/results/clientpositive/alter_rename_partition.q.out
 Fri Aug 22 21:36:47 2014
@@ -24,6 +24,7 @@ srcpart
 PREHOOK: query: create table alter_rename_partition_src ( col1 string ) stored 
as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@alter_rename_partition_src
 POSTHOOK: query: create table alter_rename_partition_src ( col1 string ) 
stored as textfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -39,6 +40,7 @@ POSTHOOK: Output: default@alter_rename_p
 PREHOOK: query: create table alter_rename_partition ( col1 string ) 
partitioned by (pcol1 string , pcol2 string) stored as sequencefile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@alter_rename_partition
 POSTHOOK: query: create table alter_rename_partition ( col1 string ) 
partitioned by (pcol1 string , pcol2 string) stored as sequencefile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -144,20 +146,25 @@ PREHOOK: query: -- With non-default Data
 
 CREATE DATABASE alter_rename_partition_db
 PREHOOK: type: CREATEDATABASE
+PREHOOK: Output: database:alter_rename_partition_db
 POSTHOOK: query: -- With non-default Database
 
 CREATE DATABASE alter_rename_partition_db
 POSTHOOK: type: CREATEDATABASE
+POSTHOOK: Output: database:alter_rename_partition_db
 PREHOOK: query: USE alter_rename_partition_db
 PREHOOK: type: SWITCHDATABASE
+PREHOOK: Input: database:alter_rename_partition_db
 POSTHOOK: query: USE alter_rename_partition_db
 POSTHOOK: type: SWITCHDATABASE
+POSTHOOK: Input: database:alter_rename_partition_db
 PREHOOK: query: SHOW TABLES
 PREHOOK: type: SHOWTABLES
 POSTHOOK: query: SHOW TABLES
 POSTHOOK: type: SHOWTABLES
 PREHOOK: query: CREATE TABLE alter_rename_partition_src (col1 STRING) STORED 
AS TEXTFILE
 PREHOOK: type: CREATETABLE
+PREHOOK: Output: alter_rename_partition_db@alter_rename_partition_src
 PREHOOK: Output: database:alter_rename_partition_db
 POSTHOOK: query: CREATE TABLE alter_rename_partition_src (col1 STRING) STORED 
AS TEXTFILE
 POSTHOOK: type: CREATETABLE
@@ -173,6 +180,7 @@ POSTHOOK: type: LOAD
 POSTHOOK: Output: alter_rename_partition_db@alter_rename_partition_src
 PREHOOK: query: CREATE TABLE alter_rename_partition (col1 STRING) PARTITIONED 
BY (pcol1 STRING, pcol2 STRING) STORED AS SEQUENCEFILE
 PREHOOK: type: CREATETABLE
+PREHOOK: Output: alter_rename_partition_db@alter_rename_partition
 PREHOOK: Output: database:alter_rename_partition_db
 POSTHOOK: query: CREATE TABLE alter_rename_partition (col1 STRING) PARTITIONED 
BY (pcol1 STRING, pcol2 STRING) STORED AS SEQUENCEFILE
 POSTHOOK: type: CREATETABLE

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

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/alter_rename_table.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/alter_rename_table.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- 
hive/branches/cbo/ql/src/test/results/clientpositive/alter_rename_table.q.out 
(original)
+++ 
hive/branches/cbo/ql/src/test/results/clientpositive/alter_rename_table.q.out 
Fri Aug 22 21:36:47 2014
@@ -1,17 +1,23 @@
 PREHOOK: query: create database source
 PREHOOK: type: CREATEDATABASE
+PREHOOK: Output: database:source
 POSTHOOK: query: create database source
 POSTHOOK: type: CREATEDATABASE
+POSTHOOK: Output: database:source
 PREHOOK: query: create database target
 PREHOOK: type: CREATEDATABASE
+PREHOOK: Output: database:target
 POSTHOOK: query: create database target
 POSTHOOK: type: CREATEDATABASE
+POSTHOOK: Output: database:target
 PREHOOK: query: create table source.src like default.src
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:source
+PREHOOK: Output: sou...@source.src
 POSTHOOK: query: create table source.src like default.src
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:source
+POSTHOOK: Output: sou...@source.src
 POSTHOOK: Output: source@src
 PREHOOK: query: load data local inpath '../../data/files/kv1.txt' overwrite 
into table source.src
 PREHOOK: type: LOAD
@@ -24,9 +30,11 @@ POSTHOOK: Output: source@src
 PREHOOK: query: create table source.srcpart like default.srcpart
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:source
+PREHOOK: Output: source@source.srcpart
 POSTHOOK: query: create table source.srcpart like default.srcpart
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:source
+POSTHOOK: Output: source@source.srcpart
 POSTHOOK: Output: source@srcpart
 PREHOOK: query: load data local inpath '../../data/files/kv1.txt' overwrite 
into table source.srcpart partition (ds='2008-04-08', hr='11')
 PREHOOK: type: LOAD
@@ -204,3 +212,56 @@ POSTHOOK: Input: target@srcpart@ds=2008-
 278    val_278 2008-04-08      11
 98     val_98  2008-04-08      11
 484    val_484 2008-04-08      11
+PREHOOK: query: create table source.src like default.src
+PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:source
+PREHOOK: Output: sou...@source.src
+POSTHOOK: query: create table source.src like default.src
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:source
+POSTHOOK: Output: sou...@source.src
+POSTHOOK: Output: source@src
+PREHOOK: query: create table source.src1 like default.src
+PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:source
+PREHOOK: Output: source@source.src1
+POSTHOOK: query: create table source.src1 like default.src
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:source
+POSTHOOK: Output: source@source.src1
+POSTHOOK: Output: source@src1
+PREHOOK: query: load data local inpath '../../data/files/kv1.txt' overwrite 
into table source.src
+PREHOOK: type: LOAD
+#### A masked pattern was here ####
+PREHOOK: Output: source@src
+POSTHOOK: query: load data local inpath '../../data/files/kv1.txt' overwrite 
into table source.src
+POSTHOOK: type: LOAD
+#### A masked pattern was here ####
+POSTHOOK: Output: source@src
+PREHOOK: query: ALTER TABLE source.src RENAME TO target.src1
+PREHOOK: type: ALTERTABLE_RENAME
+PREHOOK: Input: source@src
+PREHOOK: Output: source@src
+POSTHOOK: query: ALTER TABLE source.src RENAME TO target.src1
+POSTHOOK: type: ALTERTABLE_RENAME
+POSTHOOK: Input: source@src
+POSTHOOK: Output: source@src
+POSTHOOK: Output: target@src1
+PREHOOK: query: select * from target.src1 tablesample (10 rows)
+PREHOOK: type: QUERY
+PREHOOK: Input: target@src1
+#### A masked pattern was here ####
+POSTHOOK: query: select * from target.src1 tablesample (10 rows)
+POSTHOOK: type: QUERY
+POSTHOOK: Input: target@src1
+#### A masked pattern was here ####
+238    val_238
+86     val_86
+311    val_311
+27     val_27
+165    val_165
+409    val_409
+255    val_255
+278    val_278
+98     val_98
+484    val_484

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/alter_skewed_table.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/alter_skewed_table.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- 
hive/branches/cbo/ql/src/test/results/clientpositive/alter_skewed_table.q.out 
(original)
+++ 
hive/branches/cbo/ql/src/test/results/clientpositive/alter_skewed_table.q.out 
Fri Aug 22 21:36:47 2014
@@ -1,6 +1,7 @@
 PREHOOK: query: create table original (key STRING, value STRING)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@original
 POSTHOOK: query: create table original (key STRING, value STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -94,6 +95,7 @@ POSTHOOK: Output: default@original
 PREHOOK: query: create table original2 (key STRING, value STRING)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@original2
 POSTHOOK: query: create table original2 (key STRING, value STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -187,6 +189,7 @@ POSTHOOK: Output: default@original2
 PREHOOK: query: create table original3 (key STRING, value STRING) SKEWED BY 
(key, value) ON ((1,1),(5,6))
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@original3
 POSTHOOK: query: create table original3 (key STRING, value STRING) SKEWED BY 
(key, value) ON ((1,1),(5,6))
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/alter_table_not_sorted.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/alter_table_not_sorted.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- 
hive/branches/cbo/ql/src/test/results/clientpositive/alter_table_not_sorted.q.out
 (original)
+++ 
hive/branches/cbo/ql/src/test/results/clientpositive/alter_table_not_sorted.q.out
 Fri Aug 22 21:36:47 2014
@@ -1,6 +1,7 @@
 PREHOOK: query: create table alter_table_not_sorted (a int, b int) clustered 
by (a) sorted by (a) into 4 buckets
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@alter_table_not_sorted
 POSTHOOK: query: create table alter_table_not_sorted (a int, b int) clustered 
by (a) sorted by (a) into 4 buckets
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/alter_table_serde.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/alter_table_serde.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- 
hive/branches/cbo/ql/src/test/results/clientpositive/alter_table_serde.q.out 
(original)
+++ 
hive/branches/cbo/ql/src/test/results/clientpositive/alter_table_serde.q.out 
Fri Aug 22 21:36:47 2014
@@ -2,6 +2,7 @@ PREHOOK: query: -- test table
 create table test_table (id int, query string, name string)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@test_table
 POSTHOOK: query: -- test table
 create table test_table (id int, query string, name string)
 POSTHOOK: type: CREATETABLE
@@ -68,6 +69,7 @@ PREHOOK: query: --- test partitioned tab
 create table test_table (id int, query string, name string) partitioned by (dt 
string)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@test_table
 POSTHOOK: query: --- test partitioned table
 create table test_table (id int, query string, name string) partitioned by (dt 
string)
 POSTHOOK: type: CREATETABLE

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/alter_table_serde2.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/alter_table_serde2.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- 
hive/branches/cbo/ql/src/test/results/clientpositive/alter_table_serde2.q.out 
(original)
+++ 
hive/branches/cbo/ql/src/test/results/clientpositive/alter_table_serde2.q.out 
Fri Aug 22 21:36:47 2014
@@ -4,6 +4,7 @@ PREHOOK: query: -- Tests that when overw
 CREATE TABLE tst1(key STRING, value STRING) PARTITIONED BY (ds STRING)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@tst1
 POSTHOOK: query: -- Tests that when overwriting a partition in a table after 
altering the serde properties
 -- the partition metadata is updated as well.
 

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

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/alter_varchar2.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/alter_varchar2.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/alter_varchar2.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/alter_varchar2.q.out 
Fri Aug 22 21:36:47 2014
@@ -9,6 +9,7 @@ PREHOOK: query: create table alter_varch
 ) partitioned by (hr int)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@alter_varchar2
 POSTHOOK: query: create table alter_varchar2 (
   c1 varchar(255)
 ) partitioned by (hr int)

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

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/analyze_table_null_partition.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/analyze_table_null_partition.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- 
hive/branches/cbo/ql/src/test/results/clientpositive/analyze_table_null_partition.q.out
 (original)
+++ 
hive/branches/cbo/ql/src/test/results/clientpositive/analyze_table_null_partition.q.out
 Fri Aug 22 21:36:47 2014
@@ -9,6 +9,7 @@ POSTHOOK: type: DROPTABLE
 PREHOOK: query: CREATE TABLE test1(name string, age int)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@test1
 POSTHOOK: query: CREATE TABLE test1(name string, age int)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -16,6 +17,7 @@ POSTHOOK: Output: default@test1
 PREHOOK: query: CREATE TABLE test2(name string) PARTITIONED by (age int)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@test2
 POSTHOOK: query: CREATE TABLE test2(name string) PARTITIONED by (age int)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/annotate_stats_filter.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/annotate_stats_filter.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- 
hive/branches/cbo/ql/src/test/results/clientpositive/annotate_stats_filter.q.out
 (original)
+++ 
hive/branches/cbo/ql/src/test/results/clientpositive/annotate_stats_filter.q.out
 Fri Aug 22 21:36:47 2014
@@ -6,6 +6,7 @@ PREHOOK: query: create table if not exis
 ) row format delimited fields terminated by '|' stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@loc_staging
 POSTHOOK: query: create table if not exists loc_staging (
   state string,
   locid int,
@@ -18,6 +19,7 @@ POSTHOOK: Output: default@loc_staging
 PREHOOK: query: create table loc_orc like loc_staging
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@loc_orc
 POSTHOOK: query: create table loc_orc like loc_staging
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/annotate_stats_groupby.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/annotate_stats_groupby.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- 
hive/branches/cbo/ql/src/test/results/clientpositive/annotate_stats_groupby.q.out
 (original)
+++ 
hive/branches/cbo/ql/src/test/results/clientpositive/annotate_stats_groupby.q.out
 Fri Aug 22 21:36:47 2014
@@ -6,6 +6,7 @@ PREHOOK: query: create table if not exis
 ) row format delimited fields terminated by '|' stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@loc_staging
 POSTHOOK: query: create table if not exists loc_staging (
   state string,
   locid int,
@@ -18,6 +19,7 @@ POSTHOOK: Output: default@loc_staging
 PREHOOK: query: create table loc_orc like loc_staging
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@loc_orc
 POSTHOOK: query: create table loc_orc like loc_staging
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/annotate_stats_join.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/annotate_stats_join.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- 
hive/branches/cbo/ql/src/test/results/clientpositive/annotate_stats_join.q.out 
(original)
+++ 
hive/branches/cbo/ql/src/test/results/clientpositive/annotate_stats_join.q.out 
Fri Aug 22 21:36:47 2014
@@ -5,6 +5,7 @@ PREHOOK: query: create table if not exis
 ) row format delimited fields terminated by '|' stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@emp
 POSTHOOK: query: create table if not exists emp (
   lastname string,
   deptid int,
@@ -19,6 +20,7 @@ PREHOOK: query: create table if not exis
 ) row format delimited fields terminated by '|' stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@dept
 POSTHOOK: query: create table if not exists dept (
   deptid int,
   deptname string
@@ -34,6 +36,7 @@ PREHOOK: query: create table if not exis
 ) row format delimited fields terminated by '|' stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@loc
 POSTHOOK: query: create table if not exists loc (
   state string,
   locid int,
@@ -190,10 +193,10 @@ STAGE PLANS:
           condition expressions:
             0 {VALUE._col0} {KEY.reducesinkkey0} {VALUE._col1}
             1 {KEY.reducesinkkey0} {VALUE._col0}
-          outputColumnNames: _col0, _col1, _col2, _col5, _col6
+          outputColumnNames: _col0, _col1, _col2, _col6, _col7
           Statistics: Num rows: 41 Data size: 7954 Basic stats: COMPLETE 
Column stats: COMPLETE
           Select Operator
-            expressions: _col0 (type: string), _col1 (type: int), _col2 (type: 
int), _col5 (type: int), _col6 (type: string)
+            expressions: _col0 (type: string), _col1 (type: int), _col2 (type: 
int), _col6 (type: int), _col7 (type: string)
             outputColumnNames: _col0, _col1, _col2, _col3, _col4
             Statistics: Num rows: 41 Data size: 7954 Basic stats: COMPLETE 
Column stats: COMPLETE
             File Output Operator
@@ -256,13 +259,13 @@ STAGE PLANS:
           condition expressions:
             0 {KEY.reducesinkkey1} {KEY.reducesinkkey0} {VALUE._col0}
             1 {KEY.reducesinkkey0} {KEY.reducesinkkey1}
-          outputColumnNames: _col0, _col1, _col2, _col5, _col6
+          outputColumnNames: _col0, _col1, _col2, _col6, _col7
           Statistics: Num rows: 6 Data size: 1164 Basic stats: COMPLETE Column 
stats: COMPLETE
           Filter Operator
-            predicate: ((_col1 = _col5) and (_col0 = _col6)) (type: boolean)
+            predicate: ((_col1 = _col6) and (_col0 = _col7)) (type: boolean)
             Statistics: Num rows: 1 Data size: 194 Basic stats: COMPLETE 
Column stats: COMPLETE
             Select Operator
-              expressions: _col0 (type: string), _col1 (type: int), _col2 
(type: int), _col5 (type: int), _col6 (type: string)
+              expressions: _col0 (type: string), _col1 (type: int), _col2 
(type: int), _col6 (type: int), _col7 (type: string)
               outputColumnNames: _col0, _col1, _col2, _col3, _col4
               Statistics: Num rows: 1 Data size: 194 Basic stats: COMPLETE 
Column stats: COMPLETE
               File Output Operator
@@ -321,10 +324,10 @@ STAGE PLANS:
           condition expressions:
             0 {KEY.reducesinkkey1} {KEY.reducesinkkey0} {VALUE._col0}
             1 {KEY.reducesinkkey0} {KEY.reducesinkkey1}
-          outputColumnNames: _col0, _col1, _col2, _col5, _col6
+          outputColumnNames: _col0, _col1, _col2, _col6, _col7
           Statistics: Num rows: 6 Data size: 1164 Basic stats: COMPLETE Column 
stats: COMPLETE
           Select Operator
-            expressions: _col0 (type: string), _col1 (type: int), _col2 (type: 
int), _col5 (type: int), _col6 (type: string)
+            expressions: _col0 (type: string), _col1 (type: int), _col2 (type: 
int), _col6 (type: int), _col7 (type: string)
             outputColumnNames: _col0, _col1, _col2, _col3, _col4
             Statistics: Num rows: 6 Data size: 1164 Basic stats: COMPLETE 
Column stats: COMPLETE
             File Output Operator
@@ -387,18 +390,18 @@ STAGE PLANS:
           condition expressions:
             0 {KEY.reducesinkkey1} {KEY.reducesinkkey0} {VALUE._col0}
             1 {KEY.reducesinkkey0} {KEY.reducesinkkey1}
-          outputColumnNames: _col0, _col1, _col2, _col5, _col6
-          Statistics: Num rows: 1 Data size: 194 Basic stats: COMPLETE Column 
stats: COMPLETE
+          outputColumnNames: _col0, _col1, _col2, _col6, _col7
+          Statistics: Num rows: 11 Data size: 2134 Basic stats: COMPLETE 
Column stats: COMPLETE
           Filter Operator
-            predicate: (((_col1 = _col5) and (_col0 = _col6)) and (_col6 = 
_col0)) (type: boolean)
-            Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: COMPLETE
+            predicate: (((_col1 = _col6) and (_col0 = _col7)) and (_col7 = 
_col0)) (type: boolean)
+            Statistics: Num rows: 1 Data size: 194 Basic stats: COMPLETE 
Column stats: COMPLETE
             Select Operator
-              expressions: _col0 (type: string), _col1 (type: int), _col2 
(type: int), _col5 (type: int), _col6 (type: string)
+              expressions: _col0 (type: string), _col1 (type: int), _col2 
(type: int), _col6 (type: int), _col7 (type: string)
               outputColumnNames: _col0, _col1, _col2, _col3, _col4
-              Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: COMPLETE
+              Statistics: Num rows: 1 Data size: 194 Basic stats: COMPLETE 
Column stats: COMPLETE
               File Output Operator
                 compressed: false
-                Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: COMPLETE
+                Statistics: Num rows: 1 Data size: 194 Basic stats: COMPLETE 
Column stats: COMPLETE
                 table:
                     input format: org.apache.hadoop.mapred.TextInputFormat
                     output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -471,10 +474,10 @@ STAGE PLANS:
             0 {VALUE._col0} {KEY.reducesinkkey0} {VALUE._col1}
             1 {KEY.reducesinkkey0} {VALUE._col0}
             2 {VALUE._col0} {KEY.reducesinkkey0} {VALUE._col1}
-          outputColumnNames: _col0, _col1, _col2, _col5, _col6, _col9, _col10, 
_col11
+          outputColumnNames: _col0, _col1, _col2, _col6, _col7, _col11, 
_col12, _col13
           Statistics: Num rows: 658 Data size: 192794 Basic stats: COMPLETE 
Column stats: COMPLETE
           Select Operator
-            expressions: _col0 (type: string), _col1 (type: int), _col2 (type: 
int), _col5 (type: int), _col6 (type: string), _col9 (type: string), _col10 
(type: int), _col11 (type: int)
+            expressions: _col0 (type: string), _col1 (type: int), _col2 (type: 
int), _col6 (type: int), _col7 (type: string), _col11 (type: string), _col12 
(type: int), _col13 (type: int)
             outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7
             Statistics: Num rows: 658 Data size: 192794 Basic stats: COMPLETE 
Column stats: COMPLETE
             File Output Operator
@@ -550,10 +553,10 @@ STAGE PLANS:
             0 {VALUE._col0} {KEY.reducesinkkey0} {VALUE._col1}
             1 {KEY.reducesinkkey0} {VALUE._col0}
             2 {VALUE._col0} {KEY.reducesinkkey0} {VALUE._col1} {VALUE._col2}
-          outputColumnNames: _col0, _col1, _col2, _col5, _col6, _col9, _col10, 
_col11, _col12
+          outputColumnNames: _col0, _col1, _col2, _col6, _col7, _col11, 
_col12, _col13, _col14
           Statistics: Num rows: 47 Data size: 13912 Basic stats: COMPLETE 
Column stats: COMPLETE
           Select Operator
-            expressions: _col0 (type: string), _col1 (type: int), _col2 (type: 
int), _col5 (type: int), _col6 (type: string), _col9 (type: string), _col10 
(type: int), _col11 (type: bigint), _col12 (type: int)
+            expressions: _col0 (type: string), _col1 (type: int), _col2 (type: 
int), _col6 (type: int), _col7 (type: string), _col11 (type: string), _col12 
(type: int), _col13 (type: bigint), _col14 (type: int)
             outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8
             Statistics: Num rows: 47 Data size: 13912 Basic stats: COMPLETE 
Column stats: COMPLETE
             File Output Operator
@@ -630,10 +633,10 @@ STAGE PLANS:
             0 {KEY.reducesinkkey1} {KEY.reducesinkkey0} {VALUE._col0}
             1 {KEY.reducesinkkey0} {KEY.reducesinkkey1}
             2 {KEY.reducesinkkey1} {KEY.reducesinkkey0} {VALUE._col0} 
{VALUE._col1}
-          outputColumnNames: _col0, _col1, _col2, _col5, _col6, _col9, _col10, 
_col11, _col12
+          outputColumnNames: _col0, _col1, _col2, _col6, _col7, _col11, 
_col12, _col13, _col14
           Statistics: Num rows: 1 Data size: 296 Basic stats: COMPLETE Column 
stats: COMPLETE
           Select Operator
-            expressions: _col0 (type: string), _col1 (type: int), _col2 (type: 
int), _col5 (type: int), _col6 (type: string), _col9 (type: string), _col10 
(type: int), _col11 (type: bigint), _col12 (type: int)
+            expressions: _col0 (type: string), _col1 (type: int), _col2 (type: 
int), _col6 (type: int), _col7 (type: string), _col11 (type: string), _col12 
(type: int), _col13 (type: bigint), _col14 (type: int)
             outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8
             Statistics: Num rows: 1 Data size: 296 Basic stats: COMPLETE 
Column stats: COMPLETE
             File Output Operator

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/annotate_stats_limit.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/annotate_stats_limit.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- 
hive/branches/cbo/ql/src/test/results/clientpositive/annotate_stats_limit.q.out 
(original)
+++ 
hive/branches/cbo/ql/src/test/results/clientpositive/annotate_stats_limit.q.out 
Fri Aug 22 21:36:47 2014
@@ -6,6 +6,7 @@ PREHOOK: query: create table if not exis
 ) row format delimited fields terminated by '|' stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@loc_staging
 POSTHOOK: query: create table if not exists loc_staging (
   state string,
   locid int,
@@ -18,6 +19,7 @@ POSTHOOK: Output: default@loc_staging
 PREHOOK: query: create table loc_orc like loc_staging
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@loc_orc
 POSTHOOK: query: create table loc_orc like loc_staging
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/annotate_stats_part.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/annotate_stats_part.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- 
hive/branches/cbo/ql/src/test/results/clientpositive/annotate_stats_part.q.out 
(original)
+++ 
hive/branches/cbo/ql/src/test/results/clientpositive/annotate_stats_part.q.out 
Fri Aug 22 21:36:47 2014
@@ -6,6 +6,7 @@ PREHOOK: query: create table if not exis
 ) row format delimited fields terminated by '|' stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@loc_staging
 POSTHOOK: query: create table if not exists loc_staging (
   state string,
   locid int,
@@ -30,6 +31,7 @@ PREHOOK: query: create table if not exis
 ) partitioned by(year string) stored as orc
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@loc_orc
 POSTHOOK: query: create table if not exists loc_orc (
   state string,
   locid int,

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/annotate_stats_select.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/annotate_stats_select.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- 
hive/branches/cbo/ql/src/test/results/clientpositive/annotate_stats_select.q.out
 (original)
+++ 
hive/branches/cbo/ql/src/test/results/clientpositive/annotate_stats_select.q.out
 Fri Aug 22 21:36:47 2014
@@ -19,6 +19,7 @@ collection items terminated by ','
 map keys terminated by ':' stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@alltypes
 POSTHOOK: query: create table if not exists alltypes (
  bo1 boolean,
  ti1 tinyint,
@@ -44,6 +45,7 @@ POSTHOOK: Output: default@alltypes
 PREHOOK: query: create table alltypes_orc like alltypes
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@alltypes_orc
 POSTHOOK: query: create table alltypes_orc like alltypes
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/annotate_stats_table.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/annotate_stats_table.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- 
hive/branches/cbo/ql/src/test/results/clientpositive/annotate_stats_table.q.out 
(original)
+++ 
hive/branches/cbo/ql/src/test/results/clientpositive/annotate_stats_table.q.out 
Fri Aug 22 21:36:47 2014
@@ -4,6 +4,7 @@ PREHOOK: query: create table if not exis
 ) row format delimited fields terminated by '|' stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@emp_staging
 POSTHOOK: query: create table if not exists emp_staging (
   lastname string,
   deptid int
@@ -14,6 +15,7 @@ POSTHOOK: Output: default@emp_staging
 PREHOOK: query: create table if not exists emp_orc like emp_staging
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@emp_orc
 POSTHOOK: query: create table if not exists emp_orc like emp_staging
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/annotate_stats_union.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/annotate_stats_union.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- 
hive/branches/cbo/ql/src/test/results/clientpositive/annotate_stats_union.q.out 
(original)
+++ 
hive/branches/cbo/ql/src/test/results/clientpositive/annotate_stats_union.q.out 
Fri Aug 22 21:36:47 2014
@@ -6,6 +6,7 @@ PREHOOK: query: create table if not exis
 ) row format delimited fields terminated by '|' stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@loc_staging
 POSTHOOK: query: create table if not exists loc_staging (
   state string,
   locid int,
@@ -18,6 +19,7 @@ POSTHOOK: Output: default@loc_staging
 PREHOOK: query: create table loc_orc like loc_staging
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@loc_orc
 POSTHOOK: query: create table loc_orc like loc_staging
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -240,12 +242,16 @@ STAGE PLANS:
 
 PREHOOK: query: create database test
 PREHOOK: type: CREATEDATABASE
+PREHOOK: Output: database:test
 POSTHOOK: query: create database test
 POSTHOOK: type: CREATEDATABASE
+POSTHOOK: Output: database:test
 PREHOOK: query: use test
 PREHOOK: type: SWITCHDATABASE
+PREHOOK: Input: database:test
 POSTHOOK: query: use test
 POSTHOOK: type: SWITCHDATABASE
+POSTHOOK: Input: database:test
 PREHOOK: query: create table if not exists loc_staging (
   state string,
   locid int,
@@ -254,6 +260,7 @@ PREHOOK: query: create table if not exis
 ) row format delimited fields terminated by '|' stored as textfile
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:test
+PREHOOK: Output: test@loc_staging
 POSTHOOK: query: create table if not exists loc_staging (
   state string,
   locid int,
@@ -266,6 +273,7 @@ POSTHOOK: Output: test@loc_staging
 PREHOOK: query: create table loc_orc like loc_staging
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:test
+PREHOOK: Output: test@loc_orc
 POSTHOOK: query: create table loc_orc like loc_staging
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:test

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/archive_excludeHadoop20.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/archive_excludeHadoop20.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- 
hive/branches/cbo/ql/src/test/results/clientpositive/archive_excludeHadoop20.q.out
 (original)
+++ 
hive/branches/cbo/ql/src/test/results/clientpositive/archive_excludeHadoop20.q.out
 Fri Aug 22 21:36:47 2014
@@ -13,6 +13,7 @@ POSTHOOK: type: DROPTABLE
 PREHOOK: query: create table tstsrc like src
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@tstsrc
 POSTHOOK: query: create table tstsrc like src
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -30,6 +31,7 @@ POSTHOOK: Lineage: tstsrc.value SIMPLE [
 PREHOOK: query: create table tstsrcpart (key string, value string) partitioned 
by (ds string, hr string) clustered by (key) into 10 buckets
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@tstsrcpart
 POSTHOOK: query: create table tstsrcpart (key string, value string) 
partitioned by (ds string, hr string) clustered by (key) into 10 buckets
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -190,6 +192,7 @@ PARTITIONED by (ds STRING)
 CLUSTERED BY (key) INTO 10 BUCKETS
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@harbucket
 POSTHOOK: query: CREATE TABLE harbucket(key INT)
 PARTITIONED by (ds STRING)
 CLUSTERED BY (key) INTO 10 BUCKETS
@@ -273,6 +276,7 @@ PREHOOK: query: CREATE TABLE old_name(ke
 PARTITIONED by (ds STRING)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@old_name
 POSTHOOK: query: CREATE TABLE old_name(key INT)
 PARTITIONED by (ds STRING)
 POSTHOOK: type: CREATETABLE

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/archive_multi.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/archive_multi.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/archive_multi.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/archive_multi.q.out 
Fri Aug 22 21:36:47 2014
@@ -9,6 +9,7 @@ POSTHOOK: type: DROPTABLE
 PREHOOK: query: create table tstsrc like src
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@tstsrc
 POSTHOOK: query: create table tstsrc like src
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -26,6 +27,7 @@ POSTHOOK: Lineage: tstsrc.value SIMPLE [
 PREHOOK: query: create table tstsrcpart like srcpart
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@tstsrcpart
 POSTHOOK: query: create table tstsrcpart like srcpart
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

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

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

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/authorization_5.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/authorization_5.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/authorization_5.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/authorization_5.q.out 
Fri Aug 22 21:36:47 2014
@@ -2,10 +2,12 @@ PREHOOK: query: -- SORT_BEFORE_DIFF
 
 CREATE DATABASE IF NOT EXISTS test_db COMMENT 'Hive test database'
 PREHOOK: type: CREATEDATABASE
+PREHOOK: Output: database:test_db
 POSTHOOK: query: -- SORT_BEFORE_DIFF
 
 CREATE DATABASE IF NOT EXISTS test_db COMMENT 'Hive test database'
 POSTHOOK: type: CREATEDATABASE
+POSTHOOK: Output: database:test_db
 PREHOOK: query: SHOW DATABASES
 PREHOOK: type: SHOWDATABASES
 POSTHOOK: query: SHOW DATABASES

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/authorization_6.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/authorization_6.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/authorization_6.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/authorization_6.q.out 
Fri Aug 22 21:36:47 2014
@@ -12,6 +12,7 @@ POSTHOOK: Output: default@src_auth_tmp
 PREHOOK: query: create table authorization_part (key int, value string) 
partitioned by (ds string)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@authorization_part
 POSTHOOK: query: create table authorization_part (key int, value string) 
partitioned by (ds string)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -141,6 +142,7 @@ POSTHOOK: Output: default@authorization_
 PREHOOK: query: create table authorization_part (key int, value string) 
partitioned by (ds string)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@authorization_part
 POSTHOOK: query: create table authorization_part (key int, value string) 
partitioned by (ds string)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

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

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

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

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/authorization_admin_almighty1.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/authorization_admin_almighty1.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- 
hive/branches/cbo/ql/src/test/results/clientpositive/authorization_admin_almighty1.q.out
 (original)
+++ 
hive/branches/cbo/ql/src/test/results/clientpositive/authorization_admin_almighty1.q.out
 Fri Aug 22 21:36:47 2014
@@ -3,6 +3,7 @@ PREHOOK: query: -- actions from admin sh
 create table t1(i int)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@t1
 POSTHOOK: query: -- actions from admin should work as if admin has all 
privileges
 
 create table t1(i int)

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/authorization_admin_almighty2.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/authorization_admin_almighty2.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- 
hive/branches/cbo/ql/src/test/results/clientpositive/authorization_admin_almighty2.q.out
 (original)
+++ 
hive/branches/cbo/ql/src/test/results/clientpositive/authorization_admin_almighty2.q.out
 Fri Aug 22 21:36:47 2014
@@ -1,9 +1,11 @@
 PREHOOK: query: -- test commands such as dfs,add,delete,compile allowed only 
by admin user, after following statement
 use default
 PREHOOK: type: SWITCHDATABASE
+PREHOOK: Input: database:default
 POSTHOOK: query: -- test commands such as dfs,add,delete,compile allowed only 
by admin user, after following statement
 use default
 POSTHOOK: type: SWITCHDATABASE
+POSTHOOK: Input: database:default
 PREHOOK: query: set role admin
 PREHOOK: type: SHOW_ROLES
 POSTHOOK: query: set role admin
@@ -11,6 +13,7 @@ POSTHOOK: type: SHOW_ROLES
 PREHOOK: query: create table a_table1(a int, b int)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@a_table1
 POSTHOOK: query: create table a_table1(a int, b int)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/authorization_create_func1.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/authorization_create_func1.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- 
hive/branches/cbo/ql/src/test/results/clientpositive/authorization_create_func1.q.out
 (original)
+++ 
hive/branches/cbo/ql/src/test/results/clientpositive/authorization_create_func1.q.out
 Fri Aug 22 21:36:47 2014
@@ -13,11 +13,11 @@ POSTHOOK: Output: temp_fn
 PREHOOK: query: create function perm_fn as 
'org.apache.hadoop.hive.ql.udf.UDFAscii'
 PREHOOK: type: CREATEFUNCTION
 PREHOOK: Output: database:default
-PREHOOK: Output: perm_fn
+PREHOOK: Output: default.perm_fn
 POSTHOOK: query: create function perm_fn as 
'org.apache.hadoop.hive.ql.udf.UDFAscii'
 POSTHOOK: type: CREATEFUNCTION
 POSTHOOK: Output: database:default
-POSTHOOK: Output: perm_fn
+POSTHOOK: Output: default.perm_fn
 PREHOOK: query: drop temporary function temp_fn
 PREHOOK: type: DROPFUNCTION
 PREHOOK: Output: temp_fn
@@ -27,8 +27,8 @@ POSTHOOK: Output: temp_fn
 PREHOOK: query: drop function perm_fn
 PREHOOK: type: DROPFUNCTION
 PREHOOK: Output: database:default
-PREHOOK: Output: perm_fn
+PREHOOK: Output: default.perm_fn
 POSTHOOK: query: drop function perm_fn
 POSTHOOK: type: DROPFUNCTION
 POSTHOOK: Output: database:default
-POSTHOOK: Output: perm_fn
+POSTHOOK: Output: default.perm_fn

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

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

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/authorization_explain.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/authorization_explain.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- 
hive/branches/cbo/ql/src/test/results/clientpositive/authorization_explain.q.out
 (original)
+++ 
hive/branches/cbo/ql/src/test/results/clientpositive/authorization_explain.q.out
 Fri Aug 22 21:36:47 2014
@@ -30,6 +30,7 @@ PREHOOK: type: SWITCHDATABASE
 POSTHOOK: query: explain authorization use default
 POSTHOOK: type: SWITCHDATABASE
 INPUTS: 
+  database:default
 OUTPUTS: 
 CURRENT_USER: 
   hive_test_user
@@ -39,4 +40,4 @@ PREHOOK: query: explain formatted author
 PREHOOK: type: SWITCHDATABASE
 POSTHOOK: query: explain formatted authorization use default
 POSTHOOK: type: SWITCHDATABASE
-{"OUTPUTS":[],"INPUTS":[],"OPERATION":"SWITCHDATABASE","CURRENT_USER":"hive_test_user"}
+{"OUTPUTS":[],"INPUTS":["database:default"],"OPERATION":"SWITCHDATABASE","CURRENT_USER":"hive_test_user"}

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/authorization_grant_public_role.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/authorization_grant_public_role.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- 
hive/branches/cbo/ql/src/test/results/clientpositive/authorization_grant_public_role.q.out
 (original)
+++ 
hive/branches/cbo/ql/src/test/results/clientpositive/authorization_grant_public_role.q.out
 Fri Aug 22 21:36:47 2014
@@ -3,6 +3,7 @@ PREHOOK: query: -- current user has been
 CREATE TABLE  t_gpr1(i int)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@t_gpr1
 POSTHOOK: query: -- current user has been set (comment line before the set cmd 
is resulting in parse error!!)
 
 CREATE TABLE  t_gpr1(i int)

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/authorization_grant_table_priv.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/authorization_grant_table_priv.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- 
hive/branches/cbo/ql/src/test/results/clientpositive/authorization_grant_table_priv.q.out
 (original)
+++ 
hive/branches/cbo/ql/src/test/results/clientpositive/authorization_grant_table_priv.q.out
 Fri Aug 22 21:36:47 2014
@@ -3,6 +3,7 @@ PREHOOK: query: -- current user has been
 CREATE TABLE  table_priv1(i int)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@table_priv1
 POSTHOOK: query: -- current user has been set (comment line before the set cmd 
is resulting in parse error!!)
 
 CREATE TABLE  table_priv1(i int)

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/authorization_index.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/authorization_index.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- 
hive/branches/cbo/ql/src/test/results/clientpositive/authorization_index.q.out 
(original)
+++ 
hive/branches/cbo/ql/src/test/results/clientpositive/authorization_index.q.out 
Fri Aug 22 21:36:47 2014
@@ -1,14 +1,17 @@
 PREHOOK: query: create table t1 (a int)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@t1
 POSTHOOK: query: create table t1 (a int)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@t1
 PREHOOK: query: create index t1_index on table t1(a) as 'COMPACT' WITH 
DEFERRED REBUILD
 PREHOOK: type: CREATEINDEX
+PREHOOK: Input: default@t1
 POSTHOOK: query: create index t1_index on table t1(a) as 'COMPACT' WITH 
DEFERRED REBUILD
 POSTHOOK: type: CREATEINDEX
+POSTHOOK: Input: default@t1
 POSTHOOK: Output: default@default__t1_t1_index__
 PREHOOK: query: desc formatted default__t1_t1_index__
 PREHOOK: type: DESCTABLE

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/authorization_insert.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/authorization_insert.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- 
hive/branches/cbo/ql/src/test/results/clientpositive/authorization_insert.q.out 
(original)
+++ 
hive/branches/cbo/ql/src/test/results/clientpositive/authorization_insert.q.out 
Fri Aug 22 21:36:47 2014
@@ -3,6 +3,7 @@ PREHOOK: query: -- current user has been
 CREATE TABLE  t_auth_ins(i int)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@t_auth_ins
 POSTHOOK: query: -- current user has been set (comment line before the set cmd 
is resulting in parse error!!)
 
 CREATE TABLE  t_auth_ins(i int)
@@ -12,6 +13,7 @@ POSTHOOK: Output: default@t_auth_ins
 PREHOOK: query: CREATE TABLE t_select(i int)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@t_select
 POSTHOOK: query: CREATE TABLE t_select(i int)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

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

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/authorization_owner_actions_db.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/authorization_owner_actions_db.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- 
hive/branches/cbo/ql/src/test/results/clientpositive/authorization_owner_actions_db.q.out
 (original)
+++ 
hive/branches/cbo/ql/src/test/results/clientpositive/authorization_owner_actions_db.q.out
 Fri Aug 22 21:36:47 2014
@@ -14,8 +14,10 @@ POSTHOOK: query: grant role testrole to 
 POSTHOOK: type: GRANT_ROLE
 PREHOOK: query: create database testdb
 PREHOOK: type: CREATEDATABASE
+PREHOOK: Output: database:testdb
 POSTHOOK: query: create database testdb
 POSTHOOK: type: CREATEDATABASE
+POSTHOOK: Output: database:testdb
 #### A masked pattern was here ####
 PREHOOK: type: ALTERDATABASE_OWNER
 PREHOOK: Output: database:testdb
@@ -31,13 +33,16 @@ testdb              location/in/test        testrole        
ROLE    
 -- create table
 use testdb
 PREHOOK: type: SWITCHDATABASE
+PREHOOK: Input: database:testdb
 #### A masked pattern was here ####
 -- create table
 use testdb
 POSTHOOK: type: SWITCHDATABASE
+POSTHOOK: Input: database:testdb
 PREHOOK: query: create table foobar (foo string, bar string)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:testdb
+PREHOOK: Output: testdb@foobar
 POSTHOOK: query: create table foobar (foo string, bar string)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:testdb

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/authorization_parts.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/authorization_parts.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- 
hive/branches/cbo/ql/src/test/results/clientpositive/authorization_parts.q.out 
(original)
+++ 
hive/branches/cbo/ql/src/test/results/clientpositive/authorization_parts.q.out 
Fri Aug 22 21:36:47 2014
@@ -2,6 +2,7 @@ PREHOOK: query: -- check add partition w
 create table tpart(i int, j int) partitioned by (k string)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@tpart
 POSTHOOK: query: -- check add partition without insert privilege
 create table tpart(i int, j int) partitioned by (k string)
 POSTHOOK: type: CREATETABLE

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/authorization_revoke_table_priv.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/authorization_revoke_table_priv.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- 
hive/branches/cbo/ql/src/test/results/clientpositive/authorization_revoke_table_priv.q.out
 (original)
+++ 
hive/branches/cbo/ql/src/test/results/clientpositive/authorization_revoke_table_priv.q.out
 Fri Aug 22 21:36:47 2014
@@ -3,6 +3,7 @@ PREHOOK: query: -- current user has been
 CREATE TABLE table_priv_rev(i int)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@table_priv_rev
 POSTHOOK: query: -- current user has been set (comment line before the set cmd 
is resulting in parse error!!)
 
 CREATE TABLE table_priv_rev(i int)

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/authorization_show_grant.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/authorization_show_grant.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- 
hive/branches/cbo/ql/src/test/results/clientpositive/authorization_show_grant.q.out
 (original)
+++ 
hive/branches/cbo/ql/src/test/results/clientpositive/authorization_show_grant.q.out
 Fri Aug 22 21:36:47 2014
@@ -26,6 +26,7 @@ PREHOOK: query: -- create table and gran
 create table t1(i int, j int, k int)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@t1
 POSTHOOK: query: -- create table and grant privileges to a role
 create table t1(i int, j int, k int)
 POSTHOOK: type: CREATETABLE
@@ -34,6 +35,7 @@ POSTHOOK: Output: default@t1
 PREHOOK: query: create table t2(i int, j int, k int)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@t2
 POSTHOOK: query: create table t2(i int, j int, k int)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/authorization_view_sqlstd.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/authorization_view_sqlstd.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- 
hive/branches/cbo/ql/src/test/results/clientpositive/authorization_view_sqlstd.q.out
 (original)
+++ 
hive/branches/cbo/ql/src/test/results/clientpositive/authorization_view_sqlstd.q.out
 Fri Aug 22 21:36:47 2014
@@ -3,6 +3,7 @@ PREHOOK: query: -- Test view authorizati
 create table t1(i int, j int, k int)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@t1
 POSTHOOK: query: -- Test view authorization , and 'show grant' variants
 
 create table t1(i int, j int, k int)

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/auto_join1.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/auto_join1.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/auto_join1.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/auto_join1.q.out Fri 
Aug 22 21:36:47 2014
@@ -1,6 +1,7 @@
 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
@@ -60,10 +61,10 @@ STAGE PLANS:
                 keys:
                   0 key (type: string)
                   1 key (type: string)
-                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

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/auto_join14.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/auto_join14.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/auto_join14.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/auto_join14.q.out Fri 
Aug 22 21:36:47 2014
@@ -3,6 +3,7 @@ PREHOOK: query: -- EXCLUDE_HADOOP_MAJOR_
 CREATE TABLE dest1(c1 INT, c2 STRING) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@dest1
 POSTHOOK: query: -- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 0.20S)
 
 CREATE TABLE dest1(c1 INT, c2 STRING) STORED AS TEXTFILE
@@ -64,10 +65,10 @@ STAGE PLANS:
                 keys:
                   0 key (type: string)
                   1 key (type: string)
-                outputColumnNames: _col0, _col5
+                outputColumnNames: _col0, _col6
                 Statistics: Num rows: 11 Data size: 1102 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: 11 Data size: 1102 Basic stats: 
COMPLETE Column stats: NONE
                   File Output Operator

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/auto_join15.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/auto_join15.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/auto_join15.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/auto_join15.q.out Fri 
Aug 22 21:36:47 2014
@@ -61,10 +61,10 @@ STAGE PLANS:
                 keys:
                   0 key (type: string)
                   1 key (type: string)
-                outputColumnNames: _col0, _col1, _col4, _col5
+                outputColumnNames: _col0, _col1, _col5, _col6
                 Statistics: Num rows: 16 Data size: 3306 Basic stats: COMPLETE 
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: 16 Data size: 3306 Basic stats: 
COMPLETE Column stats: NONE
                   Reduce Output Operator

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/auto_join17.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/auto_join17.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/auto_join17.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/auto_join17.q.out Fri 
Aug 22 21:36:47 2014
@@ -1,6 +1,7 @@
 PREHOOK: query: CREATE TABLE dest1(key1 INT, value1 STRING, key2 INT, value2 
STRING) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@dest1
 POSTHOOK: query: CREATE TABLE dest1(key1 INT, value1 STRING, key2 INT, value2 
STRING) STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -60,10 +61,10 @@ STAGE PLANS:
                 keys:
                   0 key (type: string)
                   1 key (type: string)
-                outputColumnNames: _col0, _col1, _col4, _col5
+                outputColumnNames: _col0, _col1, _col5, _col6
                 Statistics: Num rows: 16 Data size: 3306 Basic stats: COMPLETE 
Column stats: NONE
                 Select Operator
-                  expressions: UDFToInteger(_col0) (type: int), _col1 (type: 
string), UDFToInteger(_col4) (type: int), _col5 (type: string)
+                  expressions: UDFToInteger(_col0) (type: int), _col1 (type: 
string), UDFToInteger(_col5) (type: int), _col6 (type: string)
                   outputColumnNames: _col0, _col1, _col2, _col3
                   Statistics: Num rows: 16 Data size: 3306 Basic stats: 
COMPLETE Column stats: NONE
                   File Output Operator

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/auto_join19.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/auto_join19.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/auto_join19.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/auto_join19.q.out Fri 
Aug 22 21:36:47 2014
@@ -1,6 +1,7 @@
 PREHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@dest1
 POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -62,10 +63,10 @@ STAGE PLANS:
                 keys:
                   0 key (type: string)
                   1 key (type: string)
-                outputColumnNames: _col0, _col7
+                outputColumnNames: _col0, _col8
                 Statistics: Num rows: 127 Data size: 12786 Basic stats: 
COMPLETE Column stats: NONE
                 Select Operator
-                  expressions: UDFToInteger(_col0) (type: int), _col7 (type: 
string)
+                  expressions: UDFToInteger(_col0) (type: int), _col8 (type: 
string)
                   outputColumnNames: _col0, _col1
                   Statistics: Num rows: 127 Data size: 12786 Basic stats: 
COMPLETE Column stats: NONE
                   File Output Operator

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/auto_join2.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/auto_join2.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/auto_join2.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/auto_join2.q.out Fri 
Aug 22 21:36:47 2014
@@ -1,6 +1,7 @@
 PREHOOK: query: CREATE TABLE dest_j2(key INT, value STRING) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
+PREHOOK: Output: default@dest_j2
 POSTHOOK: query: CREATE TABLE dest_j2(key INT, value STRING) STORED AS TEXTFILE
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
@@ -56,7 +57,7 @@ STAGE PLANS:
                   0 {_col0}
                   1 {value}
                 keys:
-                  0 (_col0 + _col4) (type: double)
+                  0 (_col0 + _col5) (type: double)
                   1 UDFToDouble(key) (type: double)
 
   Stage: Stage-6
@@ -77,10 +78,10 @@ STAGE PLANS:
                 keys:
                   0 key (type: string)
                   1 key (type: string)
-                outputColumnNames: _col0, _col4
+                outputColumnNames: _col0, _col5
                 Statistics: Num rows: 31 Data size: 3196 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
-                  predicate: (_col0 + _col4) is not null (type: boolean)
+                  predicate: (_col0 + _col5) is not null (type: boolean)
                   Statistics: Num rows: 16 Data size: 1649 Basic stats: 
COMPLETE Column stats: NONE
                   Map Join Operator
                     condition map:
@@ -89,12 +90,12 @@ STAGE PLANS:
                       0 {_col0}
                       1 {value}
                     keys:
-                      0 (_col0 + _col4) (type: double)
+                      0 (_col0 + _col5) (type: double)
                       1 UDFToDouble(key) (type: double)
-                    outputColumnNames: _col0, _col9
+                    outputColumnNames: _col0, _col11
                     Statistics: Num rows: 17 Data size: 1813 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
-                      expressions: UDFToInteger(_col0) (type: int), _col9 
(type: string)
+                      expressions: UDFToInteger(_col0) (type: int), _col11 
(type: string)
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 17 Data size: 1813 Basic stats: 
COMPLETE Column stats: NONE
                       File Output Operator

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/auto_join20.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/auto_join20.q.out?rev=1619936&r1=1619935&r2=1619936&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/auto_join20.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/auto_join20.q.out Fri 
Aug 22 21:36:47 2014
@@ -94,10 +94,10 @@ STAGE PLANS:
                 0 key (type: string)
                 1 key (type: string)
                 2 key (type: string)
-              outputColumnNames: _col0, _col1, _col4, _col5, _col8, _col9
+              outputColumnNames: _col0, _col1, _col5, _col6, _col10, _col11
               Statistics: Num rows: 63 Data size: 12786 Basic stats: COMPLETE 
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: 63 Data size: 12786 Basic stats: 
COMPLETE Column stats: NONE
                 Reduce Output Operator
@@ -270,10 +270,10 @@ STAGE PLANS:
                 0 key (type: string)
                 1 key (type: string)
                 2 key (type: string)
-              outputColumnNames: _col0, _col1, _col4, _col5, _col8, _col9
+              outputColumnNames: _col0, _col1, _col5, _col6, _col10, _col11
               Statistics: Num rows: 63 Data size: 12786 Basic stats: COMPLETE 
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: 63 Data size: 12786 Basic stats: 
COMPLETE Column stats: NONE
                 Reduce Output Operator


Reply via email to