Modified: 
hive/branches/spark/ql/src/test/results/clientnegative/udf_test_error_reduce.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientnegative/udf_test_error_reduce.q.out?rev=1613740&r1=1613739&r2=1613740&view=diff
==============================================================================
--- 
hive/branches/spark/ql/src/test/results/clientnegative/udf_test_error_reduce.q.out
 (original)
+++ 
hive/branches/spark/ql/src/test/results/clientnegative/udf_test_error_reduce.q.out
 Sat Jul 26 23:45:46 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/spark/ql/src/test/results/clientpositive/alter_partition_coltype.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/alter_partition_coltype.q.out?rev=1613740&r1=1613739&r2=1613740&view=diff
==============================================================================
Files 
hive/branches/spark/ql/src/test/results/clientpositive/alter_partition_coltype.q.out
 (original) and 
hive/branches/spark/ql/src/test/results/clientpositive/alter_partition_coltype.q.out
 Sat Jul 26 23:45:46 2014 differ

Modified: 
hive/branches/spark/ql/src/test/results/clientpositive/alter_rename_partition_authorization.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/alter_rename_partition_authorization.q.out?rev=1613740&r1=1613739&r2=1613740&view=diff
==============================================================================
--- 
hive/branches/spark/ql/src/test/results/clientpositive/alter_rename_partition_authorization.q.out
 (original)
+++ 
hive/branches/spark/ql/src/test/results/clientpositive/alter_rename_partition_authorization.q.out
 Sat Jul 26 23:45:46 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/spark/ql/src/test/results/clientpositive/annotate_stats_filter.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/annotate_stats_filter.q.out?rev=1613740&r1=1613739&r2=1613740&view=diff
==============================================================================
Files 
hive/branches/spark/ql/src/test/results/clientpositive/annotate_stats_filter.q.out
 (original) and 
hive/branches/spark/ql/src/test/results/clientpositive/annotate_stats_filter.q.out
 Sat Jul 26 23:45:46 2014 differ

Modified: 
hive/branches/spark/ql/src/test/results/clientpositive/annotate_stats_groupby.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/annotate_stats_groupby.q.out?rev=1613740&r1=1613739&r2=1613740&view=diff
==============================================================================
Files 
hive/branches/spark/ql/src/test/results/clientpositive/annotate_stats_groupby.q.out
 (original) and 
hive/branches/spark/ql/src/test/results/clientpositive/annotate_stats_groupby.q.out
 Sat Jul 26 23:45:46 2014 differ

Modified: 
hive/branches/spark/ql/src/test/results/clientpositive/annotate_stats_join.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/annotate_stats_join.q.out?rev=1613740&r1=1613739&r2=1613740&view=diff
==============================================================================
Files 
hive/branches/spark/ql/src/test/results/clientpositive/annotate_stats_join.q.out
 (original) and 
hive/branches/spark/ql/src/test/results/clientpositive/annotate_stats_join.q.out
 Sat Jul 26 23:45:46 2014 differ

Modified: 
hive/branches/spark/ql/src/test/results/clientpositive/annotate_stats_part.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/annotate_stats_part.q.out?rev=1613740&r1=1613739&r2=1613740&view=diff
==============================================================================
Files 
hive/branches/spark/ql/src/test/results/clientpositive/annotate_stats_part.q.out
 (original) and 
hive/branches/spark/ql/src/test/results/clientpositive/annotate_stats_part.q.out
 Sat Jul 26 23:45:46 2014 differ

Modified: 
hive/branches/spark/ql/src/test/results/clientpositive/annotate_stats_select.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/annotate_stats_select.q.out?rev=1613740&r1=1613739&r2=1613740&view=diff
==============================================================================
Files 
hive/branches/spark/ql/src/test/results/clientpositive/annotate_stats_select.q.out
 (original) and 
hive/branches/spark/ql/src/test/results/clientpositive/annotate_stats_select.q.out
 Sat Jul 26 23:45:46 2014 differ

