You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by gu...@apache.org on 2014/01/03 19:37:36 UTC

svn commit: r1555193 [2/6] - in /hive/branches/tez: ./ ant/src/org/apache/hadoop/hive/ant/ common/src/java/org/apache/hadoop/hive/common/type/ common/src/test/org/apache/hadoop/hive/common/type/ itests/hive-unit/src/test/java/org/apache/hadoop/hive/jdb...

Modified: hive/branches/tez/ql/src/test/results/clientnegative/authorization_fail_5.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/clientnegative/authorization_fail_5.q.out?rev=1555193&r1=1555192&r2=1555193&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/clientnegative/authorization_fail_5.q.out (original)
+++ hive/branches/tez/ql/src/test/results/clientnegative/authorization_fail_5.q.out Fri Jan  3 18:37:34 2014
@@ -44,61 +44,55 @@ PREHOOK: query: show grant user hive_tes
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant user hive_test_user on table authorization_fail
 POSTHOOK: type: SHOW_GRANT
-
-database	default	
-table	authorization_fail	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Alter	
-#### A masked pattern was here ####
-grantor	hive_test_user	
-
-database	default	
-table	authorization_fail	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Create	
-#### A masked pattern was here ####
-grantor	hive_test_user	
-
-database	default	
-table	authorization_fail	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Select	
+database	default
+table	authorization_fail
+principalName	hive_test_user
+principalType	USER
+privilege	Alter
+#### A masked pattern was here ####
+grantor	hive_test_user
+database	default
+table	authorization_fail
+principalName	hive_test_user
+principalType	USER
+privilege	Create
+#### A masked pattern was here ####
+grantor	hive_test_user
+database	default
+table	authorization_fail
+principalName	hive_test_user
+principalType	USER
+privilege	Select
 #### A masked pattern was here ####
-grantor	hive_test_user	
+grantor	hive_test_user
 PREHOOK: query: show grant user hive_test_user on table authorization_fail partition (ds='2010')
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant user hive_test_user on table authorization_fail partition (ds='2010')
 POSTHOOK: type: SHOW_GRANT
-
-database	default	
-table	authorization_fail	
-partition	ds=2010	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Alter	
-#### A masked pattern was here ####
-grantor	hive_test_user	
-
-database	default	
-table	authorization_fail	
-partition	ds=2010	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Create	
-#### A masked pattern was here ####
-grantor	hive_test_user	
-
-database	default	
-table	authorization_fail	
-partition	ds=2010	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Select	
+database	default
+table	authorization_fail
+partition	ds=2010
+principalName	hive_test_user
+principalType	USER
+privilege	Alter
+#### A masked pattern was here ####
+grantor	hive_test_user
+database	default
+table	authorization_fail
+partition	ds=2010
+principalName	hive_test_user
+principalType	USER
+privilege	Create
+#### A masked pattern was here ####
+grantor	hive_test_user
+database	default
+table	authorization_fail
+partition	ds=2010
+principalName	hive_test_user
+principalType	USER
+privilege	Select
 #### A masked pattern was here ####
-grantor	hive_test_user	
+grantor	hive_test_user
 PREHOOK: query: revoke Select on table authorization_fail partition (ds='2010') from user hive_test_user
 PREHOOK: type: REVOKE_PRIVILEGE
 PREHOOK: Output: default@authorization_fail@ds=2010
@@ -109,22 +103,20 @@ PREHOOK: query: show grant user hive_tes
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant user hive_test_user on table authorization_fail partition (ds='2010')
 POSTHOOK: type: SHOW_GRANT
-
-database	default	
-table	authorization_fail	
-partition	ds=2010	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Alter	
-#### A masked pattern was here ####
-grantor	hive_test_user	
-
-database	default	
-table	authorization_fail	
-partition	ds=2010	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Create	
+database	default
+table	authorization_fail
+partition	ds=2010
+principalName	hive_test_user
+principalType	USER
+privilege	Alter
+#### A masked pattern was here ####
+grantor	hive_test_user
+database	default
+table	authorization_fail
+partition	ds=2010
+principalName	hive_test_user
+principalType	USER
+privilege	Create
 #### A masked pattern was here ####
-grantor	hive_test_user	
+grantor	hive_test_user
 Authorization failed:No privilege 'Select' found for inputs { database:default, table:authorization_fail, partitionName:ds=2010, columnName:key}. Use SHOW GRANT to get more details.

Modified: hive/branches/tez/ql/src/test/results/clientnegative/authorization_fail_7.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/clientnegative/authorization_fail_7.q.out?rev=1555193&r1=1555192&r2=1555193&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/clientnegative/authorization_fail_7.q.out (original)
+++ hive/branches/tez/ql/src/test/results/clientnegative/authorization_fail_7.q.out Fri Jan  3 18:37:34 2014
@@ -25,19 +25,18 @@ PREHOOK: query: show role grant user hiv
 PREHOOK: type: SHOW_ROLE_GRANT
 POSTHOOK: query: show role grant user hive_test_user
 POSTHOOK: type: SHOW_ROLE_GRANT
-role name:hive_test_role_fail
+hive_test_role_fail
 PREHOOK: query: show grant role hive_test_role_fail on table authorization_fail
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant role hive_test_role_fail on table authorization_fail
 POSTHOOK: type: SHOW_GRANT
-
-database	default	
-table	authorization_fail	
-principalName	hive_test_role_fail	
-principalType	ROLE	
-privilege	Select	
+database	default
+table	authorization_fail
+principalName	hive_test_role_fail
+principalType	ROLE
+privilege	Select
 #### A masked pattern was here ####
-grantor	hive_test_user	
+grantor	hive_test_user
 PREHOOK: query: drop role hive_test_role_fail
 PREHOOK: type: DROPROLE
 POSTHOOK: query: drop role hive_test_role_fail

Modified: hive/branches/tez/ql/src/test/results/clientnegative/authorization_part.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/clientnegative/authorization_part.q.out?rev=1555193&r1=1555192&r2=1555193&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/clientnegative/authorization_part.q.out (original)
+++ hive/branches/tez/ql/src/test/results/clientnegative/authorization_part.q.out Fri Jan  3 18:37:34 2014
@@ -66,14 +66,13 @@ PREHOOK: query: show grant group hive_te
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant group hive_test_group1 on table authorization_part_fail
 POSTHOOK: type: SHOW_GRANT
-
-database	default	
-table	authorization_part_fail	
-principalName	hive_test_group1	
-principalType	GROUP	
-privilege	Select	
+database	default
+table	authorization_part_fail
+principalName	hive_test_group1
+principalType	GROUP
+privilege	Select
 #### A masked pattern was here ####
-grantor	hive_test_user	
+grantor	hive_test_user
 PREHOOK: query: insert overwrite table authorization_part_fail partition (ds='2010') select key, value from src_auth
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src_auth
@@ -90,31 +89,29 @@ POSTHOOK: query: show grant group hive_t
 POSTHOOK: type: SHOW_GRANT
 POSTHOOK: Lineage: authorization_part_fail PARTITION(ds=2010).key EXPRESSION [(src_auth)src_auth.FieldSchema(name:key, type:string, comment:null), ]
 POSTHOOK: Lineage: authorization_part_fail PARTITION(ds=2010).value SIMPLE [(src_auth)src_auth.FieldSchema(name:value, type:string, comment:null), ]
-
-database	default	
-table	authorization_part_fail	
-partition	ds=2010	
-columnName	key	
-principalName	hive_test_group1	
-principalType	GROUP	
-privilege	Select	
+database	default
+table	authorization_part_fail
+partition	ds=2010
+columnName	key
+principalName	hive_test_group1
+principalType	GROUP
+privilege	Select
 #### A masked pattern was here ####
-grantor	hive_test_user	
+grantor	hive_test_user
 PREHOOK: query: show grant group hive_test_group1 on table authorization_part_fail partition (ds='2010')
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant group hive_test_group1 on table authorization_part_fail partition (ds='2010')
 POSTHOOK: type: SHOW_GRANT
 POSTHOOK: Lineage: authorization_part_fail PARTITION(ds=2010).key EXPRESSION [(src_auth)src_auth.FieldSchema(name:key, type:string, comment:null), ]
 POSTHOOK: Lineage: authorization_part_fail PARTITION(ds=2010).value SIMPLE [(src_auth)src_auth.FieldSchema(name:value, type:string, comment:null), ]
