You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by gu...@apache.org on 2014/08/05 09:23:07 UTC
svn commit: r1615872 [12/12] - in /hive/branches/cbo: ./ bin/ common/
common/src/java/org/apache/hadoop/hive/conf/ conf/
contrib/src/java/org/apache/hadoop/hive/contrib/metastore/hooks/
contrib/src/test/queries/clientnegative/ contrib/src/test/queries/...
Modified: hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_priv_current_role_neg.q
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_priv_current_role_neg.q?rev=1615872&r1=1615871&r2=1615872&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_priv_current_role_neg.q (original)
+++ hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_priv_current_role_neg.q Tue Aug 5 07:23:02 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
set user.name=hive_admin_user;
Modified: hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_role_cycles1.q
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_role_cycles1.q?rev=1615872&r1=1615871&r2=1615872&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_role_cycles1.q (original)
+++ hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_role_cycles1.q Tue Aug 5 07:23:02 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
set user.name=hive_admin_user;
Modified: hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_role_cycles2.q
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_role_cycles2.q?rev=1615872&r1=1615871&r2=1615872&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_role_cycles2.q (original)
+++ hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_role_cycles2.q Tue Aug 5 07:23:02 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
Modified: hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_role_grant.q
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_role_grant.q?rev=1615872&r1=1615871&r2=1615872&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_role_grant.q (original)
+++ hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_role_grant.q Tue Aug 5 07:23:02 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
set user.name=hive_admin_user;
Modified: hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_role_grant2.q
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_role_grant2.q?rev=1615872&r1=1615871&r2=1615872&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_role_grant2.q (original)
+++ hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_role_grant2.q Tue Aug 5 07:23:02 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
set user.name=hive_admin_user;
Modified: hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_role_grant_nosuchrole.q
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_role_grant_nosuchrole.q?rev=1615872&r1=1615871&r2=1615872&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_role_grant_nosuchrole.q (original)
+++ hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_role_grant_nosuchrole.q Tue Aug 5 07:23:02 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
set user.name=hive_admin_user;
Modified: hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_role_grant_otherrole.q
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_role_grant_otherrole.q?rev=1615872&r1=1615871&r2=1615872&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_role_grant_otherrole.q (original)
+++ hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_role_grant_otherrole.q Tue Aug 5 07:23:02 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
Modified: hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_role_grant_otheruser.q
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_role_grant_otheruser.q?rev=1615872&r1=1615871&r2=1615872&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_role_grant_otheruser.q (original)
+++ hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_role_grant_otheruser.q Tue Aug 5 07:23:02 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
Modified: hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_rolehierarchy_privs.q
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_rolehierarchy_privs.q?rev=1615872&r1=1615871&r2=1615872&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_rolehierarchy_privs.q (original)
+++ hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_rolehierarchy_privs.q Tue Aug 5 07:23:02 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
set hive.security.authorization.enabled=true;
Modified: hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_set_role_neg2.q
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_set_role_neg2.q?rev=1615872&r1=1615871&r2=1615872&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_set_role_neg2.q (original)
+++ hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_set_role_neg2.q Tue Aug 5 07:23:02 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
set user.name=hive_admin_user;
Modified: hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_show_grant_otherrole.q
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_show_grant_otherrole.q?rev=1615872&r1=1615871&r2=1615872&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_show_grant_otherrole.q (original)
+++ hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_show_grant_otherrole.q Tue Aug 5 07:23:02 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
set hive.security.authorization.enabled=true;
Modified: hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_show_grant_otheruser_all.q
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_show_grant_otheruser_all.q?rev=1615872&r1=1615871&r2=1615872&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_show_grant_otheruser_all.q (original)
+++ hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_show_grant_otheruser_all.q Tue Aug 5 07:23:02 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
set hive.security.authorization.enabled=true;
Modified: hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_show_grant_otheruser_alltabs.q
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_show_grant_otheruser_alltabs.q?rev=1615872&r1=1615871&r2=1615872&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_show_grant_otheruser_alltabs.q (original)
+++ hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_show_grant_otheruser_alltabs.q Tue Aug 5 07:23:02 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
set hive.security.authorization.enabled=true;
Modified: hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_show_grant_otheruser_wtab.q
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_show_grant_otheruser_wtab.q?rev=1615872&r1=1615871&r2=1615872&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_show_grant_otheruser_wtab.q (original)
+++ hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_show_grant_otheruser_wtab.q Tue Aug 5 07:23:02 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
set hive.security.authorization.enabled=true;
Modified: hive/branches/cbo/ql/src/test/queries/clientpositive/authorization_1_sql_std.q
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/queries/clientpositive/authorization_1_sql_std.q?rev=1615872&r1=1615871&r2=1615872&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/queries/clientpositive/authorization_1_sql_std.q (original)
+++ hive/branches/cbo/ql/src/test/queries/clientpositive/authorization_1_sql_std.q Tue Aug 5 07:23:02 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
set user.name=hive_admin_user;
Modified: hive/branches/cbo/ql/src/test/queries/clientpositive/authorization_admin_almighty1.q
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/queries/clientpositive/authorization_admin_almighty1.q?rev=1615872&r1=1615871&r2=1615872&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/queries/clientpositive/authorization_admin_almighty1.q (original)
+++ hive/branches/cbo/ql/src/test/queries/clientpositive/authorization_admin_almighty1.q Tue Aug 5 07:23:02 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
set user.name=hive_test_user;
Modified: hive/branches/cbo/ql/src/test/queries/clientpositive/authorization_admin_almighty2.q
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/queries/clientpositive/authorization_admin_almighty2.q?rev=1615872&r1=1615871&r2=1615872&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/queries/clientpositive/authorization_admin_almighty2.q (original)
+++ hive/branches/cbo/ql/src/test/queries/clientpositive/authorization_admin_almighty2.q Tue Aug 5 07:23:02 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactory;
set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
set user.name=hive_admin_user;
Modified: hive/branches/cbo/ql/src/test/queries/clientpositive/authorization_create_func1.q
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/queries/clientpositive/authorization_create_func1.q?rev=1615872&r1=1615871&r2=1615872&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/queries/clientpositive/authorization_create_func1.q (original)
+++ hive/branches/cbo/ql/src/test/queries/clientpositive/authorization_create_func1.q Tue Aug 5 07:23:02 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
set hive.security.authorization.enabled=true;
Modified: hive/branches/cbo/ql/src/test/queries/clientpositive/authorization_create_macro1.q
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/queries/clientpositive/authorization_create_macro1.q?rev=1615872&r1=1615871&r2=1615872&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/queries/clientpositive/authorization_create_macro1.q (original)
+++ hive/branches/cbo/ql/src/test/queries/clientpositive/authorization_create_macro1.q Tue Aug 5 07:23:02 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
set hive.security.authorization.enabled=true;
Modified: hive/branches/cbo/ql/src/test/queries/clientpositive/authorization_insert.q
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/queries/clientpositive/authorization_insert.q?rev=1615872&r1=1615871&r2=1615872&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/queries/clientpositive/authorization_insert.q (original)
+++ hive/branches/cbo/ql/src/test/queries/clientpositive/authorization_insert.q Tue Aug 5 07:23:02 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
Modified: hive/branches/cbo/ql/src/test/queries/clientpositive/authorization_owner_actions_db.q
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/queries/clientpositive/authorization_owner_actions_db.q?rev=1615872&r1=1615871&r2=1615872&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/queries/clientpositive/authorization_owner_actions_db.q (original)
+++ hive/branches/cbo/ql/src/test/queries/clientpositive/authorization_owner_actions_db.q Tue Aug 5 07:23:02 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
set hive.security.authorization.enabled=true;
Modified: hive/branches/cbo/ql/src/test/queries/clientpositive/authorization_role_grant1.q
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/queries/clientpositive/authorization_role_grant1.q?rev=1615872&r1=1615871&r2=1615872&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/queries/clientpositive/authorization_role_grant1.q (original)
+++ hive/branches/cbo/ql/src/test/queries/clientpositive/authorization_role_grant1.q Tue Aug 5 07:23:02 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
set user.name=hive_admin_user;
Modified: hive/branches/cbo/ql/src/test/queries/clientpositive/authorization_role_grant2.q
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/queries/clientpositive/authorization_role_grant2.q?rev=1615872&r1=1615871&r2=1615872&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/queries/clientpositive/authorization_role_grant2.q (original)
+++ hive/branches/cbo/ql/src/test/queries/clientpositive/authorization_role_grant2.q Tue Aug 5 07:23:02 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
Modified: hive/branches/cbo/ql/src/test/queries/clientpositive/authorization_set_show_current_role.q
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/queries/clientpositive/authorization_set_show_current_role.q?rev=1615872&r1=1615871&r2=1615872&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/queries/clientpositive/authorization_set_show_current_role.q (original)
+++ hive/branches/cbo/ql/src/test/queries/clientpositive/authorization_set_show_current_role.q Tue Aug 5 07:23:02 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
set user.name=hive_admin_user;
Modified: hive/branches/cbo/ql/src/test/queries/clientpositive/authorization_show_grant.q
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/queries/clientpositive/authorization_show_grant.q?rev=1615872&r1=1615871&r2=1615872&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/queries/clientpositive/authorization_show_grant.q (original)
+++ hive/branches/cbo/ql/src/test/queries/clientpositive/authorization_show_grant.q Tue Aug 5 07:23:02 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
set hive.security.authorization.enabled=true;
Modified: hive/branches/cbo/ql/src/test/queries/clientpositive/authorization_view_sqlstd.q
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/queries/clientpositive/authorization_view_sqlstd.q?rev=1615872&r1=1615871&r2=1615872&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/queries/clientpositive/authorization_view_sqlstd.q (original)
+++ hive/branches/cbo/ql/src/test/queries/clientpositive/authorization_view_sqlstd.q Tue Aug 5 07:23:02 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
set hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
set hive.security.authorization.enabled=true;
Modified: hive/branches/cbo/ql/src/test/results/clientnegative/authorization_public_drop.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientnegative/authorization_public_drop.q.out?rev=1615872&r1=1615871&r2=1615872&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientnegative/authorization_public_drop.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientnegative/authorization_public_drop.q.out Tue Aug 5 07:23:02 2014
@@ -1,3 +1,3 @@
PREHOOK: query: drop role PUBLIC
PREHOOK: type: DROPROLE
-FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. org.apache.hadoop.hive.ql.metadata.HiveException: MetaException(message:public/admin role can't be dropped.)
+FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. org.apache.hadoop.hive.ql.metadata.HiveException: MetaException(message:public,admin roles can't be dropped.)
Modified: hive/branches/cbo/ql/src/test/results/clientnegative/authorization_role_cycles1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientnegative/authorization_role_cycles1.q.out?rev=1615872&r1=1615871&r2=1615872&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientnegative/authorization_role_cycles1.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientnegative/authorization_role_cycles1.q.out Tue Aug 5 07:23:02 2014
@@ -19,4 +19,4 @@ POSTHOOK: type: GRANT_ROLE
PREHOOK: query: -- this will create a cycle
grant role role2 to role role1
PREHOOK: type: GRANT_ROLE
-FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. Cannot grant role role1 to role2 as role2 already belongs to the role role1. (no cycles allowed)
+FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. Error granting role: Cannot grant role role1 to role2 as role2 already belongs to the role role1. (no cycles allowed)
Modified: hive/branches/cbo/ql/src/test/results/clientnegative/authorization_role_cycles2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientnegative/authorization_role_cycles2.q.out?rev=1615872&r1=1615871&r2=1615872&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientnegative/authorization_role_cycles2.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientnegative/authorization_role_cycles2.q.out Tue Aug 5 07:23:02 2014
@@ -45,4 +45,4 @@ POSTHOOK: type: GRANT_ROLE
PREHOOK: query: -- this will create a cycle in middle of the hierarchy
grant role role2 to role role4
PREHOOK: type: GRANT_ROLE
-FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. Cannot grant role role4 to role2 as role2 already belongs to the role role4. (no cycles allowed)
+FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. Error granting role: Cannot grant role role4 to role2 as role2 already belongs to the role role4. (no cycles allowed)
Modified: hive/branches/cbo/ql/src/test/results/clientpositive/annotate_stats_part.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/annotate_stats_part.q.out?rev=1615872&r1=1615871&r2=1615872&view=diff
==============================================================================
Files hive/branches/cbo/ql/src/test/results/clientpositive/annotate_stats_part.q.out (original) and hive/branches/cbo/ql/src/test/results/clientpositive/annotate_stats_part.q.out Tue Aug 5 07:23:02 2014 differ
Modified: hive/branches/cbo/ql/src/test/results/clientpositive/infer_bucket_sort_dyn_part.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/infer_bucket_sort_dyn_part.q.out?rev=1615872&r1=1615871&r2=1615872&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/infer_bucket_sort_dyn_part.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/infer_bucket_sort_dyn_part.q.out Tue Aug 5 07:23:02 2014
@@ -563,10 +563,14 @@ STAGE PLANS:
Stats-Aggr Operator
Stage: Stage-4
- Block level merge
+ Merge Work
+ merge level: block
+ input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
Stage: Stage-6
- Block level merge
+ Merge Work
+ merge level: block
+ input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
Stage: Stage-7
Move Operator
Modified: hive/branches/cbo/ql/src/test/results/clientpositive/list_bucket_dml_10.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/list_bucket_dml_10.q.out?rev=1615872&r1=1615871&r2=1615872&view=diff
==============================================================================
Files hive/branches/cbo/ql/src/test/results/clientpositive/list_bucket_dml_10.q.out (original) and hive/branches/cbo/ql/src/test/results/clientpositive/list_bucket_dml_10.q.out Tue Aug 5 07:23:02 2014 differ
Modified: hive/branches/cbo/ql/src/test/results/clientpositive/list_bucket_dml_4.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/list_bucket_dml_4.q.out?rev=1615872&r1=1615871&r2=1615872&view=diff
==============================================================================
Files hive/branches/cbo/ql/src/test/results/clientpositive/list_bucket_dml_4.q.out (original) and hive/branches/cbo/ql/src/test/results/clientpositive/list_bucket_dml_4.q.out Tue Aug 5 07:23:02 2014 differ
Modified: hive/branches/cbo/ql/src/test/results/clientpositive/list_bucket_dml_6.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/list_bucket_dml_6.q.out?rev=1615872&r1=1615871&r2=1615872&view=diff
==============================================================================
Files hive/branches/cbo/ql/src/test/results/clientpositive/list_bucket_dml_6.q.out (original) and hive/branches/cbo/ql/src/test/results/clientpositive/list_bucket_dml_6.q.out Tue Aug 5 07:23:02 2014 differ
Modified: hive/branches/cbo/ql/src/test/results/clientpositive/list_bucket_dml_7.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/list_bucket_dml_7.q.out?rev=1615872&r1=1615871&r2=1615872&view=diff
==============================================================================
Files hive/branches/cbo/ql/src/test/results/clientpositive/list_bucket_dml_7.q.out (original) and hive/branches/cbo/ql/src/test/results/clientpositive/list_bucket_dml_7.q.out Tue Aug 5 07:23:02 2014 differ
Modified: hive/branches/cbo/ql/src/test/results/clientpositive/list_bucket_dml_9.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/list_bucket_dml_9.q.out?rev=1615872&r1=1615871&r2=1615872&view=diff
==============================================================================
Files hive/branches/cbo/ql/src/test/results/clientpositive/list_bucket_dml_9.q.out (original) and hive/branches/cbo/ql/src/test/results/clientpositive/list_bucket_dml_9.q.out Tue Aug 5 07:23:02 2014 differ
Modified: hive/branches/cbo/ql/src/test/results/clientpositive/merge_dynamic_partition4.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/merge_dynamic_partition4.q.out?rev=1615872&r1=1615871&r2=1615872&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/merge_dynamic_partition4.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/merge_dynamic_partition4.q.out Tue Aug 5 07:23:02 2014
@@ -199,10 +199,14 @@ STAGE PLANS:
Stats-Aggr Operator
Stage: Stage-3
- Block level merge
+ Merge Work
+ merge level: block
+ input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
Stage: Stage-5
- Block level merge
+ Merge Work
+ merge level: block
+ input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
Stage: Stage-6
Move Operator
Modified: hive/branches/cbo/ql/src/test/results/clientpositive/merge_dynamic_partition5.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/merge_dynamic_partition5.q.out?rev=1615872&r1=1615871&r2=1615872&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/merge_dynamic_partition5.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/merge_dynamic_partition5.q.out Tue Aug 5 07:23:02 2014
@@ -173,10 +173,14 @@ STAGE PLANS:
Stats-Aggr Operator
Stage: Stage-3
- Block level merge
+ Merge Work
+ merge level: block
+ input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
Stage: Stage-5
- Block level merge
+ Merge Work
+ merge level: block
+ input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
Stage: Stage-6
Move Operator
Modified: hive/branches/cbo/ql/src/test/results/clientpositive/orc_createas1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/orc_createas1.q.out?rev=1615872&r1=1615871&r2=1615872&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/orc_createas1.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/orc_createas1.q.out Tue Aug 5 07:23:02 2014
@@ -110,28 +110,14 @@ STAGE PLANS:
Stats-Aggr Operator
Stage: Stage-3
- Map Reduce
- Map Operator Tree:
- TableScan
- File Output Operator
- compressed: false
- table:
- input format: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
- output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
- serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
- name: default.orc_createas1b
+ Merge Work
+ merge level: stripe
+ input format: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
Stage: Stage-5
- Map Reduce
- Map Operator Tree:
- TableScan
- File Output Operator
- compressed: false
- table:
- input format: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
- output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
- serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
- name: default.orc_createas1b
+ Merge Work
+ merge level: stripe
+ input format: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
Stage: Stage-6
Move Operator
@@ -280,28 +266,14 @@ STAGE PLANS:
Stats-Aggr Operator
Stage: Stage-3
- Map Reduce
- Map Operator Tree:
- TableScan
- File Output Operator
- compressed: false
- table:
- input format: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
- output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
- serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
- name: default.orc_createas1c
+ Merge Work
+ merge level: stripe
+ input format: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
Stage: Stage-5
- Map Reduce
- Map Operator Tree:
- TableScan
- File Output Operator
- compressed: false
- table:
- input format: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
- output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
- serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
- name: default.orc_createas1c
+ Merge Work
+ merge level: stripe
+ input format: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
Stage: Stage-6
Move Operator
Modified: hive/branches/cbo/ql/src/test/results/clientpositive/rcfile_createas1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/rcfile_createas1.q.out?rev=1615872&r1=1615871&r2=1615872&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/rcfile_createas1.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/rcfile_createas1.q.out Tue Aug 5 07:23:02 2014
@@ -110,10 +110,14 @@ STAGE PLANS:
Stats-Aggr Operator
Stage: Stage-3
- Block level merge
+ Merge Work
+ merge level: block
+ input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
Stage: Stage-5
- Block level merge
+ Merge Work
+ merge level: block
+ input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
Stage: Stage-6
Move Operator
Modified: hive/branches/cbo/ql/src/test/results/clientpositive/rcfile_merge1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/rcfile_merge1.q.out?rev=1615872&r1=1615871&r2=1615872&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/rcfile_merge1.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/rcfile_merge1.q.out Tue Aug 5 07:23:02 2014
@@ -495,10 +495,14 @@ STAGE PLANS:
Stats-Aggr Operator
Stage: Stage-3
- Block level merge
+ Merge Work
+ merge level: block
+ input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
Stage: Stage-5
- Block level merge
+ Merge Work
+ merge level: block
+ input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
Stage: Stage-6
Move Operator
Modified: hive/branches/cbo/ql/src/test/results/clientpositive/rcfile_merge2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/rcfile_merge2.q.out?rev=1615872&r1=1615871&r2=1615872&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/rcfile_merge2.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/rcfile_merge2.q.out Tue Aug 5 07:23:02 2014
@@ -80,10 +80,14 @@ STAGE PLANS:
Stats-Aggr Operator
Stage: Stage-3
- Block level merge
+ Merge Work
+ merge level: block
+ input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
Stage: Stage-5
- Block level merge
+ Merge Work
+ merge level: block
+ input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
Stage: Stage-6
Move Operator
Modified: hive/branches/cbo/ql/src/test/results/clientpositive/rcfile_merge3.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/rcfile_merge3.q.out?rev=1615872&r1=1615871&r2=1615872&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/rcfile_merge3.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/rcfile_merge3.q.out Tue Aug 5 07:23:02 2014
@@ -105,10 +105,14 @@ STAGE PLANS:
Stats-Aggr Operator
Stage: Stage-3
- Block level merge
+ Merge Work
+ merge level: block
+ input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
Stage: Stage-5
- Block level merge
+ Merge Work
+ merge level: block
+ input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
Stage: Stage-6
Move Operator
Modified: hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_10.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_10.q.out?rev=1615872&r1=1615871&r2=1615872&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_10.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_10.q.out Tue Aug 5 07:23:02 2014
@@ -186,10 +186,14 @@ STAGE PLANS:
name: default.outputtbl1
Stage: Stage-3
- Block level merge
+ Merge Work
+ merge level: block
+ input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
Stage: Stage-5
- Block level merge
+ Merge Work
+ merge level: block
+ input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
Stage: Stage-6
Move Operator
Modified: hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_11.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_11.q.out?rev=1615872&r1=1615871&r2=1615872&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_11.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_11.q.out Tue Aug 5 07:23:02 2014
@@ -183,10 +183,14 @@ STAGE PLANS:
name: default.outputtbl1
Stage: Stage-2
- Block level merge
+ Merge Work
+ merge level: block
+ input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
Stage: Stage-4
- Block level merge
+ Merge Work
+ merge level: block
+ input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
Stage: Stage-5
Move Operator
Modified: hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_12.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_12.q.out?rev=1615872&r1=1615871&r2=1615872&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_12.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_12.q.out Tue Aug 5 07:23:02 2014
@@ -117,10 +117,14 @@ STAGE PLANS:
name: default.outputtbl1
Stage: Stage-2
- Block level merge
+ Merge Work
+ merge level: block
+ input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
Stage: Stage-4
- Block level merge
+ Merge Work
+ merge level: block
+ input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
Stage: Stage-5
Move Operator
Modified: hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_13.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_13.q.out?rev=1615872&r1=1615871&r2=1615872&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_13.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_13.q.out Tue Aug 5 07:23:02 2014
@@ -140,10 +140,14 @@ STAGE PLANS:
name: default.outputtbl1
Stage: Stage-2
- Block level merge
+ Merge Work
+ merge level: block
+ input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
Stage: Stage-4
- Block level merge
+ Merge Work
+ merge level: block
+ input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
Stage: Stage-5
Move Operator
Modified: hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_14.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_14.q.out?rev=1615872&r1=1615871&r2=1615872&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_14.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_14.q.out Tue Aug 5 07:23:02 2014
@@ -119,10 +119,14 @@ STAGE PLANS:
name: default.outputtbl1
Stage: Stage-2
- Block level merge
+ Merge Work
+ merge level: block
+ input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
Stage: Stage-4
- Block level merge
+ Merge Work
+ merge level: block
+ input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
Stage: Stage-5
Move Operator
Modified: hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_16.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_16.q.out?rev=1615872&r1=1615871&r2=1615872&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_16.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_16.q.out Tue Aug 5 07:23:02 2014
@@ -137,10 +137,14 @@ STAGE PLANS:
name: default.outputtbl1
Stage: Stage-2
- Block level merge
+ Merge Work
+ merge level: block
+ input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
Stage: Stage-4
- Block level merge
+ Merge Work
+ merge level: block
+ input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
Stage: Stage-5
Move Operator
Modified: hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_9.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_9.q.out?rev=1615872&r1=1615871&r2=1615872&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_9.q.out (original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/union_remove_9.q.out Tue Aug 5 07:23:02 2014
@@ -147,10 +147,14 @@ STAGE PLANS:
name: default.outputtbl1
Stage: Stage-2
- Block level merge
+ Merge Work
+ merge level: block
+ input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
Stage: Stage-4
- Block level merge
+ Merge Work
+ merge level: block
+ input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
Stage: Stage-5
Move Operator
Modified: hive/branches/cbo/service/src/java/org/apache/hive/service/cli/CLIService.java
URL: http://svn.apache.org/viewvc/hive/branches/cbo/service/src/java/org/apache/hive/service/cli/CLIService.java?rev=1615872&r1=1615871&r2=1615872&view=diff
==============================================================================
--- hive/branches/cbo/service/src/java/org/apache/hive/service/cli/CLIService.java (original)
+++ hive/branches/cbo/service/src/java/org/apache/hive/service/cli/CLIService.java Tue Aug 5 07:23:02 2014
@@ -46,6 +46,7 @@ import org.apache.hive.service.Composite
import org.apache.hive.service.ServiceException;
import org.apache.hive.service.auth.HiveAuthFactory;
import org.apache.hive.service.cli.operation.Operation;
+import org.apache.hive.service.cli.session.HiveSession;
import org.apache.hive.service.cli.session.SessionManager;
import org.apache.hive.service.cli.thrift.TProtocolVersion;
@@ -149,17 +150,41 @@ public class CLIService extends Composit
super.stop();
}
+ /**
+ * @deprecated Use {@link #openSession(TProtocolVersion, String, String, String, Map)}
+ */
+ @Deprecated
public SessionHandle openSession(TProtocolVersion protocol, String username, String password,
Map<String, String> configuration) throws HiveSQLException {
- SessionHandle sessionHandle = sessionManager.openSession(protocol, username, password, configuration, false, null);
+ SessionHandle sessionHandle = sessionManager.openSession(protocol, username, password, null, configuration, false, null);
LOG.debug(sessionHandle + ": openSession()");
return sessionHandle;
}
+ /**
+ * @deprecated Use {@link #openSessionWithImpersonation(TProtocolVersion, String, String, String, Map, String)}
+ */
+ @Deprecated
public SessionHandle openSessionWithImpersonation(TProtocolVersion protocol, String username,
String password, Map<String, String> configuration, String delegationToken)
throws HiveSQLException {
- SessionHandle sessionHandle = sessionManager.openSession(protocol, username, password, configuration,
+ SessionHandle sessionHandle = sessionManager.openSession(protocol, username, password, null, configuration,
+ true, delegationToken);
+ LOG.debug(sessionHandle + ": openSession()");
+ return sessionHandle;
+ }
+
+ public SessionHandle openSession(TProtocolVersion protocol, String username, String password, String ipAddress,
+ Map<String, String> configuration) throws HiveSQLException {
+ SessionHandle sessionHandle = sessionManager.openSession(protocol, username, password, ipAddress, configuration, false, null);
+ LOG.debug(sessionHandle + ": openSession()");
+ return sessionHandle;
+ }
+
+ public SessionHandle openSessionWithImpersonation(TProtocolVersion protocol, String username,
+ String password, String ipAddress, Map<String, String> configuration, String delegationToken)
+ throws HiveSQLException {
+ SessionHandle sessionHandle = sessionManager.openSession(protocol, username, password, ipAddress, configuration,
true, delegationToken);
LOG.debug(sessionHandle + ": openSession()");
return sessionHandle;
@@ -171,7 +196,7 @@ public class CLIService extends Composit
@Override
public SessionHandle openSession(String username, String password, Map<String, String> configuration)
throws HiveSQLException {
- SessionHandle sessionHandle = sessionManager.openSession(SERVER_VERSION, username, password, configuration, false, null);
+ SessionHandle sessionHandle = sessionManager.openSession(SERVER_VERSION, username, password, null, configuration, false, null);
LOG.debug(sessionHandle + ": openSession()");
return sessionHandle;
}
@@ -182,7 +207,7 @@ public class CLIService extends Composit
@Override
public SessionHandle openSessionWithImpersonation(String username, String password, Map<String, String> configuration,
String delegationToken) throws HiveSQLException {
- SessionHandle sessionHandle = sessionManager.openSession(SERVER_VERSION, username, password, configuration,
+ SessionHandle sessionHandle = sessionManager.openSession(SERVER_VERSION, username, password, null, configuration,
true, delegationToken);
LOG.debug(sessionHandle + ": openSession()");
return sessionHandle;
Modified: hive/branches/cbo/service/src/java/org/apache/hive/service/cli/session/SessionManager.java
URL: http://svn.apache.org/viewvc/hive/branches/cbo/service/src/java/org/apache/hive/service/cli/session/SessionManager.java?rev=1615872&r1=1615871&r2=1615872&view=diff
==============================================================================
--- hive/branches/cbo/service/src/java/org/apache/hive/service/cli/session/SessionManager.java (original)
+++ hive/branches/cbo/service/src/java/org/apache/hive/service/cli/session/SessionManager.java Tue Aug 5 07:23:02 2014
@@ -112,23 +112,22 @@ public class SessionManager extends Comp
}
}
- public SessionHandle openSession(TProtocolVersion protocol, String username, String password,
+ public SessionHandle openSession(TProtocolVersion protocol, String username, String password, String ipAddress,
Map<String, String> sessionConf) throws HiveSQLException {
- return openSession(protocol, username, password, sessionConf, false, null);
+ return openSession(protocol, username, password, ipAddress, sessionConf, false, null);
}
- public SessionHandle openSession(TProtocolVersion protocol, String username, String password,
+ public SessionHandle openSession(TProtocolVersion protocol, String username, String password, String ipAddress,
Map<String, String> sessionConf, boolean withImpersonation, String delegationToken)
throws HiveSQLException {
HiveSession session;
if (withImpersonation) {
HiveSessionImplwithUGI hiveSessionUgi = new HiveSessionImplwithUGI(protocol, username, password,
- hiveConf, TSetIpAddressProcessor.getUserIpAddress(), delegationToken);
+ hiveConf, ipAddress, delegationToken);
session = HiveSessionProxy.getProxy(hiveSessionUgi, hiveSessionUgi.getSessionUgi());
hiveSessionUgi.setProxySession(session);
} else {
- session = new HiveSessionImpl(protocol, username, password, hiveConf,
- TSetIpAddressProcessor.getUserIpAddress());
+ session = new HiveSessionImpl(protocol, username, password, hiveConf, ipAddress);
}
session.setSessionManager(this);
session.setOperationManager(operationManager);
Modified: hive/branches/cbo/service/src/java/org/apache/hive/service/cli/thrift/ThriftCLIService.java
URL: http://svn.apache.org/viewvc/hive/branches/cbo/service/src/java/org/apache/hive/service/cli/thrift/ThriftCLIService.java?rev=1615872&r1=1615871&r2=1615872&view=diff
==============================================================================
--- hive/branches/cbo/service/src/java/org/apache/hive/service/cli/thrift/ThriftCLIService.java (original)
+++ hive/branches/cbo/service/src/java/org/apache/hive/service/cli/thrift/ThriftCLIService.java Tue Aug 5 07:23:02 2014
@@ -29,6 +29,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hadoop.hive.conf.HiveConf.ConfVars;
+import org.apache.hadoop.hive.ql.session.SessionState;
import org.apache.hive.service.AbstractService;
import org.apache.hive.service.auth.HiveAuthFactory;
import org.apache.hive.service.auth.TSetIpAddressProcessor;
@@ -256,6 +257,7 @@ public abstract class ThriftCLIService e
SessionHandle getSessionHandle(TOpenSessionReq req, TOpenSessionResp res)
throws HiveSQLException, LoginException, IOException {
String userName = getUserName(req);
+ String ipAddress = getIpAddress();
TProtocolVersion protocol = getMinVersion(CLIService.SERVER_VERSION,
req.getClient_protocol());
SessionHandle sessionHandle;
@@ -263,10 +265,10 @@ public abstract class ThriftCLIService e
(userName != null)) {
String delegationTokenStr = getDelegationToken(userName);
sessionHandle = cliService.openSessionWithImpersonation(protocol, userName,
- req.getPassword(), req.getConfiguration(), delegationTokenStr);
+ req.getPassword(), ipAddress, req.getConfiguration(), delegationTokenStr);
} else {
sessionHandle = cliService.openSession(protocol, userName, req.getPassword(),
- req.getConfiguration());
+ ipAddress, req.getConfiguration());
}
res.setServerProtocolVersion(protocol);
return sessionHandle;