Modified: 
hive/branches/spark/ql/src/test/results/clientpositive/authorization_1.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/authorization_1.q.out?rev=1613740&r1=1613739&r2=1613740&view=diff
==============================================================================
--- 
hive/branches/spark/ql/src/test/results/clientpositive/authorization_1.q.out 
(original)
+++ 
hive/branches/spark/ql/src/test/results/clientpositive/authorization_1.q.out 
Sat Jul 26 23:45:46 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/spark/ql/src/test/results/clientpositive/authorization_2.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/authorization_2.q.out?rev=1613740&r1=1613739&r2=1613740&view=diff
==============================================================================
--- 
hive/branches/spark/ql/src/test/results/clientpositive/authorization_2.q.out 
(original)
+++ 
hive/branches/spark/ql/src/test/results/clientpositive/authorization_2.q.out 
Sat Jul 26 23:45:46 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/spark/ql/src/test/results/clientpositive/authorization_3.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/authorization_3.q.out?rev=1613740&r1=1613739&r2=1613740&view=diff
==============================================================================
--- 
hive/branches/spark/ql/src/test/results/clientpositive/authorization_3.q.out 
(original)
+++ 
hive/branches/spark/ql/src/test/results/clientpositive/authorization_3.q.out 
Sat Jul 26 23:45:46 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/spark/ql/src/test/results/clientpositive/authorization_4.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/authorization_4.q.out?rev=1613740&r1=1613739&r2=1613740&view=diff
==============================================================================
--- 
hive/branches/spark/ql/src/test/results/clientpositive/authorization_4.q.out 
(original)
+++ 
hive/branches/spark/ql/src/test/results/clientpositive/authorization_4.q.out 
Sat Jul 26 23:45:46 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/spark/ql/src/test/results/clientpositive/authorization_5.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/authorization_5.q.out?rev=1613740&r1=1613739&r2=1613740&view=diff
==============================================================================
--- 
hive/branches/spark/ql/src/test/results/clientpositive/authorization_5.q.out 
(original)
+++ 
hive/branches/spark/ql/src/test/results/clientpositive/authorization_5.q.out 
Sat Jul 26 23:45:46 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/spark/ql/src/test/results/clientpositive/authorization_6.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/authorization_6.q.out?rev=1613740&r1=1613739&r2=1613740&view=diff
==============================================================================
--- 
hive/branches/spark/ql/src/test/results/clientpositive/authorization_6.q.out 
(original)
+++ 
hive/branches/spark/ql/src/test/results/clientpositive/authorization_6.q.out 
Sat Jul 26 23:45:46 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/spark/ql/src/test/results/clientpositive/authorization_9.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/authorization_9.q.out?rev=1613740&r1=1613739&r2=1613740&view=diff
==============================================================================
--- 
hive/branches/spark/ql/src/test/results/clientpositive/authorization_9.q.out 
(original)
+++ 
hive/branches/spark/ql/src/test/results/clientpositive/authorization_9.q.out 
Sat Jul 26 23:45:46 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,12 +63,44 @@ 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
+POSTHOOK: type: REVOKE_PRIVILEGE
+PREHOOK: query: revoke select on table dummy from user hive_test_user
+PREHOOK: type: REVOKE_PRIVILEGE
+PREHOOK: Output: default@dummy
+POSTHOOK: query: revoke select on table dummy from user hive_test_user
+POSTHOOK: type: REVOKE_PRIVILEGE
+POSTHOOK: Output: default@dummy
+PREHOOK: query: revoke select (key, value) on table dummy from user 
hive_test_user
+PREHOOK: type: REVOKE_PRIVILEGE
+PREHOOK: Output: default@dummy
+POSTHOOK: query: revoke select (key, value) on table dummy from user 
hive_test_user
+POSTHOOK: type: REVOKE_PRIVILEGE
+POSTHOOK: Output: default@dummy
+PREHOOK: query: revoke select on database default from user hive_test_user2
+PREHOOK: type: REVOKE_PRIVILEGE
+POSTHOOK: query: revoke select on database default from user hive_test_user2
+POSTHOOK: type: REVOKE_PRIVILEGE
+PREHOOK: query: revoke select on table dummy from user hive_test_user2
+PREHOOK: type: REVOKE_PRIVILEGE
+PREHOOK: Output: default@dummy
+POSTHOOK: query: revoke select on table dummy from user hive_test_user2
+POSTHOOK: type: REVOKE_PRIVILEGE
+POSTHOOK: Output: default@dummy
+PREHOOK: query: revoke select (key, value) on table dummy from user 
hive_test_user2
+PREHOOK: type: REVOKE_PRIVILEGE
+PREHOOK: Output: default@dummy
+POSTHOOK: query: revoke select (key, value) on table dummy from user 
hive_test_user2
+POSTHOOK: type: REVOKE_PRIVILEGE
+POSTHOOK: Output: default@dummy