-
-database	default	
-table	authorization_part_fail	
-partition	ds=2010	
-principalName	hive_test_group1	
-principalType	GROUP	
-privilege	Select	
+database	default
+table	authorization_part_fail
+partition	ds=2010
+principalName	hive_test_group1
+principalType	GROUP
+privilege	Select
 #### A masked pattern was here ####
-grantor	hive_test_user	
+grantor	hive_test_user
 PREHOOK: query: select key, value from authorization_part_fail where ds='2010' order by key limit 20
 PREHOOK: type: QUERY
 PREHOOK: Input: default@authorization_part_fail
@@ -167,16 +164,15 @@ POSTHOOK: Lineage: authorization_part_fa
 POSTHOOK: Lineage: authorization_part_fail PARTITION(ds=2010).value SIMPLE [(src_auth)src_auth.FieldSchema(name:value, type:string, comment:null), ]
 POSTHOOK: Lineage: authorization_part_fail PARTITION(ds=2011).key EXPRESSION [(src_auth)src_auth.FieldSchema(name:key, type:string, comment:null), ]
 POSTHOOK: Lineage: authorization_part_fail PARTITION(ds=2011).value SIMPLE [(src_auth)src_auth.FieldSchema(name:value, type:string, comment:null), ]
-
-database	default	
-table	authorization_part_fail	
-partition	ds=2011	
-columnName	key	
-principalName	hive_test_group1	
-principalType	GROUP	
-privilege	Select	
+database	default
+table	authorization_part_fail
+partition	ds=2011
+columnName	key
+principalName	hive_test_group1
+principalType	GROUP
+privilege	Select
 #### A masked pattern was here ####
-grantor	hive_test_user	
+grantor	hive_test_user
 PREHOOK: query: show grant group hive_test_group1 on table authorization_part_fail partition (ds='2011')
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant group hive_test_group1 on table authorization_part_fail partition (ds='2011')
@@ -185,15 +181,14 @@ POSTHOOK: Lineage: authorization_part_fa
 POSTHOOK: Lineage: authorization_part_fail PARTITION(ds=2010).value SIMPLE [(src_auth)src_auth.FieldSchema(name:value, type:string, comment:null), ]
 POSTHOOK: Lineage: authorization_part_fail PARTITION(ds=2011).key EXPRESSION [(src_auth)src_auth.FieldSchema(name:key, type:string, comment:null), ]
 POSTHOOK: Lineage: authorization_part_fail PARTITION(ds=2011).value SIMPLE [(src_auth)src_auth.FieldSchema(name:value, type:string, comment:null), ]
-
-database	default	
-table	authorization_part_fail	
-partition	ds=2011	
-principalName	hive_test_group1	
-principalType	GROUP	
-privilege	Select	
+database	default
+table	authorization_part_fail
+partition	ds=2011
+principalName	hive_test_group1
+principalType	GROUP
+privilege	Select
 #### A masked pattern was here ####
-grantor	hive_test_user	
+grantor	hive_test_user
 PREHOOK: query: select key, value from authorization_part_fail where ds='2011' order by key limit 20
 PREHOOK: type: QUERY
 PREHOOK: Input: default@authorization_part_fail

Modified: hive/branches/tez/ql/src/test/results/clientnegative/unset_table_property.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/clientnegative/unset_table_property.q.out?rev=1555193&r1=1555192&r2=1555193&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/clientnegative/unset_table_property.q.out (original)
+++ hive/branches/tez/ql/src/test/results/clientnegative/unset_table_property.q.out Fri Jan  3 18:37:34 2014
@@ -15,7 +15,6 @@ PREHOOK: query: SHOW TBLPROPERTIES testT
 PREHOOK: type: SHOW_TBLPROPERTIES
 POSTHOOK: query: SHOW TBLPROPERTIES testTable
 POSTHOOK: type: SHOW_TBLPROPERTIES
-	 
 numFiles	0
 #### A masked pattern was here ####
 c	3

Modified: hive/branches/tez/ql/src/test/results/clientnegative/unset_view_property.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/clientnegative/unset_view_property.q.out?rev=1555193&r1=1555192&r2=1555193&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/clientnegative/unset_view_property.q.out (original)
+++ hive/branches/tez/ql/src/test/results/clientnegative/unset_view_property.q.out Fri Jan  3 18:37:34 2014
@@ -15,7 +15,6 @@ PREHOOK: query: SHOW TBLPROPERTIES testV
 PREHOOK: type: SHOW_TBLPROPERTIES
 POSTHOOK: query: SHOW TBLPROPERTIES testView
 POSTHOOK: type: SHOW_TBLPROPERTIES
-	 
 #### A masked pattern was here ####
 propA	100
 propB	200

Modified: hive/branches/tez/ql/src/test/results/clientpositive/alter_rename_partition_authorization.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/clientpositive/alter_rename_partition_authorization.q.out?rev=1555193&r1=1555192&r2=1555193&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/clientpositive/alter_rename_partition_authorization.q.out (original)
+++ hive/branches/tez/ql/src/test/results/clientpositive/alter_rename_partition_authorization.q.out Fri Jan  3 18:37:34 2014
@@ -52,30 +52,27 @@ 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
-
-database	default	
-table	authorization_part	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Create	
+database	default
+table	authorization_part
+principalName	hive_test_user
+principalType	USER
+privilege	Create
 #### A masked pattern was here ####
-grantor	hive_test_user	
-
-database	default	
-table	authorization_part	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Drop	
+grantor	hive_test_user
+database	default
+table	authorization_part
+principalName	hive_test_user
+principalType	USER
+privilege	Drop
 #### A masked pattern was here ####
-grantor	hive_test_user	
-
-database	default	
-table	authorization_part	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Update	
+grantor	hive_test_user
+database	default
+table	authorization_part
+principalName	hive_test_user
+principalType	USER
+privilege	Update
 #### A masked pattern was here ####
-grantor	hive_test_user	
+grantor	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
@@ -98,16 +95,15 @@ POSTHOOK: query: show grant user hive_te
 POSTHOOK: type: SHOW_GRANT
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).key EXPRESSION [(src_auth_tmp)src_auth_tmp.FieldSchema(name:key, type:string, comment:null), ]
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).value SIMPLE [(src_auth_tmp)src_auth_tmp.FieldSchema(name:value, type:string, comment:null), ]
-
-database	default	
-table	authorization_part	
-partition	ds=2010	
-columnName	key	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Select	
+database	default
+table	authorization_part
+partition	ds=2010
+columnName	key
+principalName	hive_test_user
+principalType	USER
+privilege	Select
 #### A masked pattern was here ####
-grantor	hive_test_user	
+grantor	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
@@ -126,16 +122,15 @@ POSTHOOK: query: show grant user hive_te
 POSTHOOK: type: SHOW_GRANT
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).key EXPRESSION [(src_auth_tmp)src_auth_tmp.FieldSchema(name:key, type:string, comment:null), ]
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).value SIMPLE [(src_auth_tmp)src_auth_tmp.FieldSchema(name:value, type:string, comment:null), ]
-
-database	default	
-table	authorization_part	
-partition	ds=2010_tmp	
-columnName	key	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Select	
+database	default
+table	authorization_part
+partition	ds=2010_tmp
+columnName	key
+principalName	hive_test_user
+principalType	USER
+privilege	Select
 #### A masked pattern was here ####
-grantor	hive_test_user	
+grantor	hive_test_user
 PREHOOK: query: drop table authorization_part
 PREHOOK: type: DROPTABLE
 PREHOOK: Input: default@authorization_part

Modified: hive/branches/tez/ql/src/test/results/clientpositive/authorization_1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/clientpositive/authorization_1.q.out?rev=1555193&r1=1555192&r2=1555193&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/clientpositive/authorization_1.q.out (original)
+++ hive/branches/tez/ql/src/test/results/clientpositive/authorization_1.q.out Fri Jan  3 18:37:34 2014
@@ -23,14 +23,13 @@ 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
-
-database	default	
-table	src_autho_test	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Select	
+database	default
+table	src_autho_test
+principalName	hive_test_user
+principalType	USER
+privilege	Select
 #### A masked pattern was here ####
