HIVE-8831 : show roles appends dummy new line (Navis via Thejas Nair)

git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1639575 13f79535-47bb-0310-9956-ffa450edef68
akitanaka · Nov 14, 2014 · 142a88c · 142a88c
1 parent 786a475
commit 142a88c
Show file tree

Hide file tree

Showing 14 changed files with 1 addition and 39 deletions.
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java
@@ -741,8 +741,7 @@ private void writeListToFileAfterSort(List<String> entries, String resFile) thro
     Collections.sort(entries);
     StringBuilder sb = new StringBuilder();
     for(String entry : entries){
-      sb.append(entry);
-      sb.append((char)terminator);
+      appendNonNull(sb, entry, true);
     }
     writeToFile(sb.toString(), resFile);
   }

diff --git a/ql/src/test/results/clientnegative/authorization_caseinsensitivity.q.out b/ql/src/test/results/clientnegative/authorization_caseinsensitivity.q.out
@@ -13,7 +13,6 @@ POSTHOOK: type: SHOW_ROLES
 admin
 public
 testrole
-
 PREHOOK: query: drop role TESTROLE
 PREHOOK: type: DROPROLE
 POSTHOOK: query: drop role TESTROLE
@@ -24,7 +23,6 @@ POSTHOOK: query: show roles
 POSTHOOK: type: SHOW_ROLES
 admin
 public
-
 PREHOOK: query: create role TESTROLE
 PREHOOK: type: CREATEROLE
 POSTHOOK: query: create role TESTROLE
@@ -36,7 +34,6 @@ POSTHOOK: type: SHOW_ROLES
 admin
 public
 testrole
-
 PREHOOK: query: grant role testROLE to user hive_admin_user
 PREHOOK: type: GRANT_ROLE
 POSTHOOK: query: grant role testROLE to user hive_admin_user
@@ -56,7 +53,6 @@ POSTHOOK: type: SHOW_ROLES
 admin
 public
 testrole
-
 PREHOOK: query: create role TESTRoLE
 PREHOOK: type: CREATEROLE
 FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. Role testrole already exists.
diff --git a/ql/src/test/results/clientnegative/authorization_drop_db_cascade.q.out b/ql/src/test/results/clientnegative/authorization_drop_db_cascade.q.out
@@ -55,5 +55,4 @@ PREHOOK: type: SHOW_ROLES
 POSTHOOK: query: show current roles
 POSTHOOK: type: SHOW_ROLES
 public
-
 FAILED: HiveAccessControlException Permission denied: Principal [name=user2, type=USER] does not have following privileges for operation DROPDATABASE [[OBJECT OWNERSHIP] on Object [type=TABLE_OR_VIEW, name=dba2.tab2]]
diff --git a/ql/src/test/results/clientnegative/authorization_drop_db_empty.q.out b/ql/src/test/results/clientnegative/authorization_drop_db_empty.q.out
@@ -21,7 +21,6 @@ PREHOOK: type: SHOW_ROLES
 POSTHOOK: query: show current roles
 POSTHOOK: type: SHOW_ROLES
 public
-
 PREHOOK: query: drop database dba1
 PREHOOK: type: DROPDATABASE
 PREHOOK: Input: database:dba1
@@ -37,7 +36,6 @@ POSTHOOK: query: -- check if dropping db as another user fails
 show current roles
 POSTHOOK: type: SHOW_ROLES
 public
-
 PREHOOK: query: create database dba2
 PREHOOK: type: CREATEDATABASE
 PREHOOK: Output: database:dba2
@@ -49,5 +47,4 @@ PREHOOK: type: SHOW_ROLES
 POSTHOOK: query: show current roles
 POSTHOOK: type: SHOW_ROLES
 public
-
 FAILED: HiveAccessControlException Permission denied: Principal [name=user2, type=USER] does not have following privileges for operation DROPDATABASE [[OBJECT OWNERSHIP] on Object [type=DATABASE, name=dba2]]
diff --git a/ql/src/test/results/clientnegative/authorization_drop_role_no_admin.q.out b/ql/src/test/results/clientnegative/authorization_drop_role_no_admin.q.out
@@ -7,7 +7,6 @@ PREHOOK: type: SHOW_ROLES
 POSTHOOK: query: show current roles
 POSTHOOK: type: SHOW_ROLES
 admin
-
 PREHOOK: query: create role r1
 PREHOOK: type: CREATEROLE
 POSTHOOK: query: create role r1