Modified: 
hive/branches/spark/ql/src/test/results/clientpositive/authorization_create_func1.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/authorization_create_func1.q.out?rev=1613740&r1=1613739&r2=1613740&view=diff
==============================================================================
--- 
hive/branches/spark/ql/src/test/results/clientpositive/authorization_create_func1.q.out
 (original)
+++ 
hive/branches/spark/ql/src/test/results/clientpositive/authorization_create_func1.q.out
 Sat Jul 26 23:45:46 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/spark/ql/src/test/results/clientpositive/authorization_revoke_table_priv.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/authorization_revoke_table_priv.q.out?rev=1613740&r1=1613739&r2=1613740&view=diff
==============================================================================
--- 
hive/branches/spark/ql/src/test/results/clientpositive/authorization_revoke_table_priv.q.out
 (original)
+++ 
hive/branches/spark/ql/src/test/results/clientpositive/authorization_revoke_table_priv.q.out
 Sat Jul 26 23:45:46 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/spark/ql/src/test/results/clientpositive/authorization_role_grant1.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/authorization_role_grant1.q.out?rev=1613740&r1=1613739&r2=1613740&view=diff
==============================================================================
--- 
hive/branches/spark/ql/src/test/results/clientpositive/authorization_role_grant1.q.out
 (original)
+++ 
hive/branches/spark/ql/src/test/results/clientpositive/authorization_role_grant1.q.out
 Sat Jul 26 23:45:46 2014
@@ -71,6 +71,18 @@ POSTHOOK: query: show role grant user us
 POSTHOOK: type: SHOW_ROLE_GRANT
 public false   -1      
 src_role_wadmin        true    -1      hive_admin_user
+PREHOOK: query: -- revoke admin option
+revoke admin option for src_role_wadmin from user user2
+PREHOOK: type: REVOKE_ROLE
+POSTHOOK: query: -- revoke admin option
+revoke admin option for src_role_wadmin from user user2
+POSTHOOK: type: REVOKE_ROLE
+PREHOOK: query: show role grant user user2
+PREHOOK: type: SHOW_ROLE_GRANT
+POSTHOOK: query: show role grant user user2
+POSTHOOK: type: SHOW_ROLE_GRANT
+public false   -1      
+src_role_wadmin        false   -1      hive_admin_user
 PREHOOK: query: -- revoke role without role keyword
 revoke src_role_wadmin from user user2
 PREHOOK: type: REVOKE_ROLE

Modified: 
hive/branches/spark/ql/src/test/results/clientpositive/authorization_view_sqlstd.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/authorization_view_sqlstd.q.out?rev=1613740&r1=1613739&r2=1613740&view=diff
==============================================================================
--- 
hive/branches/spark/ql/src/test/results/clientpositive/authorization_view_sqlstd.q.out
 (original)
+++ 
hive/branches/spark/ql/src/test/results/clientpositive/authorization_view_sqlstd.q.out
 Sat Jul 26 23:45:46 2014
@@ -79,6 +79,19 @@ PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant user user3 on table vt1
 POSTHOOK: type: SHOW_GRANT
 default        vt1                     user3   USER    INSERT  false   -1      