-grantor	hive_test_user	
+grantor	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)
@@ -95,15 +94,14 @@ 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
-
-database	default	
-table	src_autho_test	
-columnName	key	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Select	
+database	default
+table	src_autho_test
+columnName	key
+principalName	hive_test_user
+principalType	USER
+privilege	Select
 #### A masked pattern was here ####
-grantor	hive_test_user	
+grantor	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
@@ -160,14 +158,13 @@ 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
-
-database	default	
-table	src_autho_test	
-principalName	hive_test_group1	
-principalType	GROUP	
-privilege	Select	
+database	default
+table	src_autho_test
+principalName	hive_test_group1
+principalType	GROUP
+privilege	Select
 #### A masked pattern was here ####
-grantor	hive_test_user	
+grantor	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)
@@ -232,15 +229,14 @@ 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
-
-database	default	
-table	src_autho_test	
-columnName	key	
-principalName	hive_test_group1	
-principalType	GROUP	
-privilege	Select	
+database	default
+table	src_autho_test
+columnName	key
+principalName	hive_test_group1
+principalType	GROUP
+privilege	Select
 #### A masked pattern was here ####
-grantor	hive_test_user	
+grantor	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
@@ -297,7 +293,7 @@ PREHOOK: query: show role grant user hiv
 PREHOOK: type: SHOW_ROLE_GRANT
 POSTHOOK: query: show role grant user hive_test_user
 POSTHOOK: type: SHOW_ROLE_GRANT
-role name:src_role
+src_role
 PREHOOK: query: --column grant to role
 
 grant select(key) on table src_autho_test to role src_role
@@ -316,15 +312,14 @@ 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
-
-database	default	
-table	src_autho_test	
-columnName	key	
-principalName	src_role	
-principalType	ROLE	
-privilege	Select	
+database	default
+table	src_autho_test
+columnName	key
+principalName	src_role
+principalType	ROLE
+privilege	Select
 #### A masked pattern was here ####
-grantor	hive_test_user	
+grantor	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
@@ -401,14 +396,13 @@ 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
-
-database	default	
-table	src_autho_test	
-principalName	src_role	
-principalType	ROLE	
-privilege	Select	
+database	default
+table	src_autho_test
+principalName	src_role
+principalType	ROLE
+privilege	Select
 #### A masked pattern was here ####
-grantor	hive_test_user	
+grantor	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/tez/ql/src/test/results/clientpositive/authorization_2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/clientpositive/authorization_2.q.out?rev=1555193&r1=1555192&r2=1555193&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/clientpositive/authorization_2.q.out (original)
+++ hive/branches/tez/ql/src/test/results/clientpositive/authorization_2.q.out Fri Jan  3 18:37:34 2014
@@ -52,30 +52,27 @@ 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
-
-database	default	
-table	authorization_part	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Create	
-#### A masked pattern was here ####
-grantor	hive_test_user	
-
-database	default	
-table	authorization_part	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Drop	
-#### A masked pattern was here ####
-grantor	hive_test_user	
-
-database	default	
-table	authorization_part	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Update	
+database	default
+table	authorization_part
+principalName	hive_test_user
+principalType	USER
+privilege	Create
+#### A masked pattern was here ####
+grantor	hive_test_user
+database	default
+table	authorization_part
+principalName	hive_test_user
+principalType	USER
+privilege	Drop
+#### A masked pattern was here ####
+grantor	hive_test_user
+database	default
+table	authorization_part
+principalName	hive_test_user
+principalType	USER
+privilege	Update
 #### A masked pattern was here ####
-grantor	hive_test_user	
+grantor	hive_test_user
 PREHOOK: query: alter table authorization_part add partition (ds='2010')
 PREHOOK: type: ALTERTABLE_ADDPARTS
 PREHOOK: Input: default@authorization_part
@@ -87,33 +84,30 @@ 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
-
-database	default	
-table	authorization_part	
-partition	ds=2010	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Create	
-#### A masked pattern was here ####
-grantor	hive_test_user	
-
-database	default	
-table	authorization_part	
-partition	ds=2010	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Drop	
+database	default
+table	authorization_part
+partition	ds=2010
+principalName	hive_test_user
+principalType	USER
+privilege	Create
+#### A masked pattern was here ####
+grantor	hive_test_user
+database	default
+table	authorization_part
+partition	ds=2010
+principalName	hive_test_user
+principalType	USER
+privilege	Drop
+#### A masked pattern was here ####
+grantor	hive_test_user
+database	default
+table	authorization_part
+partition	ds=2010
+principalName	hive_test_user
+principalType	USER
+privilege	Update
 #### A masked pattern was here ####
-grantor	hive_test_user	
-
-database	default	
-table	authorization_part	
-partition	ds=2010	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Update	
-#### A masked pattern was here ####
-grantor	hive_test_user	
+grantor	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
@@ -144,31 +138,29 @@ POSTHOOK: query: show grant user hive_te
 POSTHOOK: type: SHOW_GRANT
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).key EXPRESSION [(src_auth_tmp)src_auth_tmp.FieldSchema(name:key, type:string, comment:null), ]
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).value SIMPLE [(src_auth_tmp)src_auth_tmp.FieldSchema(name:value, type:string, comment:null), ]
-
-database	default	
-table	authorization_part	
-partition	ds=2010	
-columnName	key	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Select	
+database	default
+table	authorization_part
+partition	ds=2010
+columnName	key
+principalName	hive_test_user
+principalType	USER
+privilege	Select
 #### A masked pattern was here ####
-grantor	hive_test_user	
+grantor	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
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).key EXPRESSION [(src_auth_tmp)src_auth_tmp.FieldSchema(name:key, type:string, comment:null), ]
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).value SIMPLE [(src_auth_tmp)src_auth_tmp.FieldSchema(name:value, type:string, comment:null), ]
-
-database	default	
-table	authorization_part	
-columnName	key	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Select	
+database	default
+table	authorization_part
+columnName	key
+principalName	hive_test_user
+principalType	USER
+privilege	Select
 #### A masked pattern was here ####
-grantor	hive_test_user	
+grantor	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
@@ -221,16 +213,15 @@ POSTHOOK: query: show grant user hive_te
 POSTHOOK: type: SHOW_GRANT
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).key EXPRESSION [(src_auth_tmp)src_auth_tmp.FieldSchema(name:key, type:string, comment:null), ]
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).value SIMPLE [(src_auth_tmp)src_auth_tmp.FieldSchema(name:value, type:string, comment:null), ]
-
-database	default	
-table	authorization_part	
-partition	ds=2010	
-columnName	key	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Select	
+database	default
+table	authorization_part
+partition	ds=2010
+columnName	key
+principalName	hive_test_user
+principalType	USER
+privilege	Select
 #### A masked pattern was here ####
-grantor	hive_test_user	
+grantor	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
@@ -295,30 +286,27 @@ show grant user hive_test_user on table 
 POSTHOOK: type: SHOW_GRANT
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).key EXPRESSION [(src_auth_tmp)src_auth_tmp.FieldSchema(name:key, type:string, comment:null), ]
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).value SIMPLE [(src_auth_tmp)src_auth_tmp.FieldSchema(name:value, type:string, comment:null), ]
-
-database	default	
-table	authorization_part	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Create	
-#### A masked pattern was here ####
-grantor	hive_test_user	
-
-database	default	
-table	authorization_part	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Drop	
-#### A masked pattern was here ####
-grantor	hive_test_user	
-
-database	default	
-table	authorization_part	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Update	
+database	default
+table	authorization_part
+principalName	hive_test_user
+principalType	USER
+privilege	Create
+#### A masked pattern was here ####
+grantor	hive_test_user
+database	default
+table	authorization_part
+principalName	hive_test_user
+principalType	USER
+privilege	Drop
+#### A masked pattern was here ####
+grantor	hive_test_user
+database	default
+table	authorization_part
+principalName	hive_test_user
+principalType	USER
+privilege	Update
 #### A masked pattern was here ####
