You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by an...@apache.org on 2018/03/22 07:32:49 UTC
phoenix git commit: PHOENIX-4661 Handled deleted PTables in the
MetadataCache(Addendum)
Repository: phoenix
Updated Branches:
refs/heads/4.x-HBase-1.3 ba6abf7e3 -> 1cce283d4
PHOENIX-4661 Handled deleted PTables in the MetadataCache(Addendum)
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/1cce283d
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/1cce283d
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/1cce283d
Branch: refs/heads/4.x-HBase-1.3
Commit: 1cce283d47660ef3efbae3b4e408b40b6deb63ed
Parents: ba6abf7
Author: Ankit Singhal <an...@gmail.com>
Authored: Thu Mar 22 12:54:01 2018 +0530
Committer: Ankit Singhal <an...@gmail.com>
Committed: Thu Mar 22 12:54:01 2018 +0530
----------------------------------------------------------------------
.../java/org/apache/phoenix/end2end/ChangePermissionsIT.java | 8 ++++----
.../org/apache/phoenix/end2end/SystemTablePermissionsIT.java | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/1cce283d/phoenix-core/src/it/java/org/apache/phoenix/end2end/ChangePermissionsIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ChangePermissionsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ChangePermissionsIT.java
index a30f01f..3965f69 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ChangePermissionsIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ChangePermissionsIT.java
@@ -167,7 +167,7 @@ public class ChangePermissionsIT extends BasePermissionsIT {
// Grant READ permissions to RegularUser2 on the table
// Permissions should propagate automatically to relevant physical tables such as global index and view index.
- verifyAllowed(grantPermissions("R", regularUser2, FULL_TABLE_NAME, false), regularUser1);
+ verifyAllowed(grantPermissions("RX", regularUser2, FULL_TABLE_NAME, false), regularUser1);
// Granting permissions directly to index tables should fail
verifyDenied(grantPermissions("W", regularUser2, SCHEMA_NAME + "." + IDX1_TABLE_NAME, false), AccessDeniedException.class, regularUser1);
// Granting permissions directly to views should fail. We expect TableNotFoundException since VIEWS are not physical tables
@@ -209,12 +209,12 @@ public class ChangePermissionsIT extends BasePermissionsIT {
grantSystemTableAccess(superUser1, regularUser1);
// Grant Permissions to Groups (Should be automatically applicable to all users inside it)
- verifyAllowed(grantPermissions("AR", GROUP_SYSTEM_ACCESS, FULL_TABLE_NAME, false), superUser1);
+ verifyAllowed(grantPermissions("ARX", GROUP_SYSTEM_ACCESS, FULL_TABLE_NAME, false), superUser1);
verifyAllowed(readTable(FULL_TABLE_NAME), groupUser);
// GroupUser is an admin and can grant perms to other users
verifyDenied(readTable(FULL_TABLE_NAME), AccessDeniedException.class, regularUser1);
- verifyAllowed(grantPermissions("R", regularUser1, FULL_TABLE_NAME, false), groupUser);
+ verifyAllowed(grantPermissions("RX", regularUser1, FULL_TABLE_NAME, false), groupUser);
verifyAllowed(readTable(FULL_TABLE_NAME), regularUser1);
// Revoke the perms and try accessing data again
@@ -247,7 +247,7 @@ public class ChangePermissionsIT extends BasePermissionsIT {
verifyDenied(readMultiTenantTableWithoutIndex(FULL_TABLE_NAME), AccessDeniedException.class, regularUser2);
// Grant perms to base table (Should propagate to View Index as well)
- verifyAllowed(grantPermissions("R", regularUser2, FULL_TABLE_NAME, false), regularUser1);
+ verifyAllowed(grantPermissions("RX", regularUser2, FULL_TABLE_NAME, false), regularUser1);
// Try reading full table
verifyAllowed(readMultiTenantTableWithoutIndex(FULL_TABLE_NAME), regularUser2);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/1cce283d/phoenix-core/src/it/java/org/apache/phoenix/end2end/SystemTablePermissionsIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SystemTablePermissionsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SystemTablePermissionsIT.java
index bbe7114..0788ed7 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SystemTablePermissionsIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SystemTablePermissionsIT.java
@@ -70,7 +70,7 @@ public class SystemTablePermissionsIT extends BasePermissionsIT {
Action.EXEC, Action.READ);
}
grantPermissions(regularUser1.getShortName(),
- Collections.singleton(TABLE_NAME), Action.READ);
+ Collections.singleton(TABLE_NAME), Action.READ,Action.EXEC);
} catch (Throwable e) {
if (e instanceof Exception) {
throw (Exception) e;