user1
+PREHOOK: query: explain authorization select * from vt1
+PREHOOK: type: QUERY
+POSTHOOK: query: explain authorization select * from vt1
+POSTHOOK: type: QUERY
+INPUTS: 
+  default@vt1
+  default@t1
+OUTPUTS: 
+#### A masked pattern was here ####
+CURRENT_USER: 
+  user2
+OPERATION: 
+  QUERY
 PREHOOK: query: select * from vt1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@t1

Modified: 
hive/branches/spark/ql/src/test/results/clientpositive/auto_join14_hadoop20.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/auto_join14_hadoop20.q.out?rev=1613740&r1=1613739&r2=1613740&view=diff
==============================================================================
--- 
hive/branches/spark/ql/src/test/results/clientpositive/auto_join14_hadoop20.q.out
 (original)
+++ 
hive/branches/spark/ql/src/test/results/clientpositive/auto_join14_hadoop20.q.out
 Sat Jul 26 23:45:46 2014
@@ -36,11 +36,11 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 58 Data size: 5812 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (key > 100) (type: boolean)
-              Statistics: Num rows: 19 Data size: 1903 Basic stats: COMPLETE 
Column stats: NONE
+              predicate: ((key > 100) and key is not null) (type: boolean)
+              Statistics: Num rows: 10 Data size: 1002 Basic stats: COMPLETE 
Column stats: NONE
               HashTable Sink Operator
                 condition expressions:
-                  0 {key}
+                  0 
                   1 {value}
                 keys:
                   0 key (type: string)
@@ -53,8 +53,8 @@ STAGE PLANS:
             alias: srcpart
             Statistics: Num rows: 58 Data size: 11624 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (key > 100) (type: boolean)
-              Statistics: Num rows: 19 Data size: 3807 Basic stats: COMPLETE 
Column stats: NONE
+              predicate: ((key > 100) and key is not null) (type: boolean)
+              Statistics: Num rows: 10 Data size: 2004 Basic stats: COMPLETE 
Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -65,14 +65,14 @@ STAGE PLANS:
                   0 key (type: string)
                   1 key (type: string)
                 outputColumnNames: _col0, _col5
-                Statistics: Num rows: 20 Data size: 2093 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 11 Data size: 1102 Basic stats: COMPLETE 
Column stats: NONE
                 Select Operator
                   expressions: UDFToInteger(_col0) (type: int), _col5 (type: 
string)
                   outputColumnNames: _col0, _col1
-                  Statistics: Num rows: 20 Data size: 2093 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 11 Data size: 1102 Basic stats: 
COMPLETE Column stats: NONE
                   File Output Operator
                     compressed: false
-                    Statistics: Num rows: 20 Data size: 2093 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 11 Data size: 1102 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/spark/ql/src/test/results/clientpositive/auto_join_reordering_values.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/auto_join_reordering_values.q.out?rev=1613740&r1=1613739&r2=1613740&view=diff
==============================================================================
Files 
hive/branches/spark/ql/src/test/results/clientpositive/auto_join_reordering_values.q.out
 (original) and 
hive/branches/spark/ql/src/test/results/clientpositive/auto_join_reordering_values.q.out
 Sat Jul 26 23:45:46 2014 differ

Modified: 
hive/branches/spark/ql/src/test/results/clientpositive/auto_sortmerge_join_1.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/auto_sortmerge_join_1.q.out?rev=1613740&r1=1613739&r2=1613740&view=diff
==============================================================================
Files 
hive/branches/spark/ql/src/test/results/clientpositive/auto_sortmerge_join_1.q.out
 (original) and 
hive/branches/spark/ql/src/test/results/clientpositive/auto_sortmerge_join_1.q.out
 Sat Jul 26 23:45:46 2014 differ

Modified: 
hive/branches/spark/ql/src/test/results/clientpositive/auto_sortmerge_join_11.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/auto_sortmerge_join_11.q.out?rev=1613740&r1=1613739&r2=1613740&view=diff
==============================================================================
Files 
hive/branches/spark/ql/src/test/results/clientpositive/auto_sortmerge_join_11.q.out
 (original) and 