-grantor	hive_test_user	
+grantor	hive_test_user
 PREHOOK: query: alter table authorization_part add partition (ds='2010')
 PREHOOK: type: ALTERTABLE_ADDPARTS
 PREHOOK: Input: default@authorization_part
@@ -334,33 +322,30 @@ POSTHOOK: query: show grant user hive_te
 POSTHOOK: type: SHOW_GRANT
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).key EXPRESSION [(src_auth_tmp)src_auth_tmp.FieldSchema(name:key, type:string, comment:null), ]
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).value SIMPLE [(src_auth_tmp)src_auth_tmp.FieldSchema(name:value, type:string, comment:null), ]
-
-database	default	
-table	authorization_part	
-partition	ds=2010	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Create	
-#### A masked pattern was here ####
-grantor	hive_test_user	
-
-database	default	
-table	authorization_part	
-partition	ds=2010	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Drop	
-#### A masked pattern was here ####
-grantor	hive_test_user	
-
-database	default	
-table	authorization_part	
-partition	ds=2010	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Update	
+database	default
+table	authorization_part
+partition	ds=2010
+principalName	hive_test_user
+principalType	USER
+privilege	Create
+#### A masked pattern was here ####
+grantor	hive_test_user
+database	default
+table	authorization_part
+partition	ds=2010
+principalName	hive_test_user
+principalType	USER
+privilege	Drop
+#### A masked pattern was here ####
+grantor	hive_test_user
+database	default
+table	authorization_part
+partition	ds=2010
+principalName	hive_test_user
+principalType	USER
+privilege	Update
 #### A masked pattern was here ####
-grantor	hive_test_user	
+grantor	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
@@ -399,42 +384,38 @@ POSTHOOK: Lineage: authorization_part PA
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).value SIMPLE [(src_auth_tmp)src_auth_tmp.FieldSchema(name:value, type:string, comment:null), ]
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).key EXPRESSION [(src_auth_tmp)src_auth_tmp.FieldSchema(name:key, type:string, comment:null), ]
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).value SIMPLE [(src_auth_tmp)src_auth_tmp.FieldSchema(name:value, type:string, comment:null), ]
-
-database	default	
-table	authorization_part	
-partition	ds=2010	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Create	
-#### A masked pattern was here ####
-grantor	hive_test_user	
-
-database	default	
-table	authorization_part	
-partition	ds=2010	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Drop	
-#### A masked pattern was here ####
-grantor	hive_test_user	
-
-database	default	
-table	authorization_part	
-partition	ds=2010	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Select	
-#### A masked pattern was here ####
-grantor	hive_test_user	
-
-database	default	
-table	authorization_part	
-partition	ds=2010	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Update	
+database	default
+table	authorization_part
+partition	ds=2010
+principalName	hive_test_user
+principalType	USER
+privilege	Create
+#### A masked pattern was here ####
+grantor	hive_test_user
+database	default
+table	authorization_part
+partition	ds=2010
+principalName	hive_test_user
+principalType	USER
+privilege	Drop
+#### A masked pattern was here ####
+grantor	hive_test_user
+database	default
+table	authorization_part
+partition	ds=2010
+principalName	hive_test_user
+principalType	USER
+privilege	Select
+#### A masked pattern was here ####
+grantor	hive_test_user
+database	default
+table	authorization_part
+partition	ds=2010
+principalName	hive_test_user
+principalType	USER
+privilege	Update
 #### A masked pattern was here ####
-grantor	hive_test_user	
+grantor	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
@@ -443,38 +424,34 @@ POSTHOOK: Lineage: authorization_part PA
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).value SIMPLE [(src_auth_tmp)src_auth_tmp.FieldSchema(name:value, type:string, comment:null), ]
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).key EXPRESSION [(src_auth_tmp)src_auth_tmp.FieldSchema(name:key, type:string, comment:null), ]
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).value SIMPLE [(src_auth_tmp)src_auth_tmp.FieldSchema(name:value, type:string, comment:null), ]
-
-database	default	
-table	authorization_part	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Create	
-#### A masked pattern was here ####
-grantor	hive_test_user	
-
-database	default	
-table	authorization_part	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Drop	
-#### A masked pattern was here ####
-grantor	hive_test_user	
-
-database	default	
-table	authorization_part	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Select	
-#### A masked pattern was here ####
-grantor	hive_test_user	
-
-database	default	
-table	authorization_part	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Update	
+database	default
+table	authorization_part
+principalName	hive_test_user
+principalType	USER
+privilege	Create
+#### A masked pattern was here ####
+grantor	hive_test_user
+database	default
+table	authorization_part
+principalName	hive_test_user
+principalType	USER
+privilege	Drop
+#### A masked pattern was here ####
+grantor	hive_test_user
+database	default
+table	authorization_part
+principalName	hive_test_user
+principalType	USER
+privilege	Select
+#### A masked pattern was here ####
+grantor	hive_test_user
+database	default
+table	authorization_part
+principalName	hive_test_user
+principalType	USER
+privilege	Update
 #### A masked pattern was here ####
-grantor	hive_test_user	
+grantor	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
@@ -527,30 +504,27 @@ POSTHOOK: Lineage: authorization_part PA
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).value SIMPLE [(src_auth_tmp)src_auth_tmp.FieldSchema(name:value, type:string, comment:null), ]
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).key EXPRESSION [(src_auth_tmp)src_auth_tmp.FieldSchema(name:key, type:string, comment:null), ]
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).value SIMPLE [(src_auth_tmp)src_auth_tmp.FieldSchema(name:value, type:string, comment:null), ]
-
-database	default	
-table	authorization_part	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Create	
+database	default
+table	authorization_part
+principalName	hive_test_user
+principalType	USER
+privilege	Create
+#### A masked pattern was here ####
+grantor	hive_test_user
+database	default
+table	authorization_part
+principalName	hive_test_user
+principalType	USER
+privilege	Drop
+#### A masked pattern was here ####
+grantor	hive_test_user
+database	default
+table	authorization_part
+principalName	hive_test_user
+principalType	USER
+privilege	Update
 #### A masked pattern was here ####
-grantor	hive_test_user	
-
-database	default	
-table	authorization_part	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Drop	
-#### A masked pattern was here ####
-grantor	hive_test_user	
-
-database	default	
-table	authorization_part	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Update	
-#### A masked pattern was here ####
-grantor	hive_test_user	
+grantor	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')
@@ -559,42 +533,38 @@ POSTHOOK: Lineage: authorization_part PA
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).value SIMPLE [(src_auth_tmp)src_auth_tmp.FieldSchema(name:value, type:string, comment:null), ]
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).key EXPRESSION [(src_auth_tmp)src_auth_tmp.FieldSchema(name:key, type:string, comment:null), ]
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).value SIMPLE [(src_auth_tmp)src_auth_tmp.FieldSchema(name:value, type:string, comment:null), ]
-
-database	default	
-table	authorization_part	
-partition	ds=2010	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Create	
-#### A masked pattern was here ####
-grantor	hive_test_user	
-
-database	default	
-table	authorization_part	
-partition	ds=2010	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Drop	
+database	default
+table	authorization_part
+partition	ds=2010
+principalName	hive_test_user
+principalType	USER
+privilege	Create
+#### A masked pattern was here ####
+grantor	hive_test_user
+database	default
+table	authorization_part
+partition	ds=2010
+principalName	hive_test_user
+principalType	USER
+privilege	Drop
+#### A masked pattern was here ####
+grantor	hive_test_user
+database	default
+table	authorization_part
+partition	ds=2010
+principalName	hive_test_user
+principalType	USER
+privilege	Select
+#### A masked pattern was here ####
+grantor	hive_test_user
+database	default
+table	authorization_part
+partition	ds=2010
+principalName	hive_test_user
+principalType	USER
+privilege	Update
 #### A masked pattern was here ####