@@ -21,7 +20,6 @@ PREHOOK: type: SHOW_ROLES
 POSTHOOK: query: show current roles
 POSTHOOK: type: SHOW_ROLES
 public
-
 PREHOOK: query: drop role r1
 PREHOOK: type: DROPROLE
 FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. Current user : hive_admin_user is not allowed to drop role. User has to belong to ADMIN role and have it as current role, for this action.
diff --git a/ql/src/test/results/clientnegative/authorization_priv_current_role_neg.q.out b/ql/src/test/results/clientnegative/authorization_priv_current_role_neg.q.out
@@ -42,7 +42,6 @@ show current roles
 POSTHOOK: type: SHOW_ROLES
 public
 role2
-
 PREHOOK: query: grant all on table tpriv_current_role to user user3
 PREHOOK: type: GRANT_PRIVILEGE
 PREHOOK: Output: default@tpriv_current_role

diff --git a/ql/src/test/results/clientnegative/authorization_role_case.q.out b/ql/src/test/results/clientnegative/authorization_role_case.q.out
@@ -14,7 +14,6 @@ admin
 mixCaseRole1
 mixCaseRole2
 public
-
 PREHOOK: query: create table t1(i int)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default

diff --git a/ql/src/test/results/clientnegative/authorization_rolehierarchy_privs.q.out b/ql/src/test/results/clientnegative/authorization_rolehierarchy_privs.q.out
@@ -3,7 +3,6 @@ PREHOOK: type: SHOW_ROLES
 POSTHOOK: query: show current roles
 POSTHOOK: type: SHOW_ROLES
 public
-
 PREHOOK: query: set role ADMIN
 PREHOOK: type: SHOW_ROLES
 POSTHOOK: query: set role ADMIN
@@ -64,7 +63,6 @@ public
 role1
 role2
 role3
-
 PREHOOK: query: select * from t1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
@@ -78,7 +76,6 @@ PREHOOK: type: SHOW_ROLES
 POSTHOOK: query: show current roles
 POSTHOOK: type: SHOW_ROLES
 public
-
 PREHOOK: query: grant select on t1 to role role2
 PREHOOK: type: GRANT_PRIVILEGE
 PREHOOK: Output: default@t1
@@ -93,7 +90,6 @@ public
 role1
 role2
 role3
-
 PREHOOK: query: select * from t1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
@@ -111,7 +107,6 @@ PREHOOK: type: SHOW_ROLES
 POSTHOOK: query: show current roles
 POSTHOOK: type: SHOW_ROLES
 admin
-
 PREHOOK: query: revoke select on table t1 from role role2
 PREHOOK: type: REVOKE_PRIVILEGE
 PREHOOK: Output: default@t1
@@ -139,7 +134,6 @@ role1
 role2
 role3
 role4
-
 PREHOOK: query: select * from t1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
@@ -153,7 +147,6 @@ PREHOOK: type: SHOW_ROLES
 POSTHOOK: query: show current roles
 POSTHOOK: type: SHOW_ROLES
 public
-
 PREHOOK: query: set role ADMIN
 PREHOOK: type: SHOW_ROLES
 POSTHOOK: query: set role ADMIN
@@ -175,7 +168,6 @@ role1
 role2
 role3
 role4
-
 PREHOOK: query: select * from t1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@t1
@@ -189,7 +181,6 @@ PREHOOK: type: SHOW_ROLES
 POSTHOOK: query: show current roles
 POSTHOOK: type: SHOW_ROLES
 public
-
 PREHOOK: query: set role ADMIN
 PREHOOK: type: SHOW_ROLES
 POSTHOOK: query: set role ADMIN
@@ -206,5 +197,4 @@ public
 role1
 role2
 role4
-
 FAILED: HiveAccessControlException Permission denied: Principal [name=user1, type=USER] does not have following privileges for operation QUERY [[SELECT] on Object [type=TABLE_OR_VIEW, name=default.t1]]
diff --git a/ql/src/test/results/clientpositive/authorization_admin_almighty1.q.out b/ql/src/test/results/clientpositive/authorization_admin_almighty1.q.out
@@ -15,7 +15,6 @@ PREHOOK: type: SHOW_ROLES
 POSTHOOK: query: show current roles
 POSTHOOK: type: SHOW_ROLES
 public
-
 PREHOOK: query: set role ADMIN
 PREHOOK: type: SHOW_ROLES
 POSTHOOK: query: set role ADMIN
@@ -25,7 +24,6 @@ PREHOOK: type: SHOW_ROLES
 POSTHOOK: query: show current roles
 POSTHOOK: type: SHOW_ROLES
 admin