hive/branches/spark/ql/src/test/results/clientpositive/auto_sortmerge_join_11.q.out
 Sat Jul 26 23:45:46 2014 differ

Modified: 
hive/branches/spark/ql/src/test/results/clientpositive/auto_sortmerge_join_12.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/auto_sortmerge_join_12.q.out?rev=1613740&r1=1613739&r2=1613740&view=diff
==============================================================================
Files 
hive/branches/spark/ql/src/test/results/clientpositive/auto_sortmerge_join_12.q.out
 (original) and 
hive/branches/spark/ql/src/test/results/clientpositive/auto_sortmerge_join_12.q.out
 Sat Jul 26 23:45:46 2014 differ

Modified: 
hive/branches/spark/ql/src/test/results/clientpositive/auto_sortmerge_join_2.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/auto_sortmerge_join_2.q.out?rev=1613740&r1=1613739&r2=1613740&view=diff
==============================================================================
Files 
hive/branches/spark/ql/src/test/results/clientpositive/auto_sortmerge_join_2.q.out
 (original) and 
hive/branches/spark/ql/src/test/results/clientpositive/auto_sortmerge_join_2.q.out
 Sat Jul 26 23:45:46 2014 differ

Modified: 
hive/branches/spark/ql/src/test/results/clientpositive/auto_sortmerge_join_3.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/auto_sortmerge_join_3.q.out?rev=1613740&r1=1613739&r2=1613740&view=diff
==============================================================================
Files 
hive/branches/spark/ql/src/test/results/clientpositive/auto_sortmerge_join_3.q.out
 (original) and 
hive/branches/spark/ql/src/test/results/clientpositive/auto_sortmerge_join_3.q.out
 Sat Jul 26 23:45:46 2014 differ

Modified: 
hive/branches/spark/ql/src/test/results/clientpositive/auto_sortmerge_join_4.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/auto_sortmerge_join_4.q.out?rev=1613740&r1=1613739&r2=1613740&view=diff
==============================================================================
Files 
hive/branches/spark/ql/src/test/results/clientpositive/auto_sortmerge_join_4.q.out
 (original) and 
hive/branches/spark/ql/src/test/results/clientpositive/auto_sortmerge_join_4.q.out
 Sat Jul 26 23:45:46 2014 differ

Modified: 
hive/branches/spark/ql/src/test/results/clientpositive/auto_sortmerge_join_5.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/auto_sortmerge_join_5.q.out?rev=1613740&r1=1613739&r2=1613740&view=diff
==============================================================================
Files 
hive/branches/spark/ql/src/test/results/clientpositive/auto_sortmerge_join_5.q.out
 (original) and 
hive/branches/spark/ql/src/test/results/clientpositive/auto_sortmerge_join_5.q.out
 Sat Jul 26 23:45:46 2014 differ

Modified: 
hive/branches/spark/ql/src/test/results/clientpositive/auto_sortmerge_join_7.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/auto_sortmerge_join_7.q.out?rev=1613740&r1=1613739&r2=1613740&view=diff
==============================================================================
Files 
hive/branches/spark/ql/src/test/results/clientpositive/auto_sortmerge_join_7.q.out
 (original) and 
hive/branches/spark/ql/src/test/results/clientpositive/auto_sortmerge_join_7.q.out
 Sat Jul 26 23:45:46 2014 differ

Modified: 
hive/branches/spark/ql/src/test/results/clientpositive/auto_sortmerge_join_8.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/auto_sortmerge_join_8.q.out?rev=1613740&r1=1613739&r2=1613740&view=diff
==============================================================================
Files 
hive/branches/spark/ql/src/test/results/clientpositive/auto_sortmerge_join_8.q.out
 (original) and 
hive/branches/spark/ql/src/test/results/clientpositive/auto_sortmerge_join_8.q.out
 Sat Jul 26 23:45:46 2014 differ