-grantor	hive_test_user	
-
-database	default	
-table	authorization_part	
-partition	ds=2010	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Select	
-#### A masked pattern was here ####
-grantor	hive_test_user	
-
-database	default	
-table	authorization_part	
-partition	ds=2010	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Update	
-#### A masked pattern was here ####
-grantor	hive_test_user	
+grantor	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
@@ -647,33 +617,30 @@ POSTHOOK: Lineage: authorization_part PA
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).value SIMPLE [(src_auth_tmp)src_auth_tmp.FieldSchema(name:value, type:string, comment:null), ]
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).key EXPRESSION [(src_auth_tmp)src_auth_tmp.FieldSchema(name:key, type:string, comment:null), ]
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).value SIMPLE [(src_auth_tmp)src_auth_tmp.FieldSchema(name:value, type:string, comment:null), ]
-
-database	default	
-table	authorization_part	
-partition	ds=2010	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Create	
-#### A masked pattern was here ####
-grantor	hive_test_user	
-
-database	default	
-table	authorization_part	
-partition	ds=2010	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Drop	
+database	default
+table	authorization_part
+partition	ds=2010
+principalName	hive_test_user
+principalType	USER
+privilege	Create
+#### A masked pattern was here ####
+grantor	hive_test_user
+database	default
+table	authorization_part
+partition	ds=2010
+principalName	hive_test_user
+principalType	USER
+privilege	Drop
+#### A masked pattern was here ####
+grantor	hive_test_user
+database	default
+table	authorization_part
+partition	ds=2010
+principalName	hive_test_user
+principalType	USER
+privilege	Update
 #### A masked pattern was here ####
-grantor	hive_test_user	
-
-database	default	
-table	authorization_part	
-partition	ds=2010	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Update	
-#### A masked pattern was here ####
-grantor	hive_test_user	
+grantor	hive_test_user
 PREHOOK: query: alter table authorization_part drop partition (ds='2010')
 PREHOOK: type: ALTERTABLE_DROPPARTS
 PREHOOK: Input: default@authorization_part
@@ -763,16 +730,15 @@ POSTHOOK: Lineage: authorization_part PA
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).value SIMPLE [(src_auth_tmp)src_auth_tmp.FieldSchema(name:value, type:string, comment:null), ]
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).key EXPRESSION [(src_auth_tmp)src_auth_tmp.FieldSchema(name:key, type:string, comment:null), ]
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).value SIMPLE [(src_auth_tmp)src_auth_tmp.FieldSchema(name:value, type:string, comment:null), ]
-
-database	default	
-table	authorization_part	
-partition	ds=2010	
-columnName	key	
-principalName	hive_test_group1	
-principalType	GROUP	
-privilege	Select	
+database	default
+table	authorization_part
+partition	ds=2010
+columnName	key
+principalName	hive_test_group1
+principalType	GROUP
+privilege	Select
 #### A masked pattern was here ####
-grantor	hive_test_user	
+grantor	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)
@@ -783,15 +749,14 @@ POSTHOOK: Lineage: authorization_part PA
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).value SIMPLE [(src_auth_tmp)src_auth_tmp.FieldSchema(name:value, type:string, comment:null), ]
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).key EXPRESSION [(src_auth_tmp)src_auth_tmp.FieldSchema(name:key, type:string, comment:null), ]
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).value SIMPLE [(src_auth_tmp)src_auth_tmp.FieldSchema(name:value, type:string, comment:null), ]
-
-database	default	
-table	authorization_part	
-columnName	key	
-principalName	hive_test_group1	
-principalType	GROUP	
-privilege	Select	
+database	default
+table	authorization_part
+columnName	key
+principalName	hive_test_group1
+principalType	GROUP
+privilege	Select
 #### A masked pattern was here ####
-grantor	hive_test_user	
+grantor	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
@@ -860,16 +825,15 @@ POSTHOOK: Lineage: authorization_part PA
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).value SIMPLE [(src_auth_tmp)src_auth_tmp.FieldSchema(name:value, type:string, comment:null), ]
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).key EXPRESSION [(src_auth_tmp)src_auth_tmp.FieldSchema(name:key, type:string, comment:null), ]
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).value SIMPLE [(src_auth_tmp)src_auth_tmp.FieldSchema(name:value, type:string, comment:null), ]
-
-database	default	
-table	authorization_part	
-partition	ds=2010	
-columnName	key	
-principalName	hive_test_group1	
-principalType	GROUP	
-privilege	Select	
+database	default
+table	authorization_part
+partition	ds=2010
+columnName	key
+principalName	hive_test_group1
+principalType	GROUP
+privilege	Select
 #### A masked pattern was here ####
-grantor	hive_test_user	
+grantor	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
@@ -1031,15 +995,14 @@ POSTHOOK: Lineage: authorization_part PA
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).value SIMPLE [(src_auth_tmp)src_auth_tmp.FieldSchema(name:value, type:string, comment:null), ]
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).key EXPRESSION [(src_auth_tmp)src_auth_tmp.FieldSchema(name:key, type:string, comment:null), ]
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).value SIMPLE [(src_auth_tmp)src_auth_tmp.FieldSchema(name:value, type:string, comment:null), ]
-
-database	default	
-table	authorization_part	
-partition	ds=2010	
-principalName	hive_test_group1	
-principalType	GROUP	
-privilege	Select	
+database	default
+table	authorization_part
+partition	ds=2010
+principalName	hive_test_group1
+principalType	GROUP
+privilege	Select
 #### A masked pattern was here ####
-grantor	hive_test_user	
+grantor	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
@@ -1052,14 +1015,13 @@ POSTHOOK: Lineage: authorization_part PA
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).value SIMPLE [(src_auth_tmp)src_auth_tmp.FieldSchema(name:value, type:string, comment:null), ]
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).key EXPRESSION [(src_auth_tmp)src_auth_tmp.FieldSchema(name:key, type:string, comment:null), ]
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).value SIMPLE [(src_auth_tmp)src_auth_tmp.FieldSchema(name:value, type:string, comment:null), ]
-
-database	default	
-table	authorization_part	
-principalName	hive_test_group1	
-principalType	GROUP	
-privilege	Select	
+database	default
+table	authorization_part
+principalName	hive_test_group1
+principalType	GROUP
+privilege	Select
 #### A masked pattern was here ####
-grantor	hive_test_user	
+grantor	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
@@ -1136,15 +1098,14 @@ POSTHOOK: Lineage: authorization_part PA
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).value SIMPLE [(src_auth_tmp)src_auth_tmp.FieldSchema(name:value, type:string, comment:null), ]
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).key EXPRESSION [(src_auth_tmp)src_auth_tmp.FieldSchema(name:key, type:string, comment:null), ]
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).value SIMPLE [(src_auth_tmp)src_auth_tmp.FieldSchema(name:value, type:string, comment:null), ]
-
-database	default	
-table	authorization_part	
-partition	ds=2010	
-principalName	hive_test_group1	
-principalType	GROUP	
-privilege	Select	
+database	default
+table	authorization_part
+partition	ds=2010
+principalName	hive_test_group1
+principalType	GROUP
+privilege	Select
 #### A masked pattern was here ####
-grantor	hive_test_user	
+grantor	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/tez/ql/src/test/results/clientpositive/authorization_3.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/clientpositive/authorization_3.q.out?rev=1555193&r1=1555192&r2=1555193&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/clientpositive/authorization_3.q.out (original)
+++ hive/branches/tez/ql/src/test/results/clientpositive/authorization_3.q.out Fri Jan  3 18:37:34 2014
@@ -25,22 +25,20 @@ 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
-
-database	default	
-table	src_autho_test	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Drop	
+database	default
+table	src_autho_test
+principalName	hive_test_user
+principalType	USER
+privilege	Drop
 #### A masked pattern was here ####
-grantor	hive_test_user	
-
-database	default	
-table	src_autho_test	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Select	
+grantor	hive_test_user
+database	default
+table	src_autho_test
+principalName	hive_test_user
+principalType	USER
+privilege	Select
 #### A masked pattern was here ####
-grantor	hive_test_user	
+grantor	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
@@ -63,22 +61,20 @@ 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
-
-database	default	
-table	src_autho_test	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Drop	
+database	default
+table	src_autho_test
+principalName	hive_test_user
+principalType	USER
+privilege	Drop
 #### A masked pattern was here ####
-grantor	hive_test_user	
-
-database	default	
-table	src_autho_test	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Select	
+grantor	hive_test_user
+database	default
+table	src_autho_test
+principalName	hive_test_user
+principalType	USER
+privilege	Select
 #### A masked pattern was here ####