-
 PREHOOK: query: select * from t1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@t1

diff --git a/ql/src/test/results/clientpositive/authorization_grant_public_role.q.out b/ql/src/test/results/clientpositive/authorization_grant_public_role.q.out
@@ -41,7 +41,6 @@ PREHOOK: type: SHOW_ROLES
 POSTHOOK: query: SHOW CURRENT ROLES
 POSTHOOK: type: SHOW_ROLES
 public
-
 PREHOOK: query: -- user2 should be able to do a describe table, as pubic is in the current roles
 DESC t_gpr1
 PREHOOK: type: DESCTABLE

diff --git a/ql/src/test/results/clientpositive/authorization_role_grant1.q.out b/ql/src/test/results/clientpositive/authorization_role_grant1.q.out
@@ -29,7 +29,6 @@ POSTHOOK: type: SHOW_ROLES
 admin
 public
 src_role2
-
 PREHOOK: query: -- revoke role without role keyword
 revoke src_rolE2 from user user2
 PREHOOK: type: REVOKE_ROLE
@@ -48,7 +47,6 @@ POSTHOOK: type: SHOW_ROLES
 admin
 public
 src_role2
-
 PREHOOK: query: ----------------------------------------
 -- role granting without role keyword, with admin option (syntax check)
 ----------------------------------------
@@ -104,7 +102,6 @@ admin
 public
 src_role2
 src_role_wadmin
-
 PREHOOK: query: drop role Src_role2
 PREHOOK: type: DROPROLE
 POSTHOOK: query: drop role Src_role2
@@ -116,7 +113,6 @@ POSTHOOK: type: SHOW_ROLES
 admin
 public
 src_role_wadmin
-
 PREHOOK: query: drop role sRc_role_wadmin
 PREHOOK: type: DROPROLE
 POSTHOOK: query: drop role sRc_role_wadmin
@@ -127,4 +123,3 @@ POSTHOOK: query: show roles
 POSTHOOK: type: SHOW_ROLES
 admin
 public
-
diff --git a/ql/src/test/results/clientpositive/authorization_set_show_current_role.q.out b/ql/src/test/results/clientpositive/authorization_set_show_current_role.q.out
@@ -7,7 +7,6 @@ PREHOOK: type: SHOW_ROLES
 POSTHOOK: query: show current roles
 POSTHOOK: type: SHOW_ROLES
 admin
-
 PREHOOK: query: create role r1
 PREHOOK: type: CREATEROLE
 POSTHOOK: query: create role r1
@@ -25,7 +24,6 @@ PREHOOK: type: SHOW_ROLES
 POSTHOOK: query: show current roles
 POSTHOOK: type: SHOW_ROLES
 r1
-
 PREHOOK: query: set role PUBLIC
 PREHOOK: type: SHOW_ROLES
 POSTHOOK: query: set role PUBLIC
@@ -35,7 +33,6 @@ PREHOOK: type: SHOW_ROLES
 POSTHOOK: query: show current roles
 POSTHOOK: type: SHOW_ROLES
 public
-
 PREHOOK: query: set role ALL
 PREHOOK: type: SHOW_ROLES
 POSTHOOK: query: set role ALL
@@ -46,7 +43,6 @@ POSTHOOK: query: show current roles
 POSTHOOK: type: SHOW_ROLES
 public
 r1
-
 PREHOOK: query: set role ADMIN
 PREHOOK: type: SHOW_ROLES
 POSTHOOK: query: set role ADMIN

diff --git a/ql/src/test/results/clientpositive/authorization_view_sqlstd.q.out b/ql/src/test/results/clientpositive/authorization_view_sqlstd.q.out
@@ -180,7 +180,6 @@ PREHOOK: type: SHOW_ROLES
 POSTHOOK: query: show current roles
 POSTHOOK: type: SHOW_ROLES
 public
-
 PREHOOK: query: set role ADMIN
 PREHOOK: type: SHOW_ROLES
 POSTHOOK: query: set role ADMIN
@@ -206,7 +205,6 @@ POSTHOOK: type: SHOW_ROLES
 admin
 public
 role_v
-
 PREHOOK: query: grant all on table vt2 to role role_v
 PREHOOK: type: GRANT_PRIVILEGE
 PREHOOK: Output: default@vt2

diff --git a/ql/src/test/results/clientpositive/show_roles.q.out b/ql/src/test/results/clientpositive/show_roles.q.out
@@ -14,4 +14,3 @@ admin
 public
 role1
 role2
-