Modified: 
hive/branches/spark/ql/src/test/results/clientpositive/autogen_colalias.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/autogen_colalias.q.out?rev=1613740&r1=1613739&r2=1613740&view=diff
==============================================================================
--- 
hive/branches/spark/ql/src/test/results/clientpositive/autogen_colalias.q.out 
(original)
+++ 
hive/branches/spark/ql/src/test/results/clientpositive/autogen_colalias.q.out 
Sat Jul 26 23:45:46 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/spark/ql/src/test/results/clientpositive/avro_partitioned.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/avro_partitioned.q.out?rev=1613740&r1=1613739&r2=1613740&view=diff
==============================================================================
--- 
hive/branches/spark/ql/src/test/results/clientpositive/avro_partitioned.q.out 
(original)
+++ 
hive/branches/spark/ql/src/test/results/clientpositive/avro_partitioned.q.out 
Sat Jul 26 23:45:46 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/spark/ql/src/test/results/clientpositive/bucket1.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/bucket1.q.out?rev=1613740&r1=1613739&r2=1613740&view=diff
==============================================================================
Files hive/branches/spark/ql/src/test/results/clientpositive/bucket1.q.out 
(original) and 
hive/branches/spark/ql/src/test/results/clientpositive/bucket1.q.out Sat Jul 26 
23:45:46 2014 differ

Modified: hive/branches/spark/ql/src/test/results/clientpositive/bucket2.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/bucket2.q.out?rev=1613740&r1=1613739&r2=1613740&view=diff
==============================================================================
Files hive/branches/spark/ql/src/test/results/clientpositive/bucket2.q.out 
(original) and 
hive/branches/spark/ql/src/test/results/clientpositive/bucket2.q.out Sat Jul 26 
23:45:46 2014 differ

Modified: hive/branches/spark/ql/src/test/results/clientpositive/bucket3.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/bucket3.q.out?rev=1613740&r1=1613739&r2=1613740&view=diff
==============================================================================
Files hive/branches/spark/ql/src/test/results/clientpositive/bucket3.q.out 
(original) and 
hive/branches/spark/ql/src/test/results/clientpositive/bucket3.q.out Sat Jul 26 
23:45:46 2014 differ

Modified: hive/branches/spark/ql/src/test/results/clientpositive/bucket4.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/bucket4.q.out?rev=1613740&r1=1613739&r2=1613740&view=diff
==============================================================================
Files hive/branches/spark/ql/src/test/results/clientpositive/bucket4.q.out 
(original) and 
hive/branches/spark/ql/src/test/results/clientpositive/bucket4.q.out Sat Jul 26 
23:45:46 2014 differ

Modified: hive/branches/spark/ql/src/test/results/clientpositive/bucket5.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/bucket5.q.out?rev=1613740&r1=1613739&r2=1613740&view=diff
==============================================================================
Files hive/branches/spark/ql/src/test/results/clientpositive/bucket5.q.out 
(original) and 
hive/branches/spark/ql/src/test/results/clientpositive/bucket5.q.out Sat Jul 26 
23:45:46 2014 differ

Modified: 
hive/branches/spark/ql/src/test/results/clientpositive/bucket_map_join_1.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/bucket_map_join_1.q.out?rev=1613740&r1=1613739&r2=1613740&view=diff
==============================================================================
Files 
hive/branches/spark/ql/src/test/results/clientpositive/bucket_map_join_1.q.out 
(original) and 
hive/branches/spark/ql/src/test/results/clientpositive/bucket_map_join_1.q.out 
Sat Jul 26 23:45:46 2014 differ

Modified: 
hive/branches/spark/ql/src/test/results/clientpositive/bucket_map_join_2.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/bucket_map_join_2.q.out?rev=1613740&r1=1613739&r2=1613740&view=diff
==============================================================================
Files 
hive/branches/spark/ql/src/test/results/clientpositive/bucket_map_join_2.q.out 
(original) and 
hive/branches/spark/ql/src/test/results/clientpositive/bucket_map_join_2.q.out 
Sat Jul 26 23:45:46 2014 differ