-grantor	hive_test_user	
+grantor	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
@@ -95,14 +91,13 @@ 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
-
-database	default	
-table	src_autho_test	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Drop	
+database	default
+table	src_autho_test
+principalName	hive_test_user
+principalType	USER
+privilege	Drop
 #### A masked pattern was here ####
-grantor	hive_test_user	
+grantor	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/tez/ql/src/test/results/clientpositive/authorization_4.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/clientpositive/authorization_4.q.out?rev=1555193&r1=1555192&r2=1555193&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/clientpositive/authorization_4.q.out (original)
+++ hive/branches/tez/ql/src/test/results/clientpositive/authorization_4.q.out Fri Jan  3 18:37:34 2014
@@ -19,14 +19,13 @@ 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
-
-database	default	
-table	src_autho_test	
-principalName	hive_test_user	
-principalType	USER	
-privilege	All	
+database	default
+table	src_autho_test
+principalName	hive_test_user
+principalType	USER
+privilege	All
 #### A masked pattern was here ####
-grantor	hive_test_user	
+grantor	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/tez/ql/src/test/results/clientpositive/authorization_5.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/clientpositive/authorization_5.q.out?rev=1555193&r1=1555192&r2=1555193&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/clientpositive/authorization_5.q.out (original)
+++ hive/branches/tez/ql/src/test/results/clientpositive/authorization_5.q.out Fri Jan  3 18:37:34 2014
@@ -24,20 +24,18 @@ 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
-
-database	test_db	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Drop	
+database	test_db
+principalName	hive_test_user
+principalType	USER
+privilege	Drop
 #### A masked pattern was here ####
-grantor	hive_test_user	
-
-database	test_db	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Select	
+grantor	hive_test_user
+database	test_db
+principalName	hive_test_user
+principalType	USER
+privilege	Select
 #### A masked pattern was here ####
-grantor	hive_test_user	
+grantor	hive_test_user
 PREHOOK: query: CREATE ROLE db_test_role
 PREHOOK: type: CREATEROLE
 POSTHOOK: query: CREATE ROLE db_test_role
@@ -50,7 +48,7 @@ PREHOOK: query: SHOW ROLE GRANT USER hiv
 PREHOOK: type: SHOW_ROLE_GRANT
 POSTHOOK: query: SHOW ROLE GRANT USER hive_test_user
 POSTHOOK: type: SHOW_ROLE_GRANT
-role name:db_test_role
+db_test_role
 PREHOOK: query: GRANT drop ON DATABASE test_db TO ROLE db_test_role
 PREHOOK: type: GRANT_PRIVILEGE
 POSTHOOK: query: GRANT drop ON DATABASE test_db TO ROLE db_test_role
@@ -63,20 +61,18 @@ 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
-
-database	test_db	
-principalName	db_test_role	
-principalType	ROLE	
-privilege	Drop	
+database	test_db
+principalName	db_test_role
+principalType	ROLE
+privilege	Drop
 #### A masked pattern was here ####
-grantor	hive_test_user	
-
-database	test_db	
-principalName	db_test_role	
-principalType	ROLE	
-privilege	Select	
+grantor	hive_test_user
+database	test_db
+principalName	db_test_role
+principalType	ROLE
+privilege	Select
 #### A masked pattern was here ####
-grantor	hive_test_user	
+grantor	hive_test_user
 PREHOOK: query: DROP DATABASE IF EXISTS test_db
 PREHOOK: type: DROPDATABASE
 PREHOOK: Input: database:test_db

Modified: hive/branches/tez/ql/src/test/results/clientpositive/authorization_6.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/clientpositive/authorization_6.q.out?rev=1555193&r1=1555192&r2=1555193&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/clientpositive/authorization_6.q.out (original)
+++ hive/branches/tez/ql/src/test/results/clientpositive/authorization_6.q.out Fri Jan  3 18:37:34 2014
@@ -52,30 +52,27 @@ 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
-
-database	default	
-table	authorization_part	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Create	
-#### A masked pattern was here ####
-grantor	hive_test_user	
-
-database	default	
-table	authorization_part	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Drop	
-#### A masked pattern was here ####
-grantor	hive_test_user	
-
-database	default	
-table	authorization_part	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Update	
+database	default
+table	authorization_part
+principalName	hive_test_user
+principalType	USER
+privilege	Create
+#### A masked pattern was here ####
+grantor	hive_test_user
+database	default
+table	authorization_part
+principalName	hive_test_user
+principalType	USER
+privilege	Drop
+#### A masked pattern was here ####
+grantor	hive_test_user
+database	default
+table	authorization_part
+principalName	hive_test_user
+principalType	USER
+privilege	Update
 #### A masked pattern was here ####
-grantor	hive_test_user	
+grantor	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
@@ -112,16 +109,15 @@ POSTHOOK: Lineage: authorization_part PA
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).value SIMPLE [(src_auth_tmp)src_auth_tmp.FieldSchema(name:value, type:string, comment:null), ]
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2011).key EXPRESSION [(src_auth_tmp)src_auth_tmp.FieldSchema(name:key, type:string, comment:null), ]
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2011).value SIMPLE [(src_auth_tmp)src_auth_tmp.FieldSchema(name:value, type:string, comment:null), ]
-
-database	default	
-table	authorization_part	
-partition	ds=2010	
-columnName	key	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Select	
+database	default
+table	authorization_part
+partition	ds=2010
+columnName	key
+principalName	hive_test_user
+principalType	USER
+privilege	Select
 #### A masked pattern was here ####
-grantor	hive_test_user	
+grantor	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')
@@ -130,16 +126,15 @@ POSTHOOK: Lineage: authorization_part PA
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).value SIMPLE [(src_auth_tmp)src_auth_tmp.FieldSchema(name:value, type:string, comment:null), ]
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2011).key EXPRESSION [(src_auth_tmp)src_auth_tmp.FieldSchema(name:key, type:string, comment:null), ]
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2011).value SIMPLE [(src_auth_tmp)src_auth_tmp.FieldSchema(name:value, type:string, comment:null), ]
-
-database	default	
-table	authorization_part	
-partition	ds=2011	
-columnName	key	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Select	
+database	default
+table	authorization_part
+partition	ds=2011
+columnName	key
+principalName	hive_test_user
+principalType	USER
+privilege	Select
 #### A masked pattern was here ####
-grantor	hive_test_user	
+grantor	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)
@@ -148,15 +143,14 @@ POSTHOOK: Lineage: authorization_part PA
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).value SIMPLE [(src_auth_tmp)src_auth_tmp.FieldSchema(name:value, type:string, comment:null), ]
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2011).key EXPRESSION [(src_auth_tmp)src_auth_tmp.FieldSchema(name:key, type:string, comment:null), ]
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2011).value SIMPLE [(src_auth_tmp)src_auth_tmp.FieldSchema(name:value, type:string, comment:null), ]
-
-database	default	
-table	authorization_part	
-columnName	key	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Select	
+database	default
+table	authorization_part
+columnName	key
+principalName	hive_test_user
+principalType	USER
+privilege	Select
 #### A masked pattern was here ####
-grantor	hive_test_user	
+grantor	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
@@ -254,22 +248,20 @@ POSTHOOK: Lineage: authorization_part PA
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2010).value SIMPLE [(src_auth_tmp)src_auth_tmp.FieldSchema(name:value, type:string, comment:null), ]
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2011).key EXPRESSION [(src_auth_tmp)src_auth_tmp.FieldSchema(name:key, type:string, comment:null), ]
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2011).value SIMPLE [(src_auth_tmp)src_auth_tmp.FieldSchema(name:value, type:string, comment:null), ]
-
-database	default	
-table	authorization_part	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Create	
-#### A masked pattern was here ####
-grantor	hive_test_user	
-
-database	default	
-table	authorization_part	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Update	
+database	default
+table	authorization_part
+principalName	hive_test_user
+principalType	USER
+privilege	Create
+#### A masked pattern was here ####
+grantor	hive_test_user
+database	default
+table	authorization_part
+principalName	hive_test_user
+principalType	USER
+privilege	Update
 #### A masked pattern was here ####
