You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sentry.apache.org by ha...@apache.org on 2016/10/20 17:59:11 UTC
sentry git commit: SENTRY-1503: Remove all sequence ID checks from
TestSentryStore (Alexander Kolbasov, Reviewed by: Hao Hao)
Repository: sentry
Updated Branches:
refs/heads/master 7138db63c -> 59dbe626c
SENTRY-1503: Remove all sequence ID checks from TestSentryStore (Alexander Kolbasov, Reviewed by: Hao Hao)
Change-Id: Ic0869378506b7e932d099c05333925d1324e1a38
Project: http://git-wip-us.apache.org/repos/asf/sentry/repo
Commit: http://git-wip-us.apache.org/repos/asf/sentry/commit/59dbe626
Tree: http://git-wip-us.apache.org/repos/asf/sentry/tree/59dbe626
Diff: http://git-wip-us.apache.org/repos/asf/sentry/diff/59dbe626
Branch: refs/heads/master
Commit: 59dbe626c9e4553e03ebafe7c37d7017ede68758
Parents: 7138db6
Author: hahao <ha...@cloudera.com>
Authored: Thu Oct 20 10:58:20 2016 -0700
Committer: hahao <ha...@cloudera.com>
Committed: Thu Oct 20 10:58:20 2016 -0700
----------------------------------------------------------------------
.../persistent/TestDelegateSentryStore.java | 4 +-
.../db/service/persistent/TestSentryStore.java | 151 ++++++++-----------
2 files changed, 61 insertions(+), 94 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/sentry/blob/59dbe626/sentry-service/sentry-service-server/src/test/java/org/apache/sentry/provider/db/generic/service/persistent/TestDelegateSentryStore.java
----------------------------------------------------------------------
diff --git a/sentry-service/sentry-service-server/src/test/java/org/apache/sentry/provider/db/generic/service/persistent/TestDelegateSentryStore.java b/sentry-service/sentry-service-server/src/test/java/org/apache/sentry/provider/db/generic/service/persistent/TestDelegateSentryStore.java
index 5ada04c..ef32ad4 100644
--- a/sentry-service/sentry-service-server/src/test/java/org/apache/sentry/provider/db/generic/service/persistent/TestDelegateSentryStore.java
+++ b/sentry-service/sentry-service-server/src/test/java/org/apache/sentry/provider/db/generic/service/persistent/TestDelegateSentryStore.java
@@ -47,8 +47,8 @@ public class TestDelegateSentryStore extends SentryStoreIntegrationBase{
public void testCreateDropRole() throws Exception {
String roleName = "test-drop-role";
String grantor = "grantor";
- long seqId = sentryStore.createRole(SEARCH, roleName, grantor).getSequenceId();
- assertEquals(seqId + 1, sentryStore.dropRole(SEARCH, roleName, grantor).getSequenceId());
+ sentryStore.createRole(SEARCH, roleName, grantor);
+ sentryStore.dropRole(SEARCH, roleName, grantor);
}
@Test
http://git-wip-us.apache.org/repos/asf/sentry/blob/59dbe626/sentry-service/sentry-service-server/src/test/java/org/apache/sentry/provider/db/service/persistent/TestSentryStore.java
----------------------------------------------------------------------
diff --git a/sentry-service/sentry-service-server/src/test/java/org/apache/sentry/provider/db/service/persistent/TestSentryStore.java b/sentry-service/sentry-service-server/src/test/java/org/apache/sentry/provider/db/service/persistent/TestSentryStore.java
index 600e118..66f0584 100644
--- a/sentry-service/sentry-service-server/src/test/java/org/apache/sentry/provider/db/service/persistent/TestSentryStore.java
+++ b/sentry-service/sentry-service-server/src/test/java/org/apache/sentry/provider/db/service/persistent/TestSentryStore.java
@@ -140,15 +140,13 @@ public class TestSentryStore extends org.junit.Assert {
Set<String> users = Sets.newHashSet("user1");
- long seqId = sentryStore.createSentryRole(roleName).getSequenceId();
- assertEquals(seqId + 1, sentryStore.alterSentryRoleAddGroups(grantor, roleName, groups).getSequenceId());
- assertEquals(seqId + 2, sentryStore.alterSentryRoleDeleteGroups(roleName, groups).getSequenceId());
- assertEquals(seqId + 3, sentryStore.alterSentryRoleAddUsers(roleName, users).getSequenceId());
- assertEquals(seqId + 4, sentryStore.alterSentryRoleDeleteUsers(roleName, users).getSequenceId());
- assertEquals(seqId + 5, sentryStore.alterSentryRoleGrantPrivilege(grantor, roleName, privilege)
- .getSequenceId());
- assertEquals(seqId + 6, sentryStore
- .alterSentryRoleRevokePrivilege(grantor, roleName, privilege).getSequenceId());
+ sentryStore.createSentryRole(roleName);
+ sentryStore.alterSentryRoleAddGroups(grantor, roleName, groups);
+ sentryStore.alterSentryRoleDeleteGroups(roleName, groups);
+ sentryStore.alterSentryRoleAddUsers(roleName, users);
+ sentryStore.alterSentryRoleDeleteUsers(roleName, users);
+ sentryStore.alterSentryRoleGrantPrivilege(grantor, roleName, privilege);
+ sentryStore.alterSentryRoleRevokePrivilege(grantor, roleName, privilege);
}
@Test
@@ -215,17 +213,17 @@ public class TestSentryStore extends org.junit.Assert {
public void testCaseSensitiveScope() throws Exception {
String roleName = "role1";
String grantor = "g1";
- long seqId = sentryStore.createSentryRole(roleName).getSequenceId();
+ sentryStore.createSentryRole(roleName);
TSentryPrivilege sentryPrivilege = new TSentryPrivilege("Database", "server1", "all");
sentryPrivilege.setDbName("db1");
- assertEquals(seqId + 1, sentryStore.alterSentryRoleGrantPrivilege(grantor, roleName, sentryPrivilege).getSequenceId());
+ sentryStore.alterSentryRoleGrantPrivilege(grantor, roleName, sentryPrivilege);
}
@Test
public void testCreateDropRole() throws Exception {
String roleName = "test-drop-role";
- long seqId = sentryStore.createSentryRole(roleName).getSequenceId();
- assertEquals(seqId + 1, sentryStore.dropSentryRole(roleName).getSequenceId());
+ sentryStore.createSentryRole(roleName);
+ sentryStore.dropSentryRole(roleName);
}
@Test
@@ -253,7 +251,7 @@ public class TestSentryStore extends org.junit.Assert {
public void testAddDeleteGroups() throws Exception {
String roleName = "test-groups";
String grantor = "g1";
- long seqId = sentryStore.createSentryRole(roleName).getSequenceId();
+ sentryStore.createSentryRole(roleName);
Set<TSentryGroup> groups = Sets.newHashSet();
TSentryGroup group = new TSentryGroup();
group.setGroupName("test-groups-g1");
@@ -261,10 +259,8 @@ public class TestSentryStore extends org.junit.Assert {
group = new TSentryGroup();
group.setGroupName("test-groups-g2");
groups.add(group);
- assertEquals(seqId + 1, sentryStore.alterSentryRoleAddGroups(grantor,
- roleName, groups).getSequenceId());
- assertEquals(seqId + 2, sentryStore.alterSentryRoleDeleteGroups(roleName, groups)
- .getSequenceId());
+ sentryStore.alterSentryRoleAddGroups(grantor, roleName, groups);
+ sentryStore.alterSentryRoleDeleteGroups(roleName, groups);
MSentryRole role = sentryStore.getMSentryRoleByName(roleName);
assertEquals(Collections.emptySet(), role.getGroups());
}
@@ -272,12 +268,12 @@ public class TestSentryStore extends org.junit.Assert {
@Test
public void testAddDeleteUsers() throws Exception {
String roleName = "test-users";
- long seqId = sentryStore.createSentryRole(roleName).getSequenceId();
+ sentryStore.createSentryRole(roleName);
Set<String> users = Sets.newHashSet("test-user-u1", "test-user-u2");
- assertEquals(seqId + 1, sentryStore.alterSentryRoleAddUsers(roleName, users).getSequenceId());
+ sentryStore.alterSentryRoleAddUsers(roleName, users);
MSentryRole role = sentryStore.getMSentryRoleByName(roleName);
- assertEquals(2, role.getUsers().size());
- assertEquals(seqId + 2, sentryStore.alterSentryRoleDeleteUsers(roleName, users).getSequenceId());
+ role.getUsers().size();
+ sentryStore.alterSentryRoleDeleteUsers(roleName, users);
role = sentryStore.getMSentryRoleByName(roleName);
assertEquals(0, role.getUsers().size());
}
@@ -350,7 +346,7 @@ public class TestSentryStore extends org.junit.Assert {
String server = "server1";
String db = "db1";
String table = "tbl1";
- long seqId = sentryStore.createSentryRole(roleName).getSequenceId();
+ sentryStore.createSentryRole(roleName);
TSentryPrivilege privilege = new TSentryPrivilege();
privilege.setPrivilegeScope("TABLE");
privilege.setServerName(server);
@@ -358,14 +354,12 @@ public class TestSentryStore extends org.junit.Assert {
privilege.setTableName(table);
privilege.setAction(AccessConstants.ALL);
privilege.setCreateTime(System.currentTimeMillis());
- assertEquals(seqId + 1, sentryStore.alterSentryRoleGrantPrivilege(grantor, roleName, privilege)
- .getSequenceId());
+ sentryStore.alterSentryRoleGrantPrivilege(grantor, roleName, privilege);
MSentryRole role = sentryStore.getMSentryRoleByName(roleName);
Set<MSentryPrivilege> privileges = role.getPrivileges();
assertEquals(privileges.toString(), 1, privileges.size());
privilege.setAction(AccessConstants.SELECT);
- assertEquals(seqId + 2, sentryStore.alterSentryRoleRevokePrivilege(grantor, roleName, privilege)
- .getSequenceId());
+ sentryStore.alterSentryRoleRevokePrivilege(grantor, roleName, privilege);
// after having ALL and revoking SELECT, we should have INSERT
role = sentryStore.getMSentryRoleByName(roleName);
privileges = role.getPrivileges();
@@ -489,7 +483,7 @@ public class TestSentryStore extends org.junit.Assert {
String db = "db1";
String table = "tbl1";
String[] columns = {"c1","c2","c3","c4"};
- long seqId = sentryStore.createSentryRole(roleName).getSequenceId();
+ sentryStore.createSentryRole(roleName);
Set<TSentryPrivilege> tPrivileges = Sets.newHashSet();
for (String column : columns) {
TSentryPrivilege privilege = new TSentryPrivilege();
@@ -502,8 +496,7 @@ public class TestSentryStore extends org.junit.Assert {
privilege.setCreateTime(System.currentTimeMillis());
tPrivileges.add(privilege);
}
- assertEquals(seqId + 1, sentryStore.alterSentryRoleGrantPrivileges(grantor, roleName, tPrivileges)
- .getSequenceId());
+ sentryStore.alterSentryRoleGrantPrivileges(grantor, roleName, tPrivileges);
MSentryRole role = sentryStore.getMSentryRoleByName(roleName);
Set<MSentryPrivilege> privileges = role.getPrivileges();
assertEquals(privileges.toString(), 4, privileges.size());
@@ -520,8 +513,7 @@ public class TestSentryStore extends org.junit.Assert {
privilege.setCreateTime(System.currentTimeMillis());
tPrivileges.add(privilege);
}
- assertEquals(seqId + 2, sentryStore.alterSentryRoleRevokePrivileges(grantor, roleName, tPrivileges)
- .getSequenceId());
+ sentryStore.alterSentryRoleRevokePrivileges(grantor, roleName, tPrivileges);
role = sentryStore.getMSentryRoleByName(roleName);
privileges = role.getPrivileges();
assertEquals(privileges.toString(), 2, privileges.size());
@@ -533,8 +525,7 @@ public class TestSentryStore extends org.junit.Assert {
privilege.setTableName(table);
privilege.setAction(AccessConstants.SELECT);
privilege.setCreateTime(System.currentTimeMillis());
- assertEquals(seqId + 3, sentryStore.alterSentryRoleRevokePrivilege(grantor, roleName, privilege)
- .getSequenceId());
+ sentryStore.alterSentryRoleRevokePrivilege(grantor, roleName, privilege);
// After revoking table scope, we will have 0 privileges
role = sentryStore.getMSentryRoleByName(roleName);
privileges = role.getPrivileges();
@@ -553,7 +544,7 @@ public class TestSentryStore extends org.junit.Assert {
String table = "tbl1";
String column1 = "c1";
String column2 = "c2";
- long seqId = sentryStore.createSentryRole(roleName).getSequenceId();
+ sentryStore.createSentryRole(roleName);
TSentryPrivilege privilege = new TSentryPrivilege();
privilege.setPrivilegeScope("COLUMN");
privilege.setServerName(server);
@@ -564,19 +555,16 @@ public class TestSentryStore extends org.junit.Assert {
privilege.setCreateTime(System.currentTimeMillis());
// Grant ALL on c1 and c2
- assertEquals(seqId + 1, sentryStore.alterSentryRoleGrantPrivilege(grantor, roleName, privilege)
- .getSequenceId());
+ sentryStore.alterSentryRoleGrantPrivilege(grantor, roleName, privilege);
privilege.setColumnName(column2);
- assertEquals(seqId + 2, sentryStore.alterSentryRoleGrantPrivilege(grantor, roleName, privilege)
- .getSequenceId());
+ sentryStore.alterSentryRoleGrantPrivilege(grantor, roleName, privilege);
MSentryRole role = sentryStore.getMSentryRoleByName(roleName);
Set<MSentryPrivilege> privileges = role.getPrivileges();
assertEquals(privileges.toString(), 2, privileges.size());
// Revoke SELECT on c2
privilege.setAction(AccessConstants.SELECT);
- assertEquals(seqId + 3, sentryStore.alterSentryRoleRevokePrivilege(grantor, roleName, privilege)
- .getSequenceId());
+ sentryStore.alterSentryRoleRevokePrivilege(grantor, roleName, privilege);
// At this point c1 has ALL privileges and c2 should have INSERT after revoking SELECT
role = sentryStore.getMSentryRoleByName(roleName);
@@ -605,8 +593,7 @@ public class TestSentryStore extends org.junit.Assert {
privilege.setTableName(table);
privilege.setAction(AccessConstants.INSERT);
privilege.setCreateTime(System.currentTimeMillis());
- assertEquals(seqId + 4, sentryStore.alterSentryRoleRevokePrivilege(grantor, roleName, privilege)
- .getSequenceId());
+ sentryStore.alterSentryRoleRevokePrivilege(grantor, roleName, privilege);
role = sentryStore.getMSentryRoleByName(roleName);
privileges = role.getPrivileges();
assertEquals(privileges.toString(), 1, privileges.size());
@@ -616,8 +603,7 @@ public class TestSentryStore extends org.junit.Assert {
// Revoke ALL from the table should now remove all the column privileges.
privilege.setAction(AccessConstants.ALL);
privilege.setCreateTime(System.currentTimeMillis());
- assertEquals(seqId + 5, sentryStore.alterSentryRoleRevokePrivilege(grantor, roleName, privilege)
- .getSequenceId());
+ sentryStore.alterSentryRoleRevokePrivilege(grantor, roleName, privilege);
role = sentryStore.getMSentryRoleByName(roleName);
privileges = role.getPrivileges();
assertEquals(privileges.toString(), 0, privileges.size());
@@ -634,7 +620,7 @@ public class TestSentryStore extends org.junit.Assert {
String db = "db1";
String table1 = "tbl1";
String table2 = "tbl2";
- long seqId = sentryStore.createSentryRole(roleName).getSequenceId();
+ sentryStore.createSentryRole(roleName);
TSentryPrivilege privilegeTable1 = new TSentryPrivilege();
privilegeTable1.setPrivilegeScope("TABLE");
privilegeTable1.setServerName(server);
@@ -646,18 +632,15 @@ public class TestSentryStore extends org.junit.Assert {
privilegeTable2.setTableName(table2);
// Grant ALL on table1 and table2
- assertEquals(seqId + 1, sentryStore.alterSentryRoleGrantPrivilege(grantor, roleName, privilegeTable1)
- .getSequenceId());
- assertEquals(seqId + 2, sentryStore.alterSentryRoleGrantPrivilege(grantor, roleName, privilegeTable2)
- .getSequenceId());
+ sentryStore.alterSentryRoleGrantPrivilege(grantor, roleName, privilegeTable1);
+ sentryStore.alterSentryRoleGrantPrivilege(grantor, roleName, privilegeTable2);
MSentryRole role = sentryStore.getMSentryRoleByName(roleName);
Set<MSentryPrivilege> privileges = role.getPrivileges();
assertEquals(privileges.toString(), 2, privileges.size());
// Revoke SELECT on table2
privilegeTable2.setAction(AccessConstants.SELECT);
- assertEquals(seqId + 3, sentryStore.alterSentryRoleRevokePrivilege(grantor, roleName, privilegeTable2)
- .getSequenceId());
+ sentryStore.alterSentryRoleRevokePrivilege(grantor, roleName, privilegeTable2);
// after having ALL and revoking SELECT, we should have INSERT
role = sentryStore.getMSentryRoleByName(roleName);
privileges = role.getPrivileges();
@@ -684,8 +667,7 @@ public class TestSentryStore extends org.junit.Assert {
privilegeTable2.setAction(AccessConstants.INSERT);
privilegeTable2.setPrivilegeScope("DATABASE");
privilegeTable2.unsetTableName();
- assertEquals(seqId + 4, sentryStore.alterSentryRoleRevokePrivilege(grantor, roleName, privilegeTable2)
- .getSequenceId());
+ sentryStore.alterSentryRoleRevokePrivilege(grantor, roleName, privilegeTable2);
role = sentryStore.getMSentryRoleByName(roleName);
privileges = role.getPrivileges();
@@ -712,7 +694,7 @@ public class TestSentryStore extends org.junit.Assert {
String table = "tbl1";
String column1 = "c1";
String column2 = "c2";
- long seqId = sentryStore.createSentryRole(roleName).getSequenceId();
+ sentryStore.createSentryRole(roleName);
TSentryPrivilege privilegeCol1 = new TSentryPrivilege();
privilegeCol1.setPrivilegeScope("COLUMN");
privilegeCol1.setServerName(server);
@@ -725,18 +707,15 @@ public class TestSentryStore extends org.junit.Assert {
privilegeCol2.setColumnName(column2);
// Grant ALL on column1 and column2
- assertEquals(seqId + 1, sentryStore.alterSentryRoleGrantPrivilege(grantor, roleName, privilegeCol1)
- .getSequenceId());
- assertEquals(seqId + 2, sentryStore.alterSentryRoleGrantPrivilege(grantor, roleName, privilegeCol2)
- .getSequenceId());
+ sentryStore.alterSentryRoleGrantPrivilege(grantor, roleName, privilegeCol1);
+ sentryStore.alterSentryRoleGrantPrivilege(grantor, roleName, privilegeCol2);
MSentryRole role = sentryStore.getMSentryRoleByName(roleName);
Set<MSentryPrivilege> privileges = role.getPrivileges();
assertEquals(privileges.toString(), 2, privileges.size());
// Revoke SELECT on column2
privilegeCol2.setAction(AccessConstants.SELECT);
- assertEquals(seqId + 3, sentryStore.alterSentryRoleRevokePrivilege(grantor, roleName, privilegeCol2)
- .getSequenceId());
+ sentryStore.alterSentryRoleRevokePrivilege(grantor, roleName, privilegeCol2);
// after having ALL and revoking SELECT, we should have INSERT
role = sentryStore.getMSentryRoleByName(roleName);
privileges = role.getPrivileges();
@@ -765,8 +744,7 @@ public class TestSentryStore extends org.junit.Assert {
privilegeCol2.setPrivilegeScope("DATABASE");
privilegeCol2.unsetTableName();
privilegeCol2.unsetColumnName();
- assertEquals(seqId + 4, sentryStore.alterSentryRoleRevokePrivilege(grantor, roleName, privilegeCol2)
- .getSequenceId());
+ sentryStore.alterSentryRoleRevokePrivilege(grantor, roleName, privilegeCol2);
role = sentryStore.getMSentryRoleByName(roleName);
privileges = role.getPrivileges();
@@ -790,7 +768,7 @@ public class TestSentryStore extends org.junit.Assert {
String db = "db1";
String table = "tbl1";
TSentryGrantOption grantOption = TSentryGrantOption.TRUE;
- long seqId = sentryStore.createSentryRole(roleName).getSequenceId();
+ sentryStore.createSentryRole(roleName);
TSentryPrivilege privilege = new TSentryPrivilege();
privilege.setPrivilegeScope("TABLE");
@@ -800,14 +778,12 @@ public class TestSentryStore extends org.junit.Assert {
privilege.setAction(AccessConstants.ALL);
privilege.setCreateTime(System.currentTimeMillis());
privilege.setGrantOption(grantOption);
- assertEquals(seqId + 1, sentryStore.alterSentryRoleGrantPrivilege(grantor, roleName, privilege)
- .getSequenceId());
+ sentryStore.alterSentryRoleGrantPrivilege(grantor, roleName, privilege);
MSentryRole role = sentryStore.getMSentryRoleByName(roleName);
Set<MSentryPrivilege> privileges = role.getPrivileges();
assertEquals(privileges.toString(), 1, privileges.size());
assertEquals(Boolean.valueOf(privilege.getGrantOption().toString()), Iterables.get(privileges, 0).getGrantOption());
- assertEquals(seqId + 2, sentryStore.alterSentryRoleRevokePrivilege(grantor, roleName, privilege)
- .getSequenceId());
+ sentryStore.alterSentryRoleRevokePrivilege(grantor, roleName, privilege);
role = sentryStore.getMSentryRoleByName(roleName);
privileges = role.getPrivileges();
assertEquals(0, privileges.size());
@@ -1320,7 +1296,7 @@ public class TestSentryStore extends org.junit.Assert {
String server = "server1";
String db = "db1";
String table = "tbl1";
- long seqId = sentryStore.createSentryRole(roleName).getSequenceId();
+ sentryStore.createSentryRole(roleName);
TSentryPrivilege privilege = new TSentryPrivilege();
privilege.setPrivilegeScope("TABLE");
privilege.setServerName(server);
@@ -1328,15 +1304,12 @@ public class TestSentryStore extends org.junit.Assert {
privilege.setTableName(table);
privilege.setAction(AccessConstants.ALL);
privilege.setCreateTime(System.currentTimeMillis());
- assertEquals(seqId + 1, sentryStore.alterSentryRoleGrantPrivilege(grantor, roleName, privilege)
- .getSequenceId());
- assertEquals(seqId + 2, sentryStore.alterSentryRoleGrantPrivilege(grantor, roleName, privilege)
- .getSequenceId());
+ sentryStore.alterSentryRoleGrantPrivilege(grantor, roleName, privilege);
+ sentryStore.alterSentryRoleGrantPrivilege(grantor, roleName, privilege);
privilege.setServerName("Server1");
privilege.setDbName("DB1");
privilege.setTableName("TBL1");
- assertEquals(seqId + 3, sentryStore.alterSentryRoleGrantPrivilege(grantor, roleName, privilege)
- .getSequenceId());
+ sentryStore.alterSentryRoleGrantPrivilege(grantor, roleName, privilege);
MSentryRole role = sentryStore.getMSentryRoleByName(roleName);
Set<MSentryPrivilege> privileges = role.getPrivileges();
assertEquals(privileges.toString(), 1, privileges.size());
@@ -1350,8 +1323,8 @@ public class TestSentryStore extends org.junit.Assert {
String userWithoutRole = "user-no-privs";
Set<String> noRoleUsers = Sets.newHashSet(userWithoutRole);
String grantor = "g1";
- long seqId = sentryStore.createSentryRole(roleName1).getSequenceId();
- assertEquals(seqId + 1, sentryStore.createSentryRole(roleName2).getSequenceId());
+ sentryStore.createSentryRole(roleName1);
+ sentryStore.createSentryRole(roleName2);
TSentryPrivilege privilege1 = new TSentryPrivilege();
privilege1.setPrivilegeScope("TABLE");
privilege1.setServerName("server1");
@@ -1359,25 +1332,21 @@ public class TestSentryStore extends org.junit.Assert {
privilege1.setTableName("tbl1");
privilege1.setAction("SELECT");
privilege1.setCreateTime(System.currentTimeMillis());
- assertEquals(seqId + 2, sentryStore.alterSentryRoleGrantPrivilege(grantor, roleName1, privilege1)
- .getSequenceId());
- assertEquals(seqId + 3, sentryStore.alterSentryRoleGrantPrivilege(grantor, roleName2, privilege1)
- .getSequenceId());
+ sentryStore.alterSentryRoleGrantPrivilege(grantor, roleName1, privilege1);
+ sentryStore.alterSentryRoleGrantPrivilege(grantor, roleName2, privilege1);
TSentryPrivilege privilege2 = new TSentryPrivilege();
privilege2.setPrivilegeScope("SERVER");
privilege2.setServerName("server1");
privilege2.setCreateTime(System.currentTimeMillis());
- assertEquals(seqId + 4, sentryStore.alterSentryRoleGrantPrivilege(grantor, roleName2, privilege2)
- .getSequenceId());
+ sentryStore.alterSentryRoleGrantPrivilege(grantor, roleName2, privilege2);
Set<TSentryGroup> groups = Sets.newHashSet();
Set<String> users = Sets.newHashSet();
TSentryGroup group = new TSentryGroup();
group.setGroupName(groupName1);
groups.add(group);
users.add(userName1);
- assertEquals(seqId + 5, sentryStore.alterSentryRoleAddGroups(grantor,
- roleName1, groups).getSequenceId());
- assertEquals(seqId + 6, sentryStore.alterSentryRoleAddUsers(roleName1, users).getSequenceId());
+ sentryStore.alterSentryRoleAddGroups(grantor, roleName1, groups);
+ sentryStore.alterSentryRoleAddUsers(roleName1, users);
groups.clear();
users.clear();
group = new TSentryGroup();
@@ -1385,12 +1354,10 @@ public class TestSentryStore extends org.junit.Assert {
groups.add(group);
users.add(userName2);
// group 2 and user2 has both roles 1 and 2
- assertEquals(seqId + 7, sentryStore.alterSentryRoleAddGroups(grantor, roleName1, groups)
- .getSequenceId());
- assertEquals(seqId + 8, sentryStore.alterSentryRoleAddGroups(grantor, roleName2, groups)
- .getSequenceId());
- assertEquals(seqId + 9, sentryStore.alterSentryRoleAddUsers(roleName1, users).getSequenceId());
- assertEquals(seqId + 10, sentryStore.alterSentryRoleAddUsers(roleName2, users).getSequenceId());
+ sentryStore.alterSentryRoleAddGroups(grantor, roleName1, groups);
+ sentryStore.alterSentryRoleAddGroups(grantor, roleName2, groups);
+ sentryStore.alterSentryRoleAddUsers(roleName1, users);
+ sentryStore.alterSentryRoleAddUsers(roleName2, users);
// group1 all roles
assertEquals(Sets.newHashSet("server=server1->db=db1->table=tbl1->action=select"),
SentryStore.toTrimedLower(sentryStore.listAllSentryPrivilegesForProvider(Sets