Modified: 
hive/branches/spark/ql/src/test/results/clientpositive/bucketcontext_1.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/bucketcontext_1.q.out?rev=1613740&r1=1613739&r2=1613740&view=diff
==============================================================================
Files 
hive/branches/spark/ql/src/test/results/clientpositive/bucketcontext_1.q.out 
(original) and 
hive/branches/spark/ql/src/test/results/clientpositive/bucketcontext_1.q.out 
Sat Jul 26 23:45:46 2014 differ

Modified: 
hive/branches/spark/ql/src/test/results/clientpositive/bucketcontext_2.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/bucketcontext_2.q.out?rev=1613740&r1=1613739&r2=1613740&view=diff
==============================================================================
Files 
hive/branches/spark/ql/src/test/results/clientpositive/bucketcontext_2.q.out 
(original) and 
hive/branches/spark/ql/src/test/results/clientpositive/bucketcontext_2.q.out 
Sat Jul 26 23:45:46 2014 differ

Modified: 
hive/branches/spark/ql/src/test/results/clientpositive/bucketcontext_3.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/bucketcontext_3.q.out?rev=1613740&r1=1613739&r2=1613740&view=diff
==============================================================================
Files 
hive/branches/spark/ql/src/test/results/clientpositive/bucketcontext_3.q.out 
(original) and 
hive/branches/spark/ql/src/test/results/clientpositive/bucketcontext_3.q.out 
Sat Jul 26 23:45:46 2014 differ

Modified: 
hive/branches/spark/ql/src/test/results/clientpositive/bucketcontext_4.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/bucketcontext_4.q.out?rev=1613740&r1=1613739&r2=1613740&view=diff
==============================================================================
Files 
hive/branches/spark/ql/src/test/results/clientpositive/bucketcontext_4.q.out 
(original) and 
hive/branches/spark/ql/src/test/results/clientpositive/bucketcontext_4.q.out 
Sat Jul 26 23:45:46 2014 differ

Modified: 
hive/branches/spark/ql/src/test/results/clientpositive/bucketcontext_5.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/bucketcontext_5.q.out?rev=1613740&r1=1613739&r2=1613740&view=diff
==============================================================================
Files 
hive/branches/spark/ql/src/test/results/clientpositive/bucketcontext_5.q.out 
(original) and 
hive/branches/spark/ql/src/test/results/clientpositive/bucketcontext_5.q.out 
Sat Jul 26 23:45:46 2014 differ

Modified: 
hive/branches/spark/ql/src/test/results/clientpositive/bucketcontext_6.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/bucketcontext_6.q.out?rev=1613740&r1=1613739&r2=1613740&view=diff
==============================================================================
Files 
hive/branches/spark/ql/src/test/results/clientpositive/bucketcontext_6.q.out 
(original) and 
hive/branches/spark/ql/src/test/results/clientpositive/bucketcontext_6.q.out 
Sat Jul 26 23:45:46 2014 differ

Modified: 
hive/branches/spark/ql/src/test/results/clientpositive/bucketcontext_7.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/bucketcontext_7.q.out?rev=1613740&r1=1613739&r2=1613740&view=diff
==============================================================================
Files 
hive/branches/spark/ql/src/test/results/clientpositive/bucketcontext_7.q.out 
(original) and 
hive/branches/spark/ql/src/test/results/clientpositive/bucketcontext_7.q.out 
Sat Jul 26 23:45:46 2014 differ

Modified: 
hive/branches/spark/ql/src/test/results/clientpositive/bucketcontext_8.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/bucketcontext_8.q.out?rev=1613740&r1=1613739&r2=1613740&view=diff
==============================================================================
Files 
hive/branches/spark/ql/src/test/results/clientpositive/bucketcontext_8.q.out 
(original) and 
hive/branches/spark/ql/src/test/results/clientpositive/bucketcontext_8.q.out 
Sat Jul 26 23:45:46 2014 differ

Modified: 
hive/branches/spark/ql/src/test/results/clientpositive/bucketmapjoin10.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/bucketmapjoin10.q.out?rev=1613740&r1=1613739&r2=1613740&view=diff
==============================================================================
Files 
hive/branches/spark/ql/src/test/results/clientpositive/bucketmapjoin10.q.out 
(original) and 
hive/branches/spark/ql/src/test/results/clientpositive/bucketmapjoin10.q.out 
Sat Jul 26 23:45:46 2014 differ