-grantor	hive_test_user	
+grantor	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
@@ -346,15 +338,14 @@ POSTHOOK: Lineage: authorization_part PA
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2011).value SIMPLE [(src_auth_tmp)src_auth_tmp.FieldSchema(name:value, type:string, comment:null), ]
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2011).key EXPRESSION [(src_auth_tmp)src_auth_tmp.FieldSchema(name:key, type:string, comment:null), ]
 POSTHOOK: Lineage: authorization_part PARTITION(ds=2011).value SIMPLE [(src_auth_tmp)src_auth_tmp.FieldSchema(name:value, type:string, comment:null), ]
-
-database	default	
-table	authorization_part	
-columnName	key	
-principalName	hive_test_user	
-principalType	USER	
-privilege	Select	
+database	default
+table	authorization_part
+columnName	key
+principalName	hive_test_user
+principalType	USER
+privilege	Select
 #### A masked pattern was here ####
-grantor	hive_test_user	
+grantor	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/tez/ql/src/test/results/clientpositive/keyword_1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/clientpositive/keyword_1.q.out?rev=1555193&r1=1555192&r2=1555193&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/clientpositive/keyword_1.q.out (original)
+++ hive/branches/tez/ql/src/test/results/clientpositive/keyword_1.q.out Fri Jan  3 18:37:34 2014
@@ -52,14 +52,13 @@ 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
-
-database	default	
-table	test_user	
-principalName	hive_test	
-principalType	USER	
-privilege	Select	
+database	default
+table	test_user
+principalName	hive_test
+principalType	USER
+privilege	Select
 #### A masked pattern was here ####
-grantor	hive_test_user	
+grantor	hive_test_user
 PREHOOK: query: drop table test_user
 PREHOOK: type: DROPTABLE
 PREHOOK: Input: default@test_user
@@ -118,14 +117,13 @@ 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
-
-database	default	
-table	test_user	
-principalName	hive_test	
-principalType	USER	
-privilege	Select	
+database	default
+table	test_user
+principalName	hive_test
+principalType	USER
+privilege	Select
 #### A masked pattern was here ####
-grantor	hive_test_user	
+grantor	hive_test_user
 PREHOOK: query: drop table test_user
 PREHOOK: type: DROPTABLE
 PREHOOK: Input: default@test_user

Modified: hive/branches/tez/ql/src/test/results/clientpositive/show_tblproperties.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/clientpositive/show_tblproperties.q.out?rev=1555193&r1=1555192&r2=1555193&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/clientpositive/show_tblproperties.q.out (original)
+++ hive/branches/tez/ql/src/test/results/clientpositive/show_tblproperties.q.out Fri Jan  3 18:37:34 2014
@@ -28,7 +28,6 @@ PREHOOK: query: show tblproperties tmpfo
 PREHOOK: type: SHOW_TBLPROPERTIES
 POSTHOOK: query: show tblproperties tmpfoo
 POSTHOOK: type: SHOW_TBLPROPERTIES
-	 
 numFiles	0
 #### A masked pattern was here ####
 tmp	true

Modified: hive/branches/tez/ql/src/test/results/clientpositive/unset_table_view_property.q.out
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/test/results/clientpositive/unset_table_view_property.q.out?rev=1555193&r1=1555192&r2=1555193&view=diff
==============================================================================
--- hive/branches/tez/ql/src/test/results/clientpositive/unset_table_view_property.q.out (original)
+++ hive/branches/tez/ql/src/test/results/clientpositive/unset_table_view_property.q.out Fri Jan  3 18:37:34 2014
@@ -7,7 +7,6 @@ PREHOOK: query: SHOW TBLPROPERTIES testT
 PREHOOK: type: SHOW_TBLPROPERTIES
 POSTHOOK: query: SHOW TBLPROPERTIES testTable
 POSTHOOK: type: SHOW_TBLPROPERTIES
-	 
 #### A masked pattern was here ####
 PREHOOK: query: -- UNSET TABLE PROPERTIES
 ALTER TABLE testTable SET TBLPROPERTIES ('a'='1', 'c'='3')
@@ -23,7 +22,6 @@ PREHOOK: query: SHOW TBLPROPERTIES testT
 PREHOOK: type: SHOW_TBLPROPERTIES
 POSTHOOK: query: SHOW TBLPROPERTIES testTable
 POSTHOOK: type: SHOW_TBLPROPERTIES
-	 
 numFiles	0
 #### A masked pattern was here ####
 c	3
@@ -48,7 +46,6 @@ PREHOOK: query: SHOW TBLPROPERTIES testT
 PREHOOK: type: SHOW_TBLPROPERTIES
 POSTHOOK: query: SHOW TBLPROPERTIES testTable
 POSTHOOK: type: SHOW_TBLPROPERTIES
-	 
 numFiles	0
 #### A masked pattern was here ####
 COLUMN_STATS_ACCURATE	false
@@ -68,7 +65,6 @@ PREHOOK: query: SHOW TBLPROPERTIES testT
 PREHOOK: type: SHOW_TBLPROPERTIES
 POSTHOOK: query: SHOW TBLPROPERTIES testTable
 POSTHOOK: type: SHOW_TBLPROPERTIES
-	 
 d	4
 numFiles	0
 #### A masked pattern was here ####
@@ -94,7 +90,6 @@ PREHOOK: query: SHOW TBLPROPERTIES testT
 PREHOOK: type: SHOW_TBLPROPERTIES
 POSTHOOK: query: SHOW TBLPROPERTIES testTable
 POSTHOOK: type: SHOW_TBLPROPERTIES
-	 
 numFiles	0
 #### A masked pattern was here ####
 c	3
@@ -118,7 +113,6 @@ PREHOOK: query: SHOW TBLPROPERTIES testT
 PREHOOK: type: SHOW_TBLPROPERTIES
 POSTHOOK: query: SHOW TBLPROPERTIES testTable
 POSTHOOK: type: SHOW_TBLPROPERTIES
-	 
 numFiles	0
 #### A masked pattern was here ####
 COLUMN_STATS_ACCURATE	false
@@ -138,7 +132,6 @@ PREHOOK: query: SHOW TBLPROPERTIES testT
 PREHOOK: type: SHOW_TBLPROPERTIES
 POSTHOOK: query: SHOW TBLPROPERTIES testTable
 POSTHOOK: type: SHOW_TBLPROPERTIES
-	 
 d	4
 numFiles	0
 #### A masked pattern was here ####
@@ -165,7 +158,6 @@ PREHOOK: query: SHOW TBLPROPERTIES testT
 PREHOOK: type: SHOW_TBLPROPERTIES
 POSTHOOK: query: SHOW TBLPROPERTIES testTable
 POSTHOOK: type: SHOW_TBLPROPERTIES
-	 
 numFiles	0
 #### A masked pattern was here ####
 c	3
@@ -190,7 +182,6 @@ PREHOOK: query: SHOW TBLPROPERTIES testT
 PREHOOK: type: SHOW_TBLPROPERTIES
 POSTHOOK: query: SHOW TBLPROPERTIES testTable
 POSTHOOK: type: SHOW_TBLPROPERTIES
-	 
 numFiles	0
 #### A masked pattern was here ####
 a	1
@@ -218,7 +209,6 @@ PREHOOK: query: SHOW TBLPROPERTIES testV
 PREHOOK: type: SHOW_TBLPROPERTIES
 POSTHOOK: query: SHOW TBLPROPERTIES testView
 POSTHOOK: type: SHOW_TBLPROPERTIES
-	 
 #### A masked pattern was here ####
 propA	100
 propB	200
@@ -237,7 +227,6 @@ PREHOOK: query: SHOW TBLPROPERTIES testV
 PREHOOK: type: SHOW_TBLPROPERTIES
 POSTHOOK: query: SHOW TBLPROPERTIES testView
 POSTHOOK: type: SHOW_TBLPROPERTIES
-	 
 #### A masked pattern was here ####
 PREHOOK: query: ALTER VIEW testView SET TBLPROPERTIES ('propA'='100', 'propC'='300', 'propD'='400')
 PREHOOK: type: ALTERVIEW_PROPERTIES
@@ -251,7 +240,6 @@ PREHOOK: query: SHOW TBLPROPERTIES testV
 PREHOOK: type: SHOW_TBLPROPERTIES
 POSTHOOK: query: SHOW TBLPROPERTIES testView
 POSTHOOK: type: SHOW_TBLPROPERTIES
-	 
 #### A masked pattern was here ####
 propA	100
 #### A masked pattern was here ####
@@ -271,7 +259,6 @@ PREHOOK: query: SHOW TBLPROPERTIES testV
 PREHOOK: type: SHOW_TBLPROPERTIES
 POSTHOOK: query: SHOW TBLPROPERTIES testView
 POSTHOOK: type: SHOW_TBLPROPERTIES
-	 
 #### A masked pattern was here ####
 propD	400
 PREHOOK: query: -- the same property being UNSET multiple times
@@ -288,7 +275,6 @@ PREHOOK: query: SHOW TBLPROPERTIES testV
 PREHOOK: type: SHOW_TBLPROPERTIES
 POSTHOOK: query: SHOW TBLPROPERTIES testView
 POSTHOOK: type: SHOW_TBLPROPERTIES
-	 
 #### A masked pattern was here ####
 PREHOOK: query: ALTER VIEW testView SET TBLPROPERTIES ('propA'='100', 'propB' = '200', 'propC'='300', 'propD'='400')
 PREHOOK: type: ALTERVIEW_PROPERTIES
@@ -302,7 +288,6 @@ PREHOOK: query: SHOW TBLPROPERTIES testV
 PREHOOK: type: SHOW_TBLPROPERTIES
 POSTHOOK: query: SHOW TBLPROPERTIES testView
 POSTHOOK: type: SHOW_TBLPROPERTIES
-	 
 #### A masked pattern was here ####
 propA	100
 propB	200
@@ -323,7 +308,6 @@ PREHOOK: query: SHOW TBLPROPERTIES testV
 PREHOOK: type: SHOW_TBLPROPERTIES
 POSTHOOK: query: SHOW TBLPROPERTIES testView
 POSTHOOK: type: SHOW_TBLPROPERTIES
-	 
 #### A masked pattern was here ####
 propA	100
 propB	200
@@ -342,7 +326,6 @@ PREHOOK: query: SHOW TBLPROPERTIES testV
 PREHOOK: type: SHOW_TBLPROPERTIES
 POSTHOOK: query: SHOW TBLPROPERTIES testView
 POSTHOOK: type: SHOW_TBLPROPERTIES
-	 
 #### A masked pattern was here ####
 propA	100
 #### A masked pattern was here ####

Modified: hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/SerDeUtils.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/SerDeUtils.java?rev=1555193&r1=1555192&r2=1555193&view=diff
==============================================================================
--- hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/SerDeUtils.java (original)
+++ hive/branches/tez/serde/src/java/org/apache/hadoop/hive/serde2/SerDeUtils.java Fri Jan  3 18:37:34 2014
@@ -198,11 +198,15 @@ public final class SerDeUtils {
    *
    * This method is kept consistent with {@link HiveResultSetMetaData#hiveTypeToSqlType}.
    */
-  public static Object toThriftPayload(Object val, ObjectInspector valOI) {
+  public static Object toThriftPayload(Object val, ObjectInspector valOI, int version) {
     if (valOI.getCategory() == ObjectInspector.Category.PRIMITIVE) {
+      if (val == null) {
+        return null;
+      }
       Object obj = ObjectInspectorUtils.copyToStandardObject(val, valOI,
           ObjectInspectorUtils.ObjectInspectorCopyOption.JAVA);
-      if (((PrimitiveObjectInspector)valOI).getPrimitiveCategory() ==
+      // uses string type for binary before HIVE_CLI_SERVICE_PROTOCOL_V6
+      if (version < 5 && ((PrimitiveObjectInspector)valOI).getPrimitiveCategory() ==
           PrimitiveObjectInspector.PrimitiveCategory.BINARY) {
         // todo HIVE-5269
         return new String((byte[])obj);

Modified: hive/branches/tez/service/if/TCLIService.thrift
URL: http://svn.apache.org/viewvc/hive/branches/tez/service/if/TCLIService.thrift?rev=1555193&r1=1555192&r2=1555193&view=diff
==============================================================================
--- hive/branches/tez/service/if/TCLIService.thrift (original)
+++ hive/branches/tez/service/if/TCLIService.thrift Fri Jan  3 18:37:34 2014
@@ -51,6 +51,9 @@ enum TProtocolVersion {
 
   // V5 adds error details when GetOperationStatus returns in error state
   HIVE_CLI_SERVICE_PROTOCOL_V5
+
+  // V6 uses binary type for binary payload (was string) and uses columnar result set
+  HIVE_CLI_SERVICE_PROTOCOL_V6
 }
 
 enum TTypeId {
@@ -88,9 +91,9 @@ const set<TTypeId> PRIMITIVE_TYPES = [
   TTypeId.TIMESTAMP_TYPE,
   TTypeId.BINARY_TYPE,
   TTypeId.DECIMAL_TYPE,
-  TTypeId.NULL_TYPE
-  TTypeId.DATE_TYPE
-  TTypeId.VARCHAR_TYPE
+  TTypeId.NULL_TYPE,
+  TTypeId.DATE_TYPE,
+  TTypeId.VARCHAR_TYPE,
   TTypeId.CHAR_TYPE
 ]
 
@@ -335,6 +338,62 @@ struct TRow {
   1: required list<TColumnValue> colVals
 }
 
+struct TBoolColumn {
+  1: required list<bool> values
+  2: required binary nulls
+}
+
+struct TByteColumn {
+  1: required list<byte> values
+  2: required binary nulls
+}
+
+struct TI16Column {
+  1: required list<i16> values
+  2: required binary nulls
+}
+
+struct TI32Column {
+  1: required list<i32> values
+  2: required binary nulls
+}
+
+struct TI64Column {
+  1: required list<i64> values
+  2: required binary nulls
+}
+
+struct TDoubleColumn {
+  1: required list<double> values
+  2: required binary nulls
+}
+
+struct TStringColumn {
+  1: required list<string> values
+  2: required binary nulls
+}
+
+struct TBinaryColumn {
+  1: required list<binary> values
+  2: required binary nulls
+}
+
+// Note that Hive's type system is richer than Thrift's,
+// so in some cases we have to map multiple Hive types
+// to the same Thrift type. On the client-side this is
+// disambiguated by looking at the Schema of the
+// result set.
+union TColumn {
+  1: TBoolColumn   boolVal      // BOOLEAN
+  2: TByteColumn   byteVal      // TINYINT
+  3: TI16Column    i16Val       // SMALLINT
+  4: TI32Column    i32Val       // INT
+  5: TI64Column    i64Val       // BIGINT, TIMESTAMP
+  6: TDoubleColumn doubleVal    // FLOAT, DOUBLE
+  7: TStringColumn stringVal    // STRING, LIST, MAP, STRUCT, UNIONTYPE, DECIMAL, NULL
+  8: TBinaryColumn binaryVal    // BINARY
+}
+
 // Represents a rowset
 struct TRowSet {
   // The starting row offset of this rowset.
@@ -490,7 +549,7 @@ struct TOperationHandle {
 // which operations may be executed.
 struct TOpenSessionReq {
   // The version of the HiveServer2 protocol that the client is using.
-  1: required TProtocolVersion client_protocol = TProtocolVersion.HIVE_CLI_SERVICE_PROTOCOL_V5
+  1: required TProtocolVersion client_protocol = TProtocolVersion.HIVE_CLI_SERVICE_PROTOCOL_V6
 
   // Username and password for authentication.
   // Depending on the authentication scheme being used,
@@ -509,7 +568,7 @@ struct TOpenSessionResp {
   1: required TStatus status
 
   // The protocol version that the server is using.
-  2: required TProtocolVersion serverProtocolVersion = TProtocolVersion.HIVE_CLI_SERVICE_PROTOCOL_V5
+  2: required TProtocolVersion serverProtocolVersion = TProtocolVersion.HIVE_CLI_SERVICE_PROTOCOL_V6
 
   // Session Handle
   3: optional TSessionHandle sessionHandle