Modified: 
hive/branches/cbo/ql/src/test/results/clientnegative/udf_test_error_reduce.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientnegative/udf_test_error_reduce.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
--- 
hive/branches/cbo/ql/src/test/results/clientnegative/udf_test_error_reduce.q.out
 (original)
+++ 
hive/branches/cbo/ql/src/test/results/clientnegative/udf_test_error_reduce.q.out
 Fri Jul 25 00:38:23 2014
@@ -1,9 +1,9 @@
 PREHOOK: query: CREATE TEMPORARY FUNCTION test_error AS 
'org.apache.hadoop.hive.ql.udf.UDFTestErrorOnFalse'
 PREHOOK: type: CREATEFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: test_error
 POSTHOOK: query: CREATE TEMPORARY FUNCTION test_error AS 
'org.apache.hadoop.hive.ql.udf.UDFTestErrorOnFalse'
 POSTHOOK: type: CREATEFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: test_error
 PREHOOK: query: SELECT test_error(key < 125 OR key > 130)
 FROM (
   SELECT *

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=1613335&r1=1613334&r2=1613335&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 Jul 25 00:38:23 2014
@@ -54,9 +54,9 @@ PREHOOK: query: show grant user hive_tes
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant user hive_test_user on table authorization_part
 POSTHOOK: type: SHOW_GRANT
-default        authorization_part                      hive_test_user  USER    
Create  false   -1      hive_test_user
-default        authorization_part                      hive_test_user  USER    
Drop    false   -1      hive_test_user
-default        authorization_part                      hive_test_user  USER    
Update  false   -1      hive_test_user
+default        authorization_part                      hive_test_user  USER    
CREATE  false   -1      hive_test_user
+default        authorization_part                      hive_test_user  USER    
DROP    false   -1      hive_test_user
+default        authorization_part                      hive_test_user  USER    
UPDATE  false   -1      hive_test_user
 PREHOOK: query: grant select(key) on table authorization_part to user 
hive_test_user
 PREHOOK: type: GRANT_PRIVILEGE
 PREHOOK: Output: default@authorization_part
@@ -77,7 +77,7 @@ PREHOOK: query: show grant user hive_tes
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant user hive_test_user on table 
authorization_part(key) partition (ds='2010')
 POSTHOOK: type: SHOW_GRANT
-default        authorization_part      [2010]  key     hive_test_user  USER    
Select  false   -1      hive_test_user
+default        authorization_part      [2010]  [key]   hive_test_user  USER    
SELECT  false   -1      hive_test_user
 PREHOOK: query: alter table authorization_part partition (ds='2010') rename to 
partition (ds='2010_tmp')
 PREHOOK: type: ALTERTABLE_RENAMEPART
 PREHOOK: Input: default@authorization_part
@@ -92,7 +92,7 @@ PREHOOK: query: show grant user hive_tes
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant user hive_test_user on table 
authorization_part(key) partition (ds='2010_tmp')
 POSTHOOK: type: SHOW_GRANT
-default        authorization_part      [2010_tmp]      key     hive_test_user  
USER    Select  false   -1      hive_test_user
+default        authorization_part      [2010_tmp]      [key]   hive_test_user  
USER    SELECT  false   -1      hive_test_user
 PREHOOK: query: drop table authorization_part
 PREHOOK: type: DROPTABLE
 PREHOOK: Input: default@authorization_part

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=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
Files 
hive/branches/cbo/ql/src/test/results/clientpositive/annotate_stats_filter.q.out
 (original) and 
hive/branches/cbo/ql/src/test/results/clientpositive/annotate_stats_filter.q.out
 Fri Jul 25 00:38:23 2014 differ

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/authorization_1.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/authorization_1.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/authorization_1.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/authorization_1.q.out 
Fri Jul 25 00:38:23 2014
@@ -23,7 +23,7 @@ PREHOOK: query: show grant user hive_tes
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant user hive_test_user on table src_autho_test
 POSTHOOK: type: SHOW_GRANT
-default        src_autho_test                  hive_test_user  USER    Select  
false   -1      hive_test_user
+default        src_autho_test                  hive_test_user  USER    SELECT  
false   -1      hive_test_user
 PREHOOK: query: show grant user hive_test_user on table src_autho_test(key)
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant user hive_test_user on table src_autho_test(key)
@@ -88,7 +88,7 @@ PREHOOK: query: show grant user hive_tes
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant user hive_test_user on table src_autho_test(key)
 POSTHOOK: type: SHOW_GRANT
-default        src_autho_test          key     hive_test_user  USER    Select  
false   -1      hive_test_user
+default        src_autho_test          [key]   hive_test_user  USER    SELECT  
false   -1      hive_test_user
 PREHOOK: query: select key from src_autho_test order by key limit 20
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src_autho_test
@@ -145,7 +145,7 @@ PREHOOK: query: show grant group hive_te
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant group hive_test_group1 on table src_autho_test
 POSTHOOK: type: SHOW_GRANT
-default        src_autho_test                  hive_test_group1        GROUP   
Select  false   -1      hive_test_user
+default        src_autho_test                  hive_test_group1        GROUP   
SELECT  false   -1      hive_test_user
 PREHOOK: query: show grant group hive_test_group1 on table src_autho_test(key)
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant group hive_test_group1 on table src_autho_test(key)
@@ -210,7 +210,7 @@ PREHOOK: query: show grant group hive_te
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant group hive_test_group1 on table src_autho_test(key)
 POSTHOOK: type: SHOW_GRANT
-default        src_autho_test          key     hive_test_group1        GROUP   
Select  false   -1      hive_test_user
+default        src_autho_test          [key]   hive_test_group1        GROUP   
SELECT  false   -1      hive_test_user
 PREHOOK: query: select key from src_autho_test order by key limit 20
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src_autho_test
@@ -287,7 +287,7 @@ PREHOOK: query: show grant role src_role
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant role src_role on table src_autho_test(key)
 POSTHOOK: type: SHOW_GRANT
-default        src_autho_test          key     src_role        ROLE    Select  
false   -1      hive_test_user
+default        src_autho_test          [key]   src_role        ROLE    SELECT  
false   -1      hive_test_user
 PREHOOK: query: select key from src_autho_test order by key limit 20
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src_autho_test
@@ -364,7 +364,7 @@ PREHOOK: query: show grant role src_role
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant role src_role on table src_autho_test
 POSTHOOK: type: SHOW_GRANT
-default        src_autho_test                  src_role        ROLE    Select  
false   -1      hive_test_user
+default        src_autho_test                  src_role        ROLE    SELECT  
false   -1      hive_test_user
 PREHOOK: query: show grant role src_role on table src_autho_test(key)
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant role src_role on table src_autho_test(key)

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=1613335&r1=1613334&r2=1613335&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 Jul 25 00:38:23 2014
@@ -54,9 +54,9 @@ PREHOOK: query: show grant user hive_tes
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant user hive_test_user on table authorization_part
 POSTHOOK: type: SHOW_GRANT
-default        authorization_part                      hive_test_user  USER    
Create  false   -1      hive_test_user
-default        authorization_part                      hive_test_user  USER    
Drop    false   -1      hive_test_user
-default        authorization_part                      hive_test_user  USER    
Update  false   -1      hive_test_user
+default        authorization_part                      hive_test_user  USER    
CREATE  false   -1      hive_test_user
+default        authorization_part                      hive_test_user  USER    
DROP    false   -1      hive_test_user
+default        authorization_part                      hive_test_user  USER    
UPDATE  false   -1      hive_test_user
 PREHOOK: query: alter table authorization_part add partition (ds='2010')
 PREHOOK: type: ALTERTABLE_ADDPARTS
 PREHOOK: Output: default@authorization_part
@@ -68,9 +68,9 @@ PREHOOK: query: show grant user hive_tes
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant user hive_test_user on table authorization_part 
partition (ds='2010')
 POSTHOOK: type: SHOW_GRANT
-default        authorization_part      [2010]          hive_test_user  USER    
Create  false   -1      hive_test_user
-default        authorization_part      [2010]          hive_test_user  USER    
Drop    false   -1      hive_test_user
-default        authorization_part      [2010]          hive_test_user  USER    
Update  false   -1      hive_test_user
+default        authorization_part      [2010]          hive_test_user  USER    
CREATE  false   -1      hive_test_user
+default        authorization_part      [2010]          hive_test_user  USER    
DROP    false   -1      hive_test_user
+default        authorization_part      [2010]          hive_test_user  USER    
UPDATE  false   -1      hive_test_user
 PREHOOK: query: grant select(key) on table authorization_part to user 
hive_test_user
 PREHOOK: type: GRANT_PRIVILEGE
 PREHOOK: Output: default@authorization_part
@@ -99,12 +99,12 @@ PREHOOK: query: show grant user hive_tes
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant user hive_test_user on table 
authorization_part(key) partition (ds='2010')
 POSTHOOK: type: SHOW_GRANT
-default        authorization_part      [2010]  key     hive_test_user  USER    
Select  false   -1      hive_test_user
+default        authorization_part      [2010]  [key]   hive_test_user  USER    
SELECT  false   -1      hive_test_user
 PREHOOK: query: show grant user hive_test_user on table authorization_part(key)
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant user hive_test_user on table 
authorization_part(key)
 POSTHOOK: type: SHOW_GRANT
-default        authorization_part              key     hive_test_user  USER    
Select  false   -1      hive_test_user
+default        authorization_part              [key]   hive_test_user  USER    
SELECT  false   -1      hive_test_user
 PREHOOK: query: select key from authorization_part where ds='2010' order by 
key limit 20
 PREHOOK: type: QUERY
 PREHOOK: Input: default@authorization_part
@@ -149,7 +149,7 @@ PREHOOK: query: show grant user hive_tes
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant user hive_test_user on table 
authorization_part(key) partition (ds='2010')
 POSTHOOK: type: SHOW_GRANT
-default        authorization_part      [2010]  key     hive_test_user  USER    
Select  false   -1      hive_test_user
+default        authorization_part      [2010]  [key]   hive_test_user  USER    
SELECT  false   -1      hive_test_user
 PREHOOK: query: select key from authorization_part where ds='2010' order by 
key limit 20
 PREHOOK: type: QUERY
 PREHOOK: Input: default@authorization_part
@@ -204,9 +204,9 @@ PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: -- table grant to user
 show grant user hive_test_user on table authorization_part
 POSTHOOK: type: SHOW_GRANT
-default        authorization_part                      hive_test_user  USER    
Create  false   -1      hive_test_user
-default        authorization_part                      hive_test_user  USER    
Drop    false   -1      hive_test_user
-default        authorization_part                      hive_test_user  USER    
Update  false   -1      hive_test_user
+default        authorization_part                      hive_test_user  USER    
CREATE  false   -1      hive_test_user
+default        authorization_part                      hive_test_user  USER    
DROP    false   -1      hive_test_user
+default        authorization_part                      hive_test_user  USER    
UPDATE  false   -1      hive_test_user
 PREHOOK: query: alter table authorization_part add partition (ds='2010')
 PREHOOK: type: ALTERTABLE_ADDPARTS
 PREHOOK: Output: default@authorization_part
@@ -218,9 +218,9 @@ PREHOOK: query: show grant user hive_tes
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant user hive_test_user on table authorization_part 
partition (ds='2010')
 POSTHOOK: type: SHOW_GRANT
-default        authorization_part      [2010]          hive_test_user  USER    
Create  false   -1      hive_test_user
-default        authorization_part      [2010]          hive_test_user  USER    
Drop    false   -1      hive_test_user
-default        authorization_part      [2010]          hive_test_user  USER    
Update  false   -1      hive_test_user
+default        authorization_part      [2010]          hive_test_user  USER    
CREATE  false   -1      hive_test_user
+default        authorization_part      [2010]          hive_test_user  USER    
DROP    false   -1      hive_test_user
+default        authorization_part      [2010]          hive_test_user  USER    
UPDATE  false   -1      hive_test_user
 PREHOOK: query: grant select on table authorization_part to user hive_test_user
 PREHOOK: type: GRANT_PRIVILEGE
 PREHOOK: Output: default@authorization_part
@@ -249,18 +249,18 @@ PREHOOK: query: show grant user hive_tes
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant user hive_test_user on table authorization_part 
partition (ds='2010')
 POSTHOOK: type: SHOW_GRANT
-default        authorization_part      [2010]          hive_test_user  USER    
Create  false   -1      hive_test_user
-default        authorization_part      [2010]          hive_test_user  USER    
Drop    false   -1      hive_test_user
-default        authorization_part      [2010]          hive_test_user  USER    
Select  false   -1      hive_test_user
-default        authorization_part      [2010]          hive_test_user  USER    
Update  false   -1      hive_test_user
+default        authorization_part      [2010]          hive_test_user  USER    
CREATE  false   -1      hive_test_user
+default        authorization_part      [2010]          hive_test_user  USER    
DROP    false   -1      hive_test_user
+default        authorization_part      [2010]          hive_test_user  USER    
SELECT  false   -1      hive_test_user
+default        authorization_part      [2010]          hive_test_user  USER    
UPDATE  false   -1      hive_test_user
 PREHOOK: query: show grant user hive_test_user on table authorization_part
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant user hive_test_user on table authorization_part
 POSTHOOK: type: SHOW_GRANT
-default        authorization_part                      hive_test_user  USER    
Create  false   -1      hive_test_user
-default        authorization_part                      hive_test_user  USER    
Drop    false   -1      hive_test_user
-default        authorization_part                      hive_test_user  USER    
Select  false   -1      hive_test_user
-default        authorization_part                      hive_test_user  USER    
Update  false   -1      hive_test_user
+default        authorization_part                      hive_test_user  USER    
CREATE  false   -1      hive_test_user
+default        authorization_part                      hive_test_user  USER    
DROP    false   -1      hive_test_user
+default        authorization_part                      hive_test_user  USER    
SELECT  false   -1      hive_test_user
+default        authorization_part                      hive_test_user  USER    
UPDATE  false   -1      hive_test_user
 PREHOOK: query: select key from authorization_part where ds='2010' order by 
key limit 20
 PREHOOK: type: QUERY
 PREHOOK: Input: default@authorization_part
@@ -301,17 +301,17 @@ PREHOOK: query: show grant user hive_tes
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant user hive_test_user on table authorization_part
 POSTHOOK: type: SHOW_GRANT
-default        authorization_part                      hive_test_user  USER    
Create  false   -1      hive_test_user
-default        authorization_part                      hive_test_user  USER    
Drop    false   -1      hive_test_user
-default        authorization_part                      hive_test_user  USER    
Update  false   -1      hive_test_user
+default        authorization_part                      hive_test_user  USER    
CREATE  false   -1      hive_test_user
+default        authorization_part                      hive_test_user  USER    
DROP    false   -1      hive_test_user
+default        authorization_part                      hive_test_user  USER    
UPDATE  false   -1      hive_test_user
 PREHOOK: query: show grant user hive_test_user on table authorization_part 
partition (ds='2010')
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant user hive_test_user on table authorization_part 
partition (ds='2010')
 POSTHOOK: type: SHOW_GRANT
-default        authorization_part      [2010]          hive_test_user  USER    
Create  false   -1      hive_test_user
-default        authorization_part      [2010]          hive_test_user  USER    
Drop    false   -1      hive_test_user
-default        authorization_part      [2010]          hive_test_user  USER    
Select  false   -1      hive_test_user
-default        authorization_part      [2010]          hive_test_user  USER    
Update  false   -1      hive_test_user
+default        authorization_part      [2010]          hive_test_user  USER    
CREATE  false   -1      hive_test_user
+default        authorization_part      [2010]          hive_test_user  USER    
DROP    false   -1      hive_test_user
+default        authorization_part      [2010]          hive_test_user  USER    
SELECT  false   -1      hive_test_user
+default        authorization_part      [2010]          hive_test_user  USER    
UPDATE  false   -1      hive_test_user
 PREHOOK: query: select key from authorization_part where ds='2010' order by 
key limit 20
 PREHOOK: type: QUERY
 PREHOOK: Input: default@authorization_part
@@ -352,9 +352,9 @@ PREHOOK: query: show grant user hive_tes
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant user hive_test_user on table authorization_part 
partition (ds='2010')
 POSTHOOK: type: SHOW_GRANT
-default        authorization_part      [2010]          hive_test_user  USER    
Create  false   -1      hive_test_user
-default        authorization_part      [2010]          hive_test_user  USER    
Drop    false   -1      hive_test_user
-default        authorization_part      [2010]          hive_test_user  USER    
Update  false   -1      hive_test_user
+default        authorization_part      [2010]          hive_test_user  USER    
CREATE  false   -1      hive_test_user
+default        authorization_part      [2010]          hive_test_user  USER    
DROP    false   -1      hive_test_user
+default        authorization_part      [2010]          hive_test_user  USER    
UPDATE  false   -1      hive_test_user
 PREHOOK: query: alter table authorization_part drop partition (ds='2010')
 PREHOOK: type: ALTERTABLE_DROPPARTS
 PREHOOK: Input: default@authorization_part
@@ -410,12 +410,12 @@ PREHOOK: query: show grant group hive_te
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant group hive_test_group1 on table 
authorization_part(key) partition (ds='2010')
 POSTHOOK: type: SHOW_GRANT
-default        authorization_part      [2010]  key     hive_test_group1        
GROUP   Select  false   -1      hive_test_user
+default        authorization_part      [2010]  [key]   hive_test_group1        
GROUP   SELECT  false   -1      hive_test_user
 PREHOOK: query: show grant group hive_test_group1 on table 
authorization_part(key)
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant group hive_test_group1 on table 
authorization_part(key)
 POSTHOOK: type: SHOW_GRANT
-default        authorization_part              key     hive_test_group1        
GROUP   Select  false   -1      hive_test_user
+default        authorization_part              [key]   hive_test_group1        
GROUP   SELECT  false   -1      hive_test_user
 PREHOOK: query: select key from authorization_part where ds='2010' order by 
key limit 20
 PREHOOK: type: QUERY
 PREHOOK: Input: default@authorization_part
@@ -460,7 +460,7 @@ PREHOOK: query: show grant group hive_te
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant group hive_test_group1 on table 
authorization_part(key) partition (ds='2010')
 POSTHOOK: type: SHOW_GRANT
-default        authorization_part      [2010]  key     hive_test_group1        
GROUP   Select  false   -1      hive_test_user
+default        authorization_part      [2010]  [key]   hive_test_group1        
GROUP   SELECT  false   -1      hive_test_user
 PREHOOK: query: select key from authorization_part where ds='2010' order by 
key limit 20
 PREHOOK: type: QUERY
 PREHOOK: Input: default@authorization_part
@@ -554,12 +554,12 @@ PREHOOK: query: show grant group hive_te
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant group hive_test_group1 on table authorization_part 
partition (ds='2010')
 POSTHOOK: type: SHOW_GRANT
-default        authorization_part      [2010]          hive_test_group1        
GROUP   Select  false   -1      hive_test_user
+default        authorization_part      [2010]          hive_test_group1        
GROUP   SELECT  false   -1      hive_test_user
 PREHOOK: query: show grant group hive_test_group1 on table authorization_part
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant group hive_test_group1 on table authorization_part
 POSTHOOK: type: SHOW_GRANT
-default        authorization_part                      hive_test_group1        
GROUP   Select  false   -1      hive_test_user
+default        authorization_part                      hive_test_group1        
GROUP   SELECT  false   -1      hive_test_user
 PREHOOK: query: select key from authorization_part where ds='2010' order by 
key limit 20
 PREHOOK: type: QUERY
 PREHOOK: Input: default@authorization_part
@@ -604,7 +604,7 @@ PREHOOK: query: show grant group hive_te
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant group hive_test_group1 on table authorization_part 
partition (ds='2010')
 POSTHOOK: type: SHOW_GRANT
-default        authorization_part      [2010]          hive_test_group1        
GROUP   Select  false   -1      hive_test_user
+default        authorization_part      [2010]          hive_test_group1        
GROUP   SELECT  false   -1      hive_test_user
 PREHOOK: query: select key from authorization_part where ds='2010' order by 
key limit 20
 PREHOOK: type: QUERY
 PREHOOK: Input: default@authorization_part

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/authorization_3.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/authorization_3.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/authorization_3.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/authorization_3.q.out 
Fri Jul 25 00:38:23 2014
@@ -25,8 +25,8 @@ PREHOOK: query: show grant user hive_tes
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant user hive_test_user on table src_autho_test
 POSTHOOK: type: SHOW_GRANT
-default        src_autho_test                  hive_test_user  USER    Drop    
false   -1      hive_test_user
-default        src_autho_test                  hive_test_user  USER    Select  
false   -1      hive_test_user
+default        src_autho_test                  hive_test_user  USER    DROP    
false   -1      hive_test_user
+default        src_autho_test                  hive_test_user  USER    SELECT  
false   -1      hive_test_user
 PREHOOK: query: revoke select on table src_autho_test from user hive_test_user
 PREHOOK: type: REVOKE_PRIVILEGE
 PREHOOK: Output: default@src_autho_test
@@ -49,8 +49,8 @@ PREHOOK: query: show grant user hive_tes
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant user hive_test_user on table src_autho_test
 POSTHOOK: type: SHOW_GRANT
-default        src_autho_test                  hive_test_user  USER    Drop    
false   -1      hive_test_user
-default        src_autho_test                  hive_test_user  USER    Select  
false   -1      hive_test_user
+default        src_autho_test                  hive_test_user  USER    DROP    
false   -1      hive_test_user
+default        src_autho_test                  hive_test_user  USER    SELECT  
false   -1      hive_test_user
 PREHOOK: query: revoke drop,select on table src_autho_test from user 
hive_test_user
 PREHOOK: type: REVOKE_PRIVILEGE
 PREHOOK: Output: default@src_autho_test
@@ -67,7 +67,7 @@ PREHOOK: query: show grant user hive_tes
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant user hive_test_user on table src_autho_test
 POSTHOOK: type: SHOW_GRANT
-default        src_autho_test                  hive_test_user  USER    Drop    
false   -1      hive_test_user
+default        src_autho_test                  hive_test_user  USER    DROP    
false   -1      hive_test_user
 PREHOOK: query: revoke drop,select(key), select(value) on table src_autho_test 
from user hive_test_user
 PREHOOK: type: REVOKE_PRIVILEGE
 PREHOOK: Output: default@src_autho_test

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/authorization_4.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/authorization_4.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/authorization_4.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/authorization_4.q.out 
Fri Jul 25 00:38:23 2014
@@ -19,7 +19,7 @@ PREHOOK: query: show grant user hive_tes
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant user hive_test_user on table src_autho_test
 POSTHOOK: type: SHOW_GRANT
-default        src_autho_test                  hive_test_user  USER    All     
false   -1      hive_test_user
+default        src_autho_test                  hive_test_user  USER    ALL     
false   -1      hive_test_user
 PREHOOK: query: select key from src_autho_test order by key limit 20
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src_autho_test

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=1613335&r1=1613334&r2=1613335&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 Jul 25 00:38:23 2014
@@ -24,8 +24,8 @@ PREHOOK: query: SHOW GRANT USER hive_tes
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: SHOW GRANT USER hive_test_user ON DATABASE test_db
 POSTHOOK: type: SHOW_GRANT
-test_db                                hive_test_user  USER    Drop    false   
-1      hive_test_user
-test_db                                hive_test_user  USER    Select  false   
-1      hive_test_user
+test_db                                hive_test_user  USER    DROP    false   
-1      hive_test_user
+test_db                                hive_test_user  USER    SELECT  false   
-1      hive_test_user
 PREHOOK: query: CREATE ROLE db_test_role
 PREHOOK: type: CREATEROLE
 POSTHOOK: query: CREATE ROLE db_test_role
@@ -52,8 +52,8 @@ PREHOOK: query: SHOW GRANT ROLE db_test_
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: SHOW GRANT ROLE db_test_role ON DATABASE test_db
 POSTHOOK: type: SHOW_GRANT
-test_db                                db_test_role    ROLE    Drop    false   
-1      hive_test_user
-test_db                                db_test_role    ROLE    Select  false   
-1      hive_test_user
+test_db                                db_test_role    ROLE    DROP    false   
-1      hive_test_user
+test_db                                db_test_role    ROLE    SELECT  false   
-1      hive_test_user
 PREHOOK: query: DROP DATABASE IF EXISTS test_db
 PREHOOK: type: DROPDATABASE
 PREHOOK: Input: database:test_db

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=1613335&r1=1613334&r2=1613335&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 Jul 25 00:38:23 2014
@@ -54,9 +54,9 @@ PREHOOK: query: show grant user hive_tes
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant user hive_test_user on table authorization_part
 POSTHOOK: type: SHOW_GRANT
-default        authorization_part                      hive_test_user  USER    
Create  false   -1      hive_test_user
-default        authorization_part                      hive_test_user  USER    
Drop    false   -1      hive_test_user
-default        authorization_part                      hive_test_user  USER    
Update  false   -1      hive_test_user
+default        authorization_part                      hive_test_user  USER    
CREATE  false   -1      hive_test_user
+default        authorization_part                      hive_test_user  USER    
DROP    false   -1      hive_test_user
+default        authorization_part                      hive_test_user  USER    
UPDATE  false   -1      hive_test_user
 PREHOOK: query: grant select(key) on table authorization_part to user 
hive_test_user
 PREHOOK: type: GRANT_PRIVILEGE
 PREHOOK: Output: default@authorization_part
@@ -87,17 +87,17 @@ PREHOOK: query: show grant user hive_tes
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant user hive_test_user on table 
authorization_part(key) partition (ds='2010')
 POSTHOOK: type: SHOW_GRANT
-default        authorization_part      [2010]  key     hive_test_user  USER    
Select  false   -1      hive_test_user
+default        authorization_part      [2010]  [key]   hive_test_user  USER    
SELECT  false   -1      hive_test_user
 PREHOOK: query: show grant user hive_test_user on table 
authorization_part(key) partition (ds='2011')
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant user hive_test_user on table 
authorization_part(key) partition (ds='2011')
 POSTHOOK: type: SHOW_GRANT
-default        authorization_part      [2011]  key     hive_test_user  USER    
Select  false   -1      hive_test_user
+default        authorization_part      [2011]  [key]   hive_test_user  USER    
SELECT  false   -1      hive_test_user
 PREHOOK: query: show grant user hive_test_user on table authorization_part(key)
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant user hive_test_user on table 
authorization_part(key)
 POSTHOOK: type: SHOW_GRANT
-default        authorization_part              key     hive_test_user  USER    
Select  false   -1      hive_test_user
+default        authorization_part              [key]   hive_test_user  USER    
SELECT  false   -1      hive_test_user
 PREHOOK: query: select key from authorization_part where ds>='2010' order by 
key limit 20
 PREHOOK: type: QUERY
 PREHOOK: Input: default@authorization_part
@@ -169,8 +169,8 @@ PREHOOK: query: show grant user hive_tes
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant user hive_test_user on table authorization_part
 POSTHOOK: type: SHOW_GRANT
-default        authorization_part                      hive_test_user  USER    
Create  false   -1      hive_test_user
-default        authorization_part                      hive_test_user  USER    
Update  false   -1      hive_test_user
+default        authorization_part                      hive_test_user  USER    
CREATE  false   -1      hive_test_user
+default        authorization_part                      hive_test_user  USER    
UPDATE  false   -1      hive_test_user
 PREHOOK: query: grant select(key) on table authorization_part to user 
hive_test_user
 PREHOOK: type: GRANT_PRIVILEGE
 PREHOOK: Output: default@authorization_part
@@ -209,7 +209,7 @@ PREHOOK: query: show grant user hive_tes
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant user hive_test_user on table 
authorization_part(key)
 POSTHOOK: type: SHOW_GRANT
-default        authorization_part              key     hive_test_user  USER    
Select  false   -1      hive_test_user
+default        authorization_part              [key]   hive_test_user  USER    
SELECT  false   -1      hive_test_user
 PREHOOK: query: select key from authorization_part where ds>='2010' order by 
key limit 20
 PREHOOK: type: QUERY
 PREHOOK: Input: default@authorization_part

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=1613335&r1=1613334&r2=1613335&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 Jul 25 00:38:23 2014
@@ -29,20 +29,20 @@ PREHOOK: query: show grant user hive_tes
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant user hive_test_user on database default
 POSTHOOK: type: SHOW_GRANT
-default                                hive_test_user  USER    Select  false   
-1      hive_test_user
+default                                hive_test_user  USER    SELECT  false   
-1      hive_test_user
 PREHOOK: query: show grant user hive_test_user on table dummy
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant user hive_test_user on table dummy
 POSTHOOK: type: SHOW_GRANT
-default        dummy                   hive_test_user  USER    Select  false   
-1      hive_test_user
+default        dummy                   hive_test_user  USER    SELECT  false   
-1      hive_test_user
 PREHOOK: query: show grant user hive_test_user on all
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant user hive_test_user on all
 POSTHOOK: type: SHOW_GRANT
-default                                hive_test_user  USER    Select  false   
-1      hive_test_user
-default        dummy                   hive_test_user  USER    Select  false   
-1      hive_test_user
-default        dummy           key     hive_test_user  USER    Select  false   
-1      hive_test_user
-default        dummy           value   hive_test_user  USER    Select  false   
-1      hive_test_user
+default                                hive_test_user  USER    SELECT  false   
-1      hive_test_user
+default        dummy                   hive_test_user  USER    SELECT  false   
-1      hive_test_user
+default        dummy           [key]   hive_test_user  USER    SELECT  false   
-1      hive_test_user
+default        dummy           [value] hive_test_user  USER    SELECT  false   
-1      hive_test_user
 PREHOOK: query: grant select on database default to user hive_test_user2
 PREHOOK: type: GRANT_PRIVILEGE
 POSTHOOK: query: grant select on database default to user hive_test_user2
@@ -63,15 +63,15 @@ PREHOOK: query: show grant on all
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant on all
 POSTHOOK: type: SHOW_GRANT
-                               admin   ROLE    All     true    -1      admin
-default                                hive_test_user  USER    Select  false   
-1      hive_test_user
-default                                hive_test_user2 USER    Select  false   
-1      hive_test_user
-default        dummy                   hive_test_user  USER    Select  false   
-1      hive_test_user
-default        dummy                   hive_test_user2 USER    Select  false   
-1      hive_test_user
-default        dummy           key     hive_test_user  USER    Select  false   
-1      hive_test_user
-default        dummy           key     hive_test_user2 USER    Select  false   
-1      hive_test_user
-default        dummy           value   hive_test_user  USER    Select  false   
-1      hive_test_user
-default        dummy           value   hive_test_user2 USER    Select  false   
-1      hive_test_user
+                               admin   ROLE    ALL     true    -1      admin
+default                                hive_test_user  USER    SELECT  false   
-1      hive_test_user
+default                                hive_test_user2 USER    SELECT  false   
-1      hive_test_user
+default        dummy                   hive_test_user  USER    SELECT  false   
-1      hive_test_user
+default        dummy                   hive_test_user2 USER    SELECT  false   
-1      hive_test_user
+default        dummy           [key]   hive_test_user  USER    SELECT  false   
-1      hive_test_user
+default        dummy           [key]   hive_test_user2 USER    SELECT  false   
-1      hive_test_user
+default        dummy           [value] hive_test_user  USER    SELECT  false   
-1      hive_test_user
+default        dummy           [value] hive_test_user2 USER    SELECT  false   
-1      hive_test_user
 PREHOOK: query: revoke select on database default from user hive_test_user
 PREHOOK: type: REVOKE_PRIVILEGE
 POSTHOOK: query: revoke select on database default from user hive_test_user

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=1613335&r1=1613334&r2=1613335&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 Jul 25 00:38:23 2014
@@ -6,25 +6,29 @@ set role ADMIN
 POSTHOOK: type: SHOW_ROLES
 PREHOOK: query: create temporary function temp_fn as 
'org.apache.hadoop.hive.ql.udf.UDFAscii'
 PREHOOK: type: CREATEFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: temp_fn
 POSTHOOK: query: create temporary function temp_fn as 
'org.apache.hadoop.hive.ql.udf.UDFAscii'
 POSTHOOK: type: CREATEFUNCTION
-POSTHOOK: Output: database:default
+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
 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
 PREHOOK: query: drop temporary function temp_fn
 PREHOOK: type: DROPFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: temp_fn
 POSTHOOK: query: drop temporary function temp_fn
 POSTHOOK: type: DROPFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: temp_fn
 PREHOOK: query: drop function perm_fn
 PREHOOK: type: DROPFUNCTION
 PREHOOK: Output: database:default
+PREHOOK: Output: perm_fn
 POSTHOOK: query: drop function perm_fn
 POSTHOOK: type: DROPFUNCTION
 POSTHOOK: Output: database:default
+POSTHOOK: Output: perm_fn

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=1613335&r1=1613334&r2=1613335&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 Jul 25 00:38:23 2014
@@ -155,6 +155,19 @@ PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: SHOW GRANT USER user2 ON TABLE table_priv_rev
 POSTHOOK: type: SHOW_GRANT
 default        table_priv_rev                  user2   USER    SELECT  true    
-1      user1
+PREHOOK: query: -- revoke grant option for select privilege from user2
+REVOKE GRANT OPTION FOR SELECT ON TABLE table_priv_rev FROM USER user2
+PREHOOK: type: REVOKE_PRIVILEGE
+PREHOOK: Output: default@table_priv_rev
+POSTHOOK: query: -- revoke grant option for select privilege from user2
+REVOKE GRANT OPTION FOR SELECT ON TABLE table_priv_rev FROM USER user2
+POSTHOOK: type: REVOKE_PRIVILEGE
+POSTHOOK: Output: default@table_priv_rev
+PREHOOK: query: SHOW GRANT USER user2 ON TABLE table_priv_rev
+PREHOOK: type: SHOW_GRANT
+POSTHOOK: query: SHOW GRANT USER user2 ON TABLE table_priv_rev
+POSTHOOK: type: SHOW_GRANT
+default        table_priv_rev                  user2   USER    SELECT  false   
-1      user1
 PREHOOK: query: -- revoke select privilege from user2
 REVOKE SELECT ON TABLE table_priv_rev FROM USER user2
 PREHOOK: type: REVOKE_PRIVILEGE

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/autogen_colalias.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/autogen_colalias.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/autogen_colalias.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/autogen_colalias.q.out 
Fri Jul 25 00:38:23 2014
@@ -1,9 +1,9 @@
 PREHOOK: query: CREATE TEMPORARY FUNCTION test_max AS 
'org.apache.hadoop.hive.ql.udf.UDAFTestMax'
 PREHOOK: type: CREATEFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: test_max
 POSTHOOK: query: CREATE TEMPORARY FUNCTION test_max AS 
'org.apache.hadoop.hive.ql.udf.UDAFTestMax'
 POSTHOOK: type: CREATEFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: test_max
 PREHOOK: query: create table dest_grouped_old1 as select 1+1, 2+2 as zz, 
src.key, test_max(length(src.value)), count(src.value), sin(count(src.value)), 
count(sin(src.value)), unix_timestamp(), CAST(SUM(IF(value > 10, value, 1)) AS 
INT), if(src.key > 1,
 1,
 0)
@@ -93,8 +93,8 @@ key                   string             
 PREHOOK: query: -- Drop the temporary function at the end till HIVE-3160 gets 
fixed
 DROP TEMPORARY FUNCTION test_max
 PREHOOK: type: DROPFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: test_max
 POSTHOOK: query: -- Drop the temporary function at the end till HIVE-3160 gets 
fixed
 DROP TEMPORARY FUNCTION test_max
 POSTHOOK: type: DROPFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: test_max

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/avro_partitioned.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/avro_partitioned.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/avro_partitioned.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/avro_partitioned.q.out 
Fri Jul 25 00:38:23 2014
@@ -236,6 +236,40 @@ SELECT * FROM episodes_partitioned WHERE
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@episodes_partitioned
 #### A masked pattern was here ####
+PREHOOK: query: -- Alter table add an empty partition
+ALTER TABLE episodes_partitioned ADD PARTITION (doctor_pt=7)
+PREHOOK: type: ALTERTABLE_ADDPARTS
+PREHOOK: Output: default@episodes_partitioned
+POSTHOOK: query: -- Alter table add an empty partition
+ALTER TABLE episodes_partitioned ADD PARTITION (doctor_pt=7)
+POSTHOOK: type: ALTERTABLE_ADDPARTS
+POSTHOOK: Output: default@episodes_partitioned
+POSTHOOK: Output: default@episodes_partitioned@doctor_pt=7
+PREHOOK: query: SELECT COUNT(*) FROM episodes_partitioned
+PREHOOK: type: QUERY
+PREHOOK: Input: default@episodes_partitioned
+PREHOOK: Input: default@episodes_partitioned@doctor_pt=1
+PREHOOK: Input: default@episodes_partitioned@doctor_pt=11
+PREHOOK: Input: default@episodes_partitioned@doctor_pt=2
+PREHOOK: Input: default@episodes_partitioned@doctor_pt=4
+PREHOOK: Input: default@episodes_partitioned@doctor_pt=5
+PREHOOK: Input: default@episodes_partitioned@doctor_pt=6
+PREHOOK: Input: default@episodes_partitioned@doctor_pt=7
+PREHOOK: Input: default@episodes_partitioned@doctor_pt=9
+#### A masked pattern was here ####
+POSTHOOK: query: SELECT COUNT(*) FROM episodes_partitioned
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@episodes_partitioned
+POSTHOOK: Input: default@episodes_partitioned@doctor_pt=1
+POSTHOOK: Input: default@episodes_partitioned@doctor_pt=11
+POSTHOOK: Input: default@episodes_partitioned@doctor_pt=2
+POSTHOOK: Input: default@episodes_partitioned@doctor_pt=4
+POSTHOOK: Input: default@episodes_partitioned@doctor_pt=5
+POSTHOOK: Input: default@episodes_partitioned@doctor_pt=6
+POSTHOOK: Input: default@episodes_partitioned@doctor_pt=7
+POSTHOOK: Input: default@episodes_partitioned@doctor_pt=9
+#### A masked pattern was here ####
+8
 PREHOOK: query: -- Verify that reading from an Avro partition works
 -- even if it has an old schema relative to the current table level schema
 

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/compile_processor.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/compile_processor.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
--- 
hive/branches/cbo/ql/src/test/results/clientpositive/compile_processor.q.out 
(original)
+++ 
hive/branches/cbo/ql/src/test/results/clientpositive/compile_processor.q.out 
Fri Jul 25 00:38:23 2014
@@ -1,9 +1,9 @@
 PREHOOK: query: CREATE TEMPORARY FUNCTION Pyth as 'Pyth'
 PREHOOK: type: CREATEFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: pyth
 POSTHOOK: query: CREATE TEMPORARY FUNCTION Pyth as 'Pyth'
 POSTHOOK: type: CREATEFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: pyth
 PREHOOK: query: SELECT Pyth(3,4) FROM src tablesample (1 rows)
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
@@ -15,7 +15,7 @@ POSTHOOK: Input: default@src
 5.0
 PREHOOK: query: DROP TEMPORARY FUNCTION Pyth
 PREHOOK: type: DROPFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: Pyth
 POSTHOOK: query: DROP TEMPORARY FUNCTION Pyth
 POSTHOOK: type: DROPFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: Pyth

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/create_func1.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/create_func1.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/create_func1.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/create_func1.q.out Fri 
Jul 25 00:38:23 2014
@@ -16,9 +16,11 @@ POSTHOOK: type: CREATEDATABASE
 PREHOOK: query: create function mydb.func1 as 
'org.apache.hadoop.hive.ql.udf.generic.GenericUDFUpper'
 PREHOOK: type: CREATEFUNCTION
 PREHOOK: Output: database:mydb
+PREHOOK: Output: mydb.func1
 POSTHOOK: query: create function mydb.func1 as 
'org.apache.hadoop.hive.ql.udf.generic.GenericUDFUpper'
 POSTHOOK: type: CREATEFUNCTION
 POSTHOOK: Output: database:mydb
+POSTHOOK: Output: mydb.func1
 PREHOOK: query: show functions mydb.func1
 PREHOOK: type: SHOWFUNCTIONS
 POSTHOOK: query: show functions mydb.func1
@@ -36,9 +38,11 @@ ABC
 PREHOOK: query: drop function mydb.func1
 PREHOOK: type: DROPFUNCTION
 PREHOOK: Output: database:mydb
+PREHOOK: Output: mydb.func1
 POSTHOOK: query: drop function mydb.func1
 POSTHOOK: type: DROPFUNCTION
 POSTHOOK: Output: database:mydb
+POSTHOOK: Output: mydb.func1
 PREHOOK: query: -- function should now be gone
 show functions mydb.func1
 PREHOOK: type: SHOWFUNCTIONS
@@ -49,10 +53,12 @@ PREHOOK: query: -- To test function name
 create function mydb.qtest_get_java_boolean as 
'org.apache.hadoop.hive.ql.udf.generic.GenericUDFUpper'
 PREHOOK: type: CREATEFUNCTION
 PREHOOK: Output: database:mydb
+PREHOOK: Output: mydb.qtest_get_java_boolean
 POSTHOOK: query: -- To test function name resolution
 create function mydb.qtest_get_java_boolean as 
'org.apache.hadoop.hive.ql.udf.generic.GenericUDFUpper'
 POSTHOOK: type: CREATEFUNCTION
 POSTHOOK: Output: database:mydb
+POSTHOOK: Output: mydb.qtest_get_java_boolean
 PREHOOK: query: use default
 PREHOOK: type: SWITCHDATABASE
 POSTHOOK: query: use default
@@ -86,9 +92,11 @@ ABC  NULL    ABC
 PREHOOK: query: drop function mydb.qtest_get_java_boolean
 PREHOOK: type: DROPFUNCTION
 PREHOOK: Output: database:mydb
+PREHOOK: Output: mydb.qtest_get_java_boolean
 POSTHOOK: query: drop function mydb.qtest_get_java_boolean
 POSTHOOK: type: DROPFUNCTION
 POSTHOOK: Output: database:mydb
+POSTHOOK: Output: mydb.qtest_get_java_boolean
 PREHOOK: query: drop database mydb cascade
 PREHOOK: type: DROPDATABASE
 PREHOOK: Input: database:mydb

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/create_genericudaf.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/create_genericudaf.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
--- 
hive/branches/cbo/ql/src/test/results/clientpositive/create_genericudaf.q.out 
(original)
+++ 
hive/branches/cbo/ql/src/test/results/clientpositive/create_genericudaf.q.out 
Fri Jul 25 00:38:23 2014
@@ -12,10 +12,10 @@ STAGE PLANS:
 
 PREHOOK: query: CREATE TEMPORARY FUNCTION test_avg AS 
'org.apache.hadoop.hive.ql.udf.generic.GenericUDAFAverage'
 PREHOOK: type: CREATEFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: test_avg
 POSTHOOK: query: CREATE TEMPORARY FUNCTION test_avg AS 
'org.apache.hadoop.hive.ql.udf.generic.GenericUDAFAverage'
 POSTHOOK: type: CREATEFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: test_avg
 PREHOOK: query: EXPLAIN
 SELECT
     test_avg(1),
@@ -93,7 +93,7 @@ POSTHOOK: Input: default@src
 1.0    260.182
 PREHOOK: query: DROP TEMPORARY FUNCTIOn test_avg
 PREHOOK: type: DROPFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: test_avg
 POSTHOOK: query: DROP TEMPORARY FUNCTIOn test_avg
 POSTHOOK: type: DROPFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: test_avg

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/create_genericudf.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/create_genericudf.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
--- 
hive/branches/cbo/ql/src/test/results/clientpositive/create_genericudf.q.out 
(original)
+++ 
hive/branches/cbo/ql/src/test/results/clientpositive/create_genericudf.q.out 
Fri Jul 25 00:38:23 2014
@@ -12,10 +12,10 @@ STAGE PLANS:
 
 PREHOOK: query: CREATE TEMPORARY FUNCTION test_translate AS 
'org.apache.hadoop.hive.ql.udf.generic.GenericUDFTestTranslate'
 PREHOOK: type: CREATEFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: test_translate
 POSTHOOK: query: CREATE TEMPORARY FUNCTION test_translate AS 
'org.apache.hadoop.hive.ql.udf.generic.GenericUDFTestTranslate'
 POSTHOOK: type: CREATEFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: test_translate
 PREHOOK: query: CREATE TABLE dest1(c1 STRING, c2 STRING, c3 STRING, c4 STRING, 
c5 STRING, c6 STRING, c7 STRING)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
@@ -67,7 +67,7 @@ POSTHOOK: Input: default@dest1
 bbc    bcc     NULL    NULL    NULL    bc      abc
 PREHOOK: query: DROP TEMPORARY FUNCTION test_translate
 PREHOOK: type: DROPFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: test_translate
 POSTHOOK: query: DROP TEMPORARY FUNCTION test_translate
 POSTHOOK: type: DROPFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: test_translate

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/create_udaf.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/create_udaf.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/create_udaf.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/create_udaf.q.out Fri 
Jul 25 00:38:23 2014
@@ -12,10 +12,10 @@ STAGE PLANS:
 
 PREHOOK: query: CREATE TEMPORARY FUNCTION test_max AS 
'org.apache.hadoop.hive.ql.udf.UDAFTestMax'
 PREHOOK: type: CREATEFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: test_max
 POSTHOOK: query: CREATE TEMPORARY FUNCTION test_max AS 
'org.apache.hadoop.hive.ql.udf.UDAFTestMax'
 POSTHOOK: type: CREATEFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: test_max
 PREHOOK: query: CREATE TABLE dest1(col INT)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
@@ -90,7 +90,7 @@ POSTHOOK: Input: default@src
 98
 PREHOOK: query: DROP TEMPORARY FUNCTION test_max
 PREHOOK: type: DROPFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: test_max
 POSTHOOK: query: DROP TEMPORARY FUNCTION test_max
 POSTHOOK: type: DROPFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: test_max

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/create_view.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/create_view.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/create_view.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/create_view.q.out Fri 
Jul 25 00:38:23 2014
@@ -693,12 +693,12 @@ PREHOOK: query: -- test usage of a funct
 CREATE TEMPORARY FUNCTION test_translate AS
 'org.apache.hadoop.hive.ql.udf.generic.GenericUDFTestTranslate'
 PREHOOK: type: CREATEFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: test_translate
 POSTHOOK: query: -- test usage of a function within a view
 CREATE TEMPORARY FUNCTION test_translate AS
 'org.apache.hadoop.hive.ql.udf.generic.GenericUDFTestTranslate'
 POSTHOOK: type: CREATEFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: test_translate
 PREHOOK: query: CREATE VIEW view8(c) AS
 SELECT test_translate('abc', 'a', 'b')
 FROM table1
@@ -769,12 +769,12 @@ PREHOOK: query: -- test usage of a UDAF 
 CREATE TEMPORARY FUNCTION test_max AS
 'org.apache.hadoop.hive.ql.udf.UDAFTestMax'
 PREHOOK: type: CREATEFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: test_max
 POSTHOOK: query: -- test usage of a UDAF within a view
 CREATE TEMPORARY FUNCTION test_max AS
 'org.apache.hadoop.hive.ql.udf.UDAFTestMax'
 POSTHOOK: type: CREATEFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: test_max
 PREHOOK: query: -- disable map-side aggregation
 CREATE VIEW view9(m) AS
 SELECT test_max(length(value))
@@ -987,12 +987,12 @@ PREHOOK: query: -- test usage of a UDTF 
 CREATE TEMPORARY FUNCTION test_explode AS
 'org.apache.hadoop.hive.ql.udf.generic.GenericUDTFExplode'
 PREHOOK: type: CREATEFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: test_explode
 POSTHOOK: query: -- test usage of a UDTF within a view
 CREATE TEMPORARY FUNCTION test_explode AS
 'org.apache.hadoop.hive.ql.udf.generic.GenericUDTFExplode'
 POSTHOOK: type: CREATEFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: test_explode
 PREHOOK: query: CREATE VIEW view11 AS
 SELECT test_explode(array(1,2,3)) AS (boom)
 FROM table1
@@ -1714,19 +1714,19 @@ POSTHOOK: Input: default@view16
 POSTHOOK: Output: default@view16
 PREHOOK: query: DROP TEMPORARY FUNCTION test_translate
 PREHOOK: type: DROPFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: test_translate
 POSTHOOK: query: DROP TEMPORARY FUNCTION test_translate
 POSTHOOK: type: DROPFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: test_translate
 PREHOOK: query: DROP TEMPORARY FUNCTION test_max
 PREHOOK: type: DROPFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: test_max
 POSTHOOK: query: DROP TEMPORARY FUNCTION test_max
 POSTHOOK: type: DROPFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: test_max
 PREHOOK: query: DROP TEMPORARY FUNCTION test_explode
 PREHOOK: type: DROPFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: test_explode
 POSTHOOK: query: DROP TEMPORARY FUNCTION test_explode
 POSTHOOK: type: DROPFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: test_explode

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/cross_product_check_1.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/cross_product_check_1.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
--- 
hive/branches/cbo/ql/src/test/results/clientpositive/cross_product_check_1.q.out
 (original)
+++ 
hive/branches/cbo/ql/src/test/results/clientpositive/cross_product_check_1.q.out
 Fri Jul 25 00:38:23 2014
@@ -222,16 +222,16 @@ STAGE PLANS:
           Statistics: Num rows: 5 Data size: 57 Basic stats: COMPLETE Column 
stats: NONE
           Filter Operator
             predicate: (1 = 1) (type: boolean)
-            Statistics: Num rows: 2 Data size: 22 Basic stats: COMPLETE Column 
stats: NONE
+            Statistics: Num rows: 5 Data size: 57 Basic stats: COMPLETE Column 
stats: NONE
             Select Operator
               expressions: _col0 (type: string)
               outputColumnNames: _col0
-              Statistics: Num rows: 2 Data size: 22 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 5 Data size: 57 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 keys: _col0 (type: string)
                 mode: hash
                 outputColumnNames: _col0
-                Statistics: Num rows: 2 Data size: 22 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 5 Data size: 57 Basic stats: COMPLETE 
Column stats: NONE
                 File Output Operator
                   compressed: false
                   table:
@@ -247,17 +247,17 @@ STAGE PLANS:
               key expressions: _col0 (type: string)
               sort order: +
               Map-reduce partition columns: _col0 (type: string)
-              Statistics: Num rows: 2 Data size: 22 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 5 Data size: 57 Basic stats: COMPLETE 
Column stats: NONE
       Reduce Operator Tree:
         Group By Operator
           keys: KEY._col0 (type: string)
           mode: mergepartial
           outputColumnNames: _col0
-          Statistics: Num rows: 1 Data size: 11 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 2 Data size: 22 Basic stats: COMPLETE Column 
stats: NONE
           Select Operator
             expressions: _col0 (type: string)
             outputColumnNames: _col0
-            Statistics: Num rows: 1 Data size: 11 Basic stats: COMPLETE Column 
stats: NONE
+            Statistics: Num rows: 2 Data size: 22 Basic stats: COMPLETE Column 
stats: NONE
             File Output Operator
               compressed: false
               table:
@@ -271,7 +271,7 @@ STAGE PLANS:
           TableScan
             Reduce Output Operator
               sort order: 
-              Statistics: Num rows: 1 Data size: 11 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 2 Data size: 22 Basic stats: COMPLETE 
Column stats: NONE
               value expressions: _col0 (type: string)
           TableScan
             alias: a
@@ -347,16 +347,16 @@ STAGE PLANS:
           Statistics: Num rows: 11 Data size: 114 Basic stats: COMPLETE Column 
stats: NONE
           Filter Operator
             predicate: (1 = 1) (type: boolean)
-            Statistics: Num rows: 5 Data size: 51 Basic stats: COMPLETE Column 
stats: NONE
+            Statistics: Num rows: 11 Data size: 114 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: _col0 (type: string)
               outputColumnNames: _col0
-              Statistics: Num rows: 5 Data size: 51 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 11 Data size: 114 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 keys: _col0 (type: string)
                 mode: hash
                 outputColumnNames: _col0
-                Statistics: Num rows: 5 Data size: 51 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 11 Data size: 114 Basic stats: COMPLETE 
Column stats: NONE
                 File Output Operator
                   compressed: false
                   table:
@@ -372,17 +372,17 @@ STAGE PLANS:
               key expressions: _col0 (type: string)
               sort order: +
               Map-reduce partition columns: _col0 (type: string)
-              Statistics: Num rows: 5 Data size: 51 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 11 Data size: 114 Basic stats: COMPLETE 
Column stats: NONE
       Reduce Operator Tree:
         Group By Operator
           keys: KEY._col0 (type: string)
           mode: mergepartial
           outputColumnNames: _col0
-          Statistics: Num rows: 2 Data size: 20 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 5 Data size: 51 Basic stats: COMPLETE Column 
stats: NONE
           Select Operator
             expressions: _col0 (type: string)
             outputColumnNames: _col0
-            Statistics: Num rows: 2 Data size: 20 Basic stats: COMPLETE Column 
stats: NONE
+            Statistics: Num rows: 5 Data size: 51 Basic stats: COMPLETE Column 
stats: NONE
             File Output Operator
               compressed: false
               table:
@@ -396,7 +396,7 @@ STAGE PLANS:
           TableScan
             Reduce Output Operator
               sort order: 
-              Statistics: Num rows: 2 Data size: 20 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 5 Data size: 51 Basic stats: COMPLETE 
Column stats: NONE
               value expressions: _col0 (type: string)
           TableScan
             alias: a
@@ -485,16 +485,16 @@ STAGE PLANS:
           Statistics: Num rows: 5 Data size: 57 Basic stats: COMPLETE Column 
stats: NONE
           Filter Operator
             predicate: (1 = 1) (type: boolean)
-            Statistics: Num rows: 2 Data size: 22 Basic stats: COMPLETE Column 
stats: NONE
+            Statistics: Num rows: 5 Data size: 57 Basic stats: COMPLETE Column 
stats: NONE
             Select Operator
               expressions: _col0 (type: string)
               outputColumnNames: _col0
-              Statistics: Num rows: 2 Data size: 22 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 5 Data size: 57 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 keys: _col0 (type: string)
                 mode: hash
                 outputColumnNames: _col0
-                Statistics: Num rows: 2 Data size: 22 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 5 Data size: 57 Basic stats: COMPLETE 
Column stats: NONE
                 File Output Operator
                   compressed: false
                   table:
@@ -510,17 +510,17 @@ STAGE PLANS:
               key expressions: _col0 (type: string)
               sort order: +
               Map-reduce partition columns: _col0 (type: string)
-              Statistics: Num rows: 2 Data size: 22 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 5 Data size: 57 Basic stats: COMPLETE 
Column stats: NONE
       Reduce Operator Tree:
         Group By Operator
           keys: KEY._col0 (type: string)
           mode: mergepartial
           outputColumnNames: _col0
-          Statistics: Num rows: 1 Data size: 11 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 2 Data size: 22 Basic stats: COMPLETE Column 
stats: NONE
           Select Operator
             expressions: _col0 (type: string)
             outputColumnNames: _col0
-            Statistics: Num rows: 1 Data size: 11 Basic stats: COMPLETE Column 
stats: NONE
+            Statistics: Num rows: 2 Data size: 22 Basic stats: COMPLETE Column 
stats: NONE
             File Output Operator
               compressed: false
               table:
@@ -534,7 +534,7 @@ STAGE PLANS:
           TableScan
             Reduce Output Operator
               sort order: 
-              Statistics: Num rows: 1 Data size: 11 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 2 Data size: 22 Basic stats: COMPLETE 
Column stats: NONE
               value expressions: _col0 (type: string)
           TableScan
             Reduce Output Operator

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/cross_product_check_2.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/cross_product_check_2.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
--- 
hive/branches/cbo/ql/src/test/results/clientpositive/cross_product_check_2.q.out
 (original)
+++ 
hive/branches/cbo/ql/src/test/results/clientpositive/cross_product_check_2.q.out
 Fri Jul 25 00:38:23 2014
@@ -246,21 +246,21 @@ STAGE PLANS:
                 Statistics: Num rows: 5 Data size: 57 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
                   predicate: (1 = 1) (type: boolean)
-                  Statistics: Num rows: 2 Data size: 22 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 5 Data size: 57 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: _col0 (type: string)
                     outputColumnNames: _col0
-                    Statistics: Num rows: 2 Data size: 22 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 5 Data size: 57 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       keys: _col0 (type: string)
                       mode: hash
                       outputColumnNames: _col0
-                      Statistics: Num rows: 2 Data size: 22 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 5 Data size: 57 Basic stats: 
COMPLETE Column stats: NONE
                       Reduce Output Operator
                         key expressions: _col0 (type: string)
                         sort order: +
                         Map-reduce partition columns: _col0 (type: string)
-                        Statistics: Num rows: 2 Data size: 22 Basic stats: 
COMPLETE Column stats: NONE
+                        Statistics: Num rows: 5 Data size: 57 Basic stats: 
COMPLETE Column stats: NONE
       Local Work:
         Map Reduce Local Work
       Reduce Operator Tree:
@@ -268,11 +268,11 @@ STAGE PLANS:
           keys: KEY._col0 (type: string)
           mode: mergepartial
           outputColumnNames: _col0
-          Statistics: Num rows: 1 Data size: 11 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 2 Data size: 22 Basic stats: COMPLETE Column 
stats: NONE
           Select Operator
             expressions: _col0 (type: string)
             outputColumnNames: _col0
-            Statistics: Num rows: 1 Data size: 11 Basic stats: COMPLETE Column 
stats: NONE
+            Statistics: Num rows: 2 Data size: 22 Basic stats: COMPLETE Column 
stats: NONE
             File Output Operator
               compressed: false
               table:
@@ -386,21 +386,21 @@ STAGE PLANS:
               Statistics: Num rows: 11 Data size: 114 Basic stats: COMPLETE 
Column stats: NONE
               Filter Operator
                 predicate: (1 = 1) (type: boolean)
-                Statistics: Num rows: 5 Data size: 51 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 11 Data size: 114 Basic stats: COMPLETE 
Column stats: NONE
                 Select Operator
                   expressions: _col0 (type: string)
                   outputColumnNames: _col0
-                  Statistics: Num rows: 5 Data size: 51 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 11 Data size: 114 Basic stats: 
COMPLETE Column stats: NONE
                   Group By Operator
                     keys: _col0 (type: string)
                     mode: hash
                     outputColumnNames: _col0
-                    Statistics: Num rows: 5 Data size: 51 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 11 Data size: 114 Basic stats: 
COMPLETE Column stats: NONE
                     Reduce Output Operator
                       key expressions: _col0 (type: string)
                       sort order: +
                       Map-reduce partition columns: _col0 (type: string)
-                      Statistics: Num rows: 5 Data size: 51 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 11 Data size: 114 Basic stats: 
COMPLETE Column stats: NONE
       Local Work:
         Map Reduce Local Work
       Reduce Operator Tree:
@@ -408,11 +408,11 @@ STAGE PLANS:
           keys: KEY._col0 (type: string)
           mode: mergepartial
           outputColumnNames: _col0
-          Statistics: Num rows: 2 Data size: 20 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 5 Data size: 51 Basic stats: COMPLETE Column 
stats: NONE
           Select Operator
             expressions: _col0 (type: string)
             outputColumnNames: _col0
-            Statistics: Num rows: 2 Data size: 20 Basic stats: COMPLETE Column 
stats: NONE
+            Statistics: Num rows: 5 Data size: 51 Basic stats: COMPLETE Column 
stats: NONE
             File Output Operator
               compressed: false
               table:
@@ -630,7 +630,7 @@ STAGE PLANS:
           TableScan
             Reduce Output Operator
               sort order: 
-              Statistics: Num rows: 1 Data size: 11 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 2 Data size: 22 Basic stats: COMPLETE 
Column stats: NONE
               value expressions: _col0 (type: string)
           TableScan
             Reduce Output Operator
@@ -702,21 +702,21 @@ STAGE PLANS:
                 Statistics: Num rows: 5 Data size: 57 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
                   predicate: (1 = 1) (type: boolean)
-                  Statistics: Num rows: 2 Data size: 22 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 5 Data size: 57 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: _col0 (type: string)
                     outputColumnNames: _col0
-                    Statistics: Num rows: 2 Data size: 22 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 5 Data size: 57 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       keys: _col0 (type: string)
                       mode: hash
                       outputColumnNames: _col0
-                      Statistics: Num rows: 2 Data size: 22 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 5 Data size: 57 Basic stats: 
COMPLETE Column stats: NONE
                       Reduce Output Operator
                         key expressions: _col0 (type: string)
                         sort order: +
                         Map-reduce partition columns: _col0 (type: string)
-                        Statistics: Num rows: 2 Data size: 22 Basic stats: 
COMPLETE Column stats: NONE
+                        Statistics: Num rows: 5 Data size: 57 Basic stats: 
COMPLETE Column stats: NONE
       Local Work:
         Map Reduce Local Work
       Reduce Operator Tree:
@@ -724,11 +724,11 @@ STAGE PLANS:
           keys: KEY._col0 (type: string)
           mode: mergepartial
           outputColumnNames: _col0
-          Statistics: Num rows: 1 Data size: 11 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 2 Data size: 22 Basic stats: COMPLETE Column 
stats: NONE
           Select Operator
             expressions: _col0 (type: string)
             outputColumnNames: _col0
-            Statistics: Num rows: 1 Data size: 11 Basic stats: COMPLETE Column 
stats: NONE
+            Statistics: Num rows: 2 Data size: 22 Basic stats: COMPLETE Column 
stats: NONE
             File Output Operator
               compressed: false
               table:

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/drop_udf.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/drop_udf.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/drop_udf.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/drop_udf.q.out Fri Jul 
25 00:38:23 2014
@@ -1,9 +1,9 @@
 PREHOOK: query: CREATE TEMPORARY FUNCTION test_translate AS 
'org.apache.hadoop.hive.ql.udf.generic.GenericUDFTestTranslate'
 PREHOOK: type: CREATEFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: test_translate
 POSTHOOK: query: CREATE TEMPORARY FUNCTION test_translate AS 
'org.apache.hadoop.hive.ql.udf.generic.GenericUDFTestTranslate'
 POSTHOOK: type: CREATEFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: test_translate
 PREHOOK: query: EXPLAIN
 DROP TEMPORARY FUNCTION test_translate
 PREHOOK: type: DROPFUNCTION
@@ -18,7 +18,7 @@ STAGE PLANS:
 
 PREHOOK: query: DROP TEMPORARY FUNCTION test_translate
 PREHOOK: type: DROPFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: test_translate
 POSTHOOK: query: DROP TEMPORARY FUNCTION test_translate
 POSTHOOK: type: DROPFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: test_translate

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/keyword_1.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/keyword_1.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/keyword_1.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/keyword_1.q.out Fri 
Jul 25 00:38:23 2014
@@ -52,7 +52,7 @@ PREHOOK: query: show grant user hive_tes
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant user hive_test on table test_user
 POSTHOOK: type: SHOW_GRANT
-default        test_user                       hive_test       USER    Select  
false   -1      hive_test_user
+default        test_user                       hive_test       USER    SELECT  
false   -1      hive_test_user
 PREHOOK: query: drop table test_user
 PREHOOK: type: DROPTABLE
 PREHOOK: Input: default@test_user
@@ -111,7 +111,7 @@ PREHOOK: query: show grant user hive_tes
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant user hive_test on table test_user
 POSTHOOK: type: SHOW_GRANT
-default        test_user                       hive_test       USER    Select  
false   -1      hive_test_user
+default        test_user                       hive_test       USER    SELECT  
false   -1      hive_test_user
 PREHOOK: query: drop table test_user
 PREHOOK: type: DROPTABLE
 PREHOOK: Input: default@test_user

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/mapjoin1.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/mapjoin1.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/mapjoin1.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/mapjoin1.q.out Fri Jul 
25 00:38:23 2014
@@ -345,7 +345,7 @@ STAGE PLANS:
             Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: true (type: boolean)
-              Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
+              Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE 
Column stats: NONE
               HashTable Sink Operator
                 condition expressions:
                   0 {value}
@@ -362,7 +362,7 @@ STAGE PLANS:
             Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: true (type: boolean)
-              Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
+              Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE 
Column stats: NONE
               Map Join Operator
                 condition map:
                      Right Outer Join0 to 1
@@ -373,17 +373,17 @@ STAGE PLANS:
                   0 key (type: string)
                   1 key (type: string)
                 outputColumnNames: _col0, _col1, _col4, _col5
-                Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
+                Statistics: Num rows: 31 Data size: 6393 Basic stats: COMPLETE 
Column stats: NONE
                 Select Operator
                   expressions: _col0 (type: string), _col1 (type: string), 
_col4 (type: string), _col5 (type: string)
                   outputColumnNames: _col0, _col1, _col2, _col3
-                  Statistics: Num rows: 0 Data size: 0 Basic stats: NONE 
Column stats: NONE
+                  Statistics: Num rows: 31 Data size: 6393 Basic stats: 
COMPLETE Column stats: NONE
                   Limit
                     Number of rows: 10
-                    Statistics: Num rows: 0 Data size: 0 Basic stats: NONE 
Column stats: NONE
+                    Statistics: Num rows: 10 Data size: 2060 Basic stats: 
COMPLETE Column stats: NONE
                     File Output Operator
                       compressed: false
-                      Statistics: Num rows: 0 Data size: 0 Basic stats: NONE 
Column stats: NONE
+                      Statistics: Num rows: 10 Data size: 2060 Basic stats: 
COMPLETE Column stats: NONE
                       table:
                           input format: 
org.apache.hadoop.mapred.TextInputFormat
                           output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/nonmr_fetch_threshold.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/nonmr_fetch_threshold.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
--- 
hive/branches/cbo/ql/src/test/results/clientpositive/nonmr_fetch_threshold.q.out
 (original)
+++ 
hive/branches/cbo/ql/src/test/results/clientpositive/nonmr_fetch_threshold.q.out
 Fri Jul 25 00:38:23 2014
@@ -46,41 +46,31 @@ STAGE PLANS:
               Statistics: Num rows: 10 Data size: 2000 Basic stats: COMPLETE 
Column stats: NONE
               ListSink
 
-PREHOOK: query: explain select * from srcpart where ds='2008-04-08' AND 
hr='11' limit 10
+PREHOOK: query: -- from HIVE-7397, limit + partition pruning filter
+explain select * from srcpart where ds='2008-04-08' AND hr='11' limit 10
 PREHOOK: type: QUERY
-POSTHOOK: query: explain select * from srcpart where ds='2008-04-08' AND 
hr='11' limit 10
+POSTHOOK: query: -- from HIVE-7397, limit + partition pruning filter
+explain select * from srcpart where ds='2008-04-08' AND hr='11' limit 10
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
-  Stage-1 is a root stage
-  Stage-0 depends on stages: Stage-1
+  Stage-0 is a root stage
 
 STAGE PLANS:
-  Stage: Stage-1
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            alias: srcpart
-            Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE 
Column stats: NONE
-            Select Operator
-              expressions: key (type: string), value (type: string), ds (type: 
string), hr (type: string)
-              outputColumnNames: _col0, _col1, _col2, _col3
-              Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE 
Column stats: NONE
-              Limit
-                Number of rows: 10
-                Statistics: Num rows: 10 Data size: 2000 Basic stats: COMPLETE 
Column stats: NONE
-                File Output Operator
-                  compressed: false
-                  Statistics: Num rows: 10 Data size: 2000 Basic stats: 
COMPLETE Column stats: NONE
-                  table:
-                      input format: org.apache.hadoop.mapred.TextInputFormat
-                      output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                      serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-
   Stage: Stage-0
     Fetch Operator
       limit: 10
       Processor Tree:
-        ListSink
+        TableScan
+          alias: srcpart
+          Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE 
Column stats: NONE
+          Select Operator
+            expressions: key (type: string), value (type: string), ds (type: 
string), hr (type: string)
+            outputColumnNames: _col0, _col1, _col2, _col3
+            Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE 
Column stats: NONE
+            Limit
+              Number of rows: 10
+              Statistics: Num rows: 10 Data size: 2000 Basic stats: COMPLETE 
Column stats: NONE
+              ListSink
 
 PREHOOK: query: explain select cast(key as int) * 10, upper(value) from src 
limit 10
 PREHOOK: type: QUERY

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/orc_ppd_date.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/orc_ppd_date.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/orc_ppd_date.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/orc_ppd_date.q.out Fri 
Jul 25 00:38:23 2014
@@ -37,6 +37,15 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@newtypesorc
 #### A masked pattern was here ####
 -252951929000
+PREHOOK: query: select sum(hash(*)) from newtypesorc where da= date 
'1970-02-20'
+PREHOOK: type: QUERY
+PREHOOK: Input: default@newtypesorc
+#### A masked pattern was here ####
+POSTHOOK: query: select sum(hash(*)) from newtypesorc where da= date 
'1970-02-20'
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@newtypesorc
+#### A masked pattern was here ####
+-252951929000
 PREHOOK: query: select sum(hash(*)) from newtypesorc where 
da=cast('1970-02-20' as date)
 PREHOOK: type: QUERY
 PREHOOK: Input: default@newtypesorc

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/ptf_register_tblfn.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/ptf_register_tblfn.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
--- 
hive/branches/cbo/ql/src/test/results/clientpositive/ptf_register_tblfn.q.out 
(original)
+++ 
hive/branches/cbo/ql/src/test/results/clientpositive/ptf_register_tblfn.q.out 
Fri Jul 25 00:38:23 2014
@@ -35,10 +35,10 @@ POSTHOOK: type: LOAD
 POSTHOOK: Output: default@flights_tiny
 PREHOOK: query: create temporary function matchpathtest as 
'org.apache.hadoop.hive.ql.udf.ptf.MatchPath$MatchPathResolver'
 PREHOOK: type: CREATEFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: matchpathtest
 POSTHOOK: query: create temporary function matchpathtest as 
'org.apache.hadoop.hive.ql.udf.ptf.MatchPath$MatchPathResolver'
 POSTHOOK: type: CREATEFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: matchpathtest
 PREHOOK: query: -- 1. basic Matchpath test
 select origin_city_name, fl_num, year, month, day_of_month, sz, tpath 
 from matchpathtest(on 
@@ -83,7 +83,7 @@ Chicago       897     2010    10      21      3       21
 Chicago        897     2010    10      22      2       22
 PREHOOK: query: drop temporary function matchpathtest
 PREHOOK: type: DROPFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: matchpathtest
 POSTHOOK: query: drop temporary function matchpathtest
 POSTHOOK: type: DROPFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: matchpathtest

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/ptf_streaming.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/ptf_streaming.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/ptf_streaming.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/ptf_streaming.q.out 
Fri Jul 25 00:38:23 2014
@@ -41,10 +41,10 @@ POSTHOOK: type: LOAD
 POSTHOOK: Output: default@part
 PREHOOK: query: create temporary function noopstreaming as 
'org.apache.hadoop.hive.ql.udf.ptf.NoopStreaming$NoopStreamingResolver'
 PREHOOK: type: CREATEFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: noopstreaming
 POSTHOOK: query: create temporary function noopstreaming as 
'org.apache.hadoop.hive.ql.udf.ptf.NoopStreaming$NoopStreamingResolver'
 POSTHOOK: type: CREATEFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: noopstreaming
 PREHOOK: query: --1. test1
 select p_mfgr, p_name, p_size,
 rank() over (partition by p_mfgr order by p_name) as r,

Modified: hive/branches/cbo/ql/src/test/results/clientpositive/show_roles.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/show_roles.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/show_roles.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/show_roles.q.out Fri 
Jul 25 00:38:23 2014
@@ -14,3 +14,4 @@ admin
 public
 role1
 role2
+

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/subq_where_serialization.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/subq_where_serialization.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
--- 
hive/branches/cbo/ql/src/test/results/clientpositive/subq_where_serialization.q.out
 (original)
+++ 
hive/branches/cbo/ql/src/test/results/clientpositive/subq_where_serialization.q.out
 Fri Jul 25 00:38:23 2014
@@ -138,14 +138,14 @@ STAGE PLANS:
           Statistics: Num rows: 31 Data size: 3196 Basic stats: COMPLETE 
Column stats: NONE
           Filter Operator
             predicate: (1 = 1) (type: boolean)
-            Statistics: Num rows: 15 Data size: 1546 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 31 Data size: 3196 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: _col0 (type: string)
               outputColumnNames: _col0
-              Statistics: Num rows: 15 Data size: 1546 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 31 Data size: 3196 Basic stats: COMPLETE 
Column stats: NONE
               File Output Operator
                 compressed: false
-                Statistics: Num rows: 15 Data size: 1546 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 31 Data size: 3196 Basic stats: COMPLETE 
Column stats: NONE
                 table:
                     input format: org.apache.hadoop.mapred.TextInputFormat
                     output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/subquery_exists.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/subquery_exists.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/subquery_exists.q.out 
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/subquery_exists.q.out 
Fri Jul 25 00:38:23 2014
@@ -68,14 +68,14 @@ STAGE PLANS:
           Statistics: Num rows: 8 Data size: 1763 Basic stats: COMPLETE Column 
stats: NONE
           Filter Operator
             predicate: (1 = 1) (type: boolean)
-            Statistics: Num rows: 4 Data size: 881 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 8 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: _col0 (type: string), _col1 (type: string)
               outputColumnNames: _col0, _col1
-              Statistics: Num rows: 4 Data size: 881 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 8 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
               File Output Operator
                 compressed: false
-                Statistics: Num rows: 4 Data size: 881 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 8 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
                 table:
                     input format: org.apache.hadoop.mapred.TextInputFormat
                     output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat

Modified: 
hive/branches/cbo/ql/src/test/results/clientpositive/subquery_exists_having.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/subquery_exists_having.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
--- 
hive/branches/cbo/ql/src/test/results/clientpositive/subquery_exists_having.q.out
 (original)
+++ 
hive/branches/cbo/ql/src/test/results/clientpositive/subquery_exists_having.q.out
 Fri Jul 25 00:38:23 2014
@@ -106,14 +106,14 @@ STAGE PLANS:
           Statistics: Num rows: 31 Data size: 3196 Basic stats: COMPLETE 
Column stats: NONE
           Filter Operator
             predicate: (1 = 1) (type: boolean)
-            Statistics: Num rows: 15 Data size: 1546 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 31 Data size: 3196 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: _col0 (type: string), _col1 (type: bigint)
               outputColumnNames: _col0, _col1
-              Statistics: Num rows: 15 Data size: 1546 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 31 Data size: 3196 Basic stats: COMPLETE 
Column stats: NONE
               File Output Operator
                 compressed: false
-                Statistics: Num rows: 15 Data size: 1546 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 31 Data size: 3196 Basic stats: COMPLETE 
Column stats: NONE
                 table:
                     input format: org.apache.hadoop.mapred.TextInputFormat
                     output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat


Reply via email to