Modified: 
hive/branches/spark/ql/src/test/results/clientpositive/bucketmapjoin11.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/bucketmapjoin11.q.out?rev=1613740&r1=1613739&r2=1613740&view=diff
==============================================================================
Files 
hive/branches/spark/ql/src/test/results/clientpositive/bucketmapjoin11.q.out 
(original) and 
hive/branches/spark/ql/src/test/results/clientpositive/bucketmapjoin11.q.out 
Sat Jul 26 23:45:46 2014 differ

Modified: 
hive/branches/spark/ql/src/test/results/clientpositive/bucketmapjoin12.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/bucketmapjoin12.q.out?rev=1613740&r1=1613739&r2=1613740&view=diff
==============================================================================
Files 
hive/branches/spark/ql/src/test/results/clientpositive/bucketmapjoin12.q.out 
(original) and 
hive/branches/spark/ql/src/test/results/clientpositive/bucketmapjoin12.q.out 
Sat Jul 26 23:45:46 2014 differ

Modified: 
hive/branches/spark/ql/src/test/results/clientpositive/bucketmapjoin13.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/bucketmapjoin13.q.out?rev=1613740&r1=1613739&r2=1613740&view=diff
==============================================================================
Files 
hive/branches/spark/ql/src/test/results/clientpositive/bucketmapjoin13.q.out 
(original) and 
hive/branches/spark/ql/src/test/results/clientpositive/bucketmapjoin13.q.out 
Sat Jul 26 23:45:46 2014 differ

Modified: 
hive/branches/spark/ql/src/test/results/clientpositive/bucketmapjoin8.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/bucketmapjoin8.q.out?rev=1613740&r1=1613739&r2=1613740&view=diff
==============================================================================
Files 
hive/branches/spark/ql/src/test/results/clientpositive/bucketmapjoin8.q.out 
(original) and 
hive/branches/spark/ql/src/test/results/clientpositive/bucketmapjoin8.q.out Sat 
Jul 26 23:45:46 2014 differ

Modified: 
hive/branches/spark/ql/src/test/results/clientpositive/bucketmapjoin9.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/bucketmapjoin9.q.out?rev=1613740&r1=1613739&r2=1613740&view=diff
==============================================================================
Files 
hive/branches/spark/ql/src/test/results/clientpositive/bucketmapjoin9.q.out 
(original) and 
hive/branches/spark/ql/src/test/results/clientpositive/bucketmapjoin9.q.out Sat 
Jul 26 23:45:46 2014 differ

Modified: hive/branches/spark/ql/src/test/results/clientpositive/cast1.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/cast1.q.out?rev=1613740&r1=1613739&r2=1613740&view=diff
==============================================================================
--- hive/branches/spark/ql/src/test/results/clientpositive/cast1.q.out 
(original)
+++ hive/branches/spark/ql/src/test/results/clientpositive/cast1.q.out Sat Jul 
26 23:45:46 2014
@@ -27,17 +27,17 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: src
-            Statistics: Num rows: 58 Data size: 5812 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 2906 Data size: 5812 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (key = 86) (type: boolean)
-              Statistics: Num rows: 29 Data size: 2906 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1453 Data size: 2906 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: (3 + 2) (type: int), (3.0 + 2) (type: double), (3 
+ 2.0) (type: double), (3.0 + 2.0) (type: double), ((3 + UDFToInteger(2.0)) + 
UDFToInteger(UDFToShort(0))) (type: int), UDFToBoolean(1) (type: boolean), 
UDFToInteger(true) (type: int)
+                expressions: 5 (type: int), 5.0 (type: double), 5.0 (type: 
double), 5.0 (type: double), 5 (type: int), true (type: boolean), 1 (type: int)
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6
-                Statistics: Num rows: 29 Data size: 2906 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 1453 Data size: 2906 Basic stats: 
COMPLETE Column stats: NONE
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 29 Data size: 2906 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 1453 Data size: